czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature

Browse Source 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/config/MybatisPlusConfig.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/StorageVo.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbUserStorage.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMerchantAccountMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProducSkutMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProductMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbUserStorageMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/ShopService.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/ShopServiceImpl.java
#	eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java
This commit is contained in:
wangw
2024-04-29 09:46:09 +08:00
parent d2388d56ea 963e311b60
commit ecae487993
16 changed files with 393 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProduct.java
View File

@@ -15,6 +15,9 @@
*/
package cn.ysk.cashier.pojo.product;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
@@ -34,12 +37,14 @@ import java.io.Serializable;
@Entity
@Data
@Table(name="tb_product")
@TableName("tb_product")
public class TbProduct implements Serializable {
@Id
@Column(name = "`id`")
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty(value = "id")
@TableId(type = IdType.AUTO)
private Integer id;
@Column(name = "`source_path`")

21
eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
View File

@@ -13,8 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.ysk.cashier.pojo.product;
package me.zhengjie.modules.productInfo.productSku.domain;
import cn.hutool.json.JSON;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
@@ -33,12 +38,14 @@ import java.io.Serializable;
@Entity
@Data
@Table(name="tb_product_sku")
@TableName("tb_product_sku")
public class TbProductSku implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "`id`")
@ApiModelProperty(value = "自增id")
@TableId(type = IdType.AUTO)
private Integer id;
@Column(name = "`shop_id`")
@@ -56,11 +63,11 @@ public class TbProductSku implements Serializable {
@Column(name = "`origin_price`")
@ApiModelProperty(value = "原价")
private BigDecimal originPrice;
private BigDecimal originPrice = new BigDecimal("0.00");
@Column(name = "`cost_price`")
@ApiModelProperty(value = "成本价")
private BigDecimal costPrice;
private BigDecimal costPrice = new BigDecimal("0.00");
@Column(name = "`member_price`")
@ApiModelProperty(value = "会员价")
@@ -68,11 +75,11 @@ public class TbProductSku implements Serializable {
@Column(name = "`meal_price`")
@ApiModelProperty(value = "mealPrice")
private BigDecimal mealPrice;
private BigDecimal mealPrice = new BigDecimal("0.00");
@Column(name = "`sale_price`")
@ApiModelProperty(value = "售价")
private BigDecimal salePrice;
private BigDecimal salePrice = new BigDecimal("0.00");
@Column(name = "`guide_price`")
@ApiModelProperty(value = "进货参考价")
@@ -84,7 +91,7 @@ public class TbProductSku implements Serializable {
@Column(name = "`stock_number`")
@ApiModelProperty(value = "库存数量")
private Double stockNumber;
private Double stockNumber = 0.00;
@Column(name = "`spec_snap`")
@ApiModelProperty(value = "标签镜像")
@@ -108,7 +115,7 @@ public class TbProductSku implements Serializable {
@Column(name = "`real_sales_number`")
@ApiModelProperty(value = "销量")
private Double realSalesNumber;
private Double realSalesNumber = 0.00;
@Column(name = "`first_shared`")
@ApiModelProperty(value = "一级分销金额")

5
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantAccount.java
View File

@@ -15,6 +15,9 @@
*/
package cn.ysk.cashier.pojo.shop;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
@@ -31,6 +34,7 @@ import java.io.Serializable;
**/
@Entity
@Data
@TableName("tb_merchant_account")
@Table(name="tb_merchant_account")
public class TbMerchantAccount implements Serializable {
@@ -38,6 +42,7 @@ public class TbMerchantAccount implements Serializable {
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "`id`")
@ApiModelProperty(value = "自增id")
@TableId(type = IdType.AUTO)
private Integer id;
@Column(name = "`account`",nullable = false)