240401

src/main/java/com/gxwebsoft/shop/entity/Goods.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 商品记录表
@@ -148,6 +149,9 @@ public class Goods implements Serializable {
     @ApiModelProperty(value = "分销佣金(三级)")
     private BigDecimal thirdMoney;
 
+    @ApiModelProperty(value = "成本")
+    private BigDecimal cost;
+
     @ApiModelProperty(value = "用户ID")
     private Integer userId;
 
@@ -192,4 +196,10 @@ public class Goods implements Serializable {
     @TableField(exist = false)
     private Integer noDeliveryTimes;
 
+    @TableField(exist = false)
+    private List<GoodsPhoneModel> goodsPhoneModelList;
+
+    @TableField(exist = false)
+    private GoodsPrice goodsPrice;
+
 }

src/main/java/com/gxwebsoft/shop/entity/GoodsPhoneModel.java

@@ -0,0 +1,54 @@
+package com.gxwebsoft.shop.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商品匹配机型
+ *
+ * @author 科技小王子
+ * @since 2024-03-12 01:30:55
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "GoodsPhoneModel对象", description = "商品匹配机型")
+@TableName("shop_goods_phone_model")
+public class GoodsPhoneModel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer goodsId;
+
+    private Integer modelId;
+
+    @ApiModelProperty(value = "状态, 0上架, 1下架")
+    private Integer status;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "注册时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private LocalDateTime updateTime;
+
+    @TableField(exist = false)
+    private String phoneModelName;
+
+    @TableField(exist = false)
+    private String phoneModelCode;
+
+}

src/main/java/com/gxwebsoft/shop/entity/GoodsPrice.java

@@ -0,0 +1,102 @@
+package com.gxwebsoft.shop.entity;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 商品价格()
+ *
+ * @author 科技小王子
+ * @since 2024-03-12 01:35:40
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "GoodsPrice对象", description = "商品价格()")
+@TableName("shop_goods_price")
+public class GoodsPrice implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private Integer goodsId;
+
+    @ApiModelProperty(value = "售价")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "零售商店长返利比例")
+    @TableField(value = "level_3_commission_rate")
+    private BigDecimal level3commissionRate;
+
+    @ApiModelProperty(value = "零售商店长返利模式(0金额1比例)")
+    @TableField(value = "level_3_commission_mode")
+    private Integer level3commissionMode;
+
+    @ApiModelProperty(value = "导购返利比例")
+    @TableField(value = "level_4_commission_rate")
+    private BigDecimal level4commissionRate;
+
+    @ApiModelProperty(value = "导购返利模式(0金额1比例)")
+    @TableField(value = "level_4_commission_mode")
+    private Integer level4commissionMode;
+
+    @ApiModelProperty(value = "售后返利比例")
+    @TableField(value = "level_5_commission_rate")
+    private BigDecimal level5commissionRate;
+
+    @ApiModelProperty(value = "散户返利比例")
+    @TableField(value = "level_6_commission_rate")
+    private BigDecimal level6commissionRate;
+
+    @ApiModelProperty(value = "散户返利模式(0金额1比例)")
+    @TableField(value = "level_6_commission_mode")
+    private Integer level6commissionMode;
+
+    @ApiModelProperty(value = "编外合伙人返利比例")
+    @TableField(value = "level_7_commission_rate")
+    private BigDecimal level7commissionRate;
+
+    @ApiModelProperty(value = "编外合伙人返利模式(0金额1比例)")
+    @TableField(value = "level_7_commission_mode")
+    private Integer level7commissionMode;
+
+    @ApiModelProperty(value = "售后店长返利比例")
+    @TableField(value = "level_8_commission_rate")
+    private BigDecimal level8commissionRate;
+
+    @ApiModelProperty(value = "售后店长全店返利比例")
+    private BigDecimal fixStoreLeaderCommissionRate;
+
+    @ApiModelProperty(value = "状态, 0上架, 1下架")
+    private Integer status;
+
+    @ApiModelProperty(value = "是否删除, 0否, 1是")
+    @TableLogic
+    private Integer deleted;
+
+    private Integer province;
+
+    private Integer city;
+
+    @ApiModelProperty(value = "区代ID")
+    private Integer userId;
+
+    @ApiModelProperty(value = "租户id")
+    private Integer tenantId;
+
+    @ApiModelProperty(value = "注册时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "修改时间")
+    private LocalDateTime updateTime;
+
+}

src/main/java/com/gxwebsoft/shop/entity/Order.java

@@ -1,8 +1,9 @@
 package com.gxwebsoft.shop.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.gxwebsoft.apps.entity.Equipment;
-import com.gxwebsoft.apps.entity.EquipmentOrderGoods;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.vivo.entity.VivoFixStore;
+import com.gxwebsoft.vivo.entity.VivoStore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -34,7 +35,7 @@ public class Order implements Serializable {
     private String subject;
 
     @ApiModelProperty(value = "订单号")
-    private Long orderNo;
+    private String orderNo;
 
     @ApiModelProperty(value = "商品总金额(不含优惠折扣)")
     private BigDecimal totalPrice;
@@ -177,12 +178,25 @@ public class Order implements Serializable {
     @ApiModelProperty(value = "用户ID")
     private Integer userId;
 
+    @ApiModelProperty(value = "所属城市")
+    private Integer cityId;
+
     @ApiModelProperty(value = "所属门店ID")
-    private Integer shopId;
+    private Integer storeId;
+
+    @ApiModelProperty(value = "所属门店ID")
+    private Integer fixStoreId;
+
+    @ApiModelProperty(value = "所属零售商ID")
+    private Integer orgId;
 
     @ApiModelProperty(value = "商品ID")
     private Integer goodsId;
 
+    @ApiModelProperty(value = "商品名称")
+    @TableField(exist = false)
+    private String goodsName;
+
     @ApiModelProperty(value = "设备ID")
     private Integer equipmentId;
 
@@ -199,6 +213,59 @@ public class Order implements Serializable {
     @ApiModelProperty(value = "备注")
     private String comments;
 
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "照片")
+    private String photo;
+
+    @ApiModelProperty(value = "视频")
+    private String video;
+
+    @ApiModelProperty(value = "支付凭证")
+    private String payVoucher;
+
+    @ApiModelProperty(value = "分佣")
+    private BigDecimal commission;
+
+    @ApiModelProperty(value = "区代毛利")
+    private BigDecimal agentCommission;
+
+    @ApiModelProperty(value = "店长门店返利")
+    private BigDecimal fixStoreLeaderCommission;
+
+    @ApiModelProperty(value = "退款码")
+    private String refundCode;
+
+    @ApiModelProperty(value = "型号")
+    private String modelName;
+
+    @ApiModelProperty(value = "RAM+ROM")
+    private String productMemory;
+
+    private String imei;
+
+    private String skuCode;
+
+    private String skuName;
+
+    private String skuColor;
+
+    @ApiModelProperty("门店")
+    private String storeName;
+
+    @ApiModelProperty("二级区域名称")
+    private String secondAreaName;
+
+    @ApiModelProperty("零售商名称")
+    private String retailerName;
+
+    @ApiModelProperty("好/坏")
+    private String goodOrBad;
+
     @ApiModelProperty(value = "状态, 0正常, 1冻结")
     private Integer status;
 
@@ -215,6 +282,9 @@ public class Order implements Serializable {
     @ApiModelProperty(value = "修改时间")
     private Date updateTime;
 
+    @ApiModelProperty(value = "出险时间")
+    private Date useTime;
+
     @ApiModelProperty("账号")
     @TableField(exist = false)
     private String username;
@@ -227,10 +297,6 @@ public class Order implements Serializable {
     @TableField(exist = false)
     private String nickname;
 
-    @ApiModelProperty(value = "联系电话")
-    @TableField(exist = false)
-    private String phone;
-
     @ApiModelProperty(value = "头像")
     @TableField(exist = false)
     private String avatar;
@@ -247,15 +313,39 @@ public class Order implements Serializable {
     @TableField(exist = false)
     private List<OrderGoods> goodsList;
 
-    @ApiModelProperty("管理电池商品")
+    @ApiModelProperty("商品列表")
     @TableField(exist = false)
-    private EquipmentOrderGoods equipmentGoods;
-
-    @ApiModelProperty("设备")
-    @TableField(exist = false)
-    private Equipment equipment;
+    private OrderGoods orderGoods;
 
     @ApiModelProperty("推荐人ID")
     @TableField(exist = false)
     private Integer dealerId;
+
+    @TableField(exist = false)
+    private Goods goods;
+
+    @ApiModelProperty("上报人姓名")
+    private String sellerName;
+
+    @ApiModelProperty("上报人工号")
+    private String sellerCode;
+
+    @ApiModelProperty("后台状态：已激活/未激活")
+    private String activeState;
+
+    @ApiModelProperty("后台激活日期")
+    private String activeDate;
+
+    @TableField(exist = false)
+    private BigDecimal totalAmount;
+
+    @TableField(exist = false)
+    private VivoStore store;
+
+    @TableField(exist = false)
+    private VivoFixStore fixStore;
+
+    @TableField(exist = false)
+    private User user;
+
 }

src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java

@@ -48,6 +48,9 @@ public class OrderRefund implements Serializable {
     @ApiModelProperty(value = "商家审核状态(0待审核 10已同意 20已拒绝)")
     private Integer auditStatus;
 
+    @ApiModelProperty(value = "0未到账1已到账")
+    private Integer refundStatus;
+
     @ApiModelProperty(value = "商家拒绝原因(说明)")
     private String refuseDesc;
 
@@ -113,5 +116,6 @@ public class OrderRefund implements Serializable {
     @TableField(exist = false)
     private String merchantName;
 
-
+    @TableField(exist = false)
+    private Order order;
 }

src/main/java/com/gxwebsoft/shop/entity/UserBalanceLog.java

@@ -8,6 +8,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.gxwebsoft.common.system.entity.User;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,7 +34,14 @@ public class UserBalanceLog implements Serializable {
     @ApiModelProperty(value = "用户ID")
     private Integer userId;
 
-    @ApiModelProperty(value = "余额变动场景(10用户充值 20用户消费 30管理员操作 40订单退款)")
+    @ApiModelProperty(value = "订单ID")
+    private Integer orderId;
+
+
+    @ApiModelProperty(value = "订单")
+    private Order order;
+
+    @ApiModelProperty(value = "余额变动场景余额变动场景(0分佣 1订单退款)")
     private Integer scene;
 
     @ApiModelProperty(value = "变动金额")
@@ -78,4 +86,10 @@ public class UserBalanceLog implements Serializable {
     @TableField(exist = false)
     private String avatar;
 
+    @TableField(exist = false)
+    private BigDecimal totalAmount;
+
+    @TableField(exist = false)
+    private User user;
+
 }