修改添加扫码行为记录

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/Statistics.java

@@ -23,11 +23,6 @@ public class Statistics {
     @TableId(value = "statistics_id",type = IdType.ASSIGN_ID)
     private String statisticsId;
 
-    @TableField("plan_id")
-    private String planId;
-    @TableField("plan_name")
-    private String planName;
-
     @TableField("appkey")
     private String appkey;
     @TableField("equipment_id")
@@ -37,13 +32,15 @@ public class Statistics {
     @TableField("equipment_code")
     private String equipmentCode;
 
-    @TableField("addr_info")
-    private String addrInfo;
-
     @TableField("goods_id")
     private String goodsId;
     @TableField("goods_name")
     private String goodsName;
+    @TableField("vendor_id")
+    private String vendorId;
+    @TableField("vendor_name")
+    private String vendorName;
+
     @TableField("deal_tool_count")
     private Integer dealToolCount;
     @TableField("deal_tool_price")
@@ -67,16 +64,15 @@ public class Statistics {
 
     public Statistics (){}
     // 客户扫码时调用
-    public Statistics (StatisticsAddBo bo, Plan plan, Equipment equipment){
-        this.planId = bo.getPlanId();
-        this.planName = plan.getPlanName();
+    public Statistics (StatisticsAddBo bo, Equipment equipment){
         this.appkey = bo.getAppkey();
         this.equipmentId = equipment.getEquipmentId();
         this.equipmentCode = bo.getEquipmentCode();
         this.equipmentName = equipment.getEquipmentName();
-        this.addrInfo = equipment.getAddrInfo();
-        this.goodsId = plan.getGoodsId();
-        this.goodsName = plan.getGoodsName();
+        this.goodsId = bo.getGoodsId();
+        this.goodsName = bo.getGoodsName();
+        this.vendorId = bo.getVendorId();
+        this.vendorName = bo.getVendorName();
         this.dealToolCount = 0;
         this.dealToolPrice = Float.valueOf(0);
         this.userId = bo.getUserId();
@@ -86,18 +82,17 @@ public class Statistics {
         this.time = bo.getTime();
     }
     // 客户交易时调用
-    public Statistics (OrderAddBo bo, Plan plan, Equipment equipment){
-        this.planId = bo.getPlanId();
-        this.planName = plan.getPlanName();
+    public Statistics (OrderAddBo bo, Equipment equipment){
         this.appkey = bo.getAppkey();
         this.equipmentId = equipment.getEquipmentId();
         this.equipmentCode = bo.getEquipmentCode();
         this.equipmentName = equipment.getEquipmentName();
-        this.addrInfo = equipment.getAddrInfo();
-        this.goodsId = plan.getGoodsId();
-        this.goodsName = plan.getGoodsName();
+        this.goodsId = bo.getGoodsId();
+        this.goodsName = bo.getGoodsName();
+        this.vendorId = bo.getVendorId();
+        this.vendorName = bo.getVendorName();
         this.dealToolCount = bo.getDealCount();
-        this.dealToolPrice = bo.getGoodsPrice()*bo.getDealCount();
+        this.dealToolPrice = bo.getGoodsPrice() * bo.getDealCount();
         this.userId = bo.getUserId();
         this.userName = bo.getUserName();
         this.userTelephone = bo.getUserTelephone();

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/OrderAddBo.java

@@ -10,14 +10,6 @@ import javax.validation.constraints.NotNull;
 public class OrderAddBo extends StatisticsAddBo {
     @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
     private String orderId;
-    @NotBlank(groups = {AddGroup.class},message = "商品Id不能为空")
-    private String goodsId;
-    @NotBlank(groups = {AddGroup.class},message = "商品名称不能为空")
-    private String goodsName;
-    @NotBlank(groups = {AddGroup.class},message = "供应商Id不能为空")
-    private String vendorId;
-    @NotBlank(groups = {AddGroup.class},message = "供应商名称不能为空")
-    private String vendorName;
     @NotBlank(groups = {AddGroup.class},message = "规格不能为空")
     private String specs;
     @NotNull(groups = {AddGroup.class},message = "商品价格不能为空")

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/bo/StatisticsAddBo.java

@@ -9,12 +9,18 @@ import java.time.LocalDateTime;
 
 @Data
 public class StatisticsAddBo {
-    @NotBlank(groups = {AddGroup.class},message = "计划Id不能为空")
-    private String planId;
     @NotBlank(groups = {AddGroup.class},message = "appkey不能为空")
     private String appkey;
     @NotBlank(groups = {AddGroup.class},message = "设备编号不能为空")
     private String equipmentCode;
+    @NotBlank(groups = {AddGroup.class},message = "商品Id不能为空")
+    private String goodsId;
+    @NotBlank(groups = {AddGroup.class},message = "商品名称不能为空")
+    private String goodsName;
+    @NotBlank(groups = {AddGroup.class},message = "供应商Id不能为空")
+    private String vendorId;
+    @NotBlank(groups = {AddGroup.class},message = "供应商名称不能为空")
+    private String vendorName;
     @NotBlank(groups = {AddGroup.class},message = "客户Id不能为空")
     private String userId;
     @NotBlank(groups = {AddGroup.class},message = "客户姓名不能为空")

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/OrderServiceImpl.java

@@ -38,6 +38,8 @@ public class OrderServiceImpl implements OrderService {
     public String getSign(OrderAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",bo.getAppkey());
+        appQueryWrapper.eq("state",0);
+        appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
             return "error";
@@ -50,7 +52,6 @@ public class OrderServiceImpl implements OrderService {
             .set("goodsName",bo.getGoodsName())
             .set("goodsPrice",bo.getGoodsPrice())
             .set("orderId",bo.getOrderId())
-            .set("planId",bo.getPlanId())
             .set("userId",bo.getUserId())
             .set("userName",bo.getUserName())
             .set("userTelephone",bo.getUserTelephone())
@@ -67,6 +68,8 @@ public class OrderServiceImpl implements OrderService {
     public int addOrder(OrderAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",bo.getAppkey());
+        appQueryWrapper.eq("state",0);
+        appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
             return -1;
@@ -79,7 +82,6 @@ public class OrderServiceImpl implements OrderService {
             .set("goodsName",bo.getGoodsName())
             .set("goodsPrice",bo.getGoodsPrice())
             .set("orderId",bo.getOrderId())
-            .set("planId",bo.getPlanId())
             .set("userId",bo.getUserId())
             .set("userName",bo.getUserName())
             .set("userTelephone",bo.getUserTelephone())
@@ -91,10 +93,6 @@ public class OrderServiceImpl implements OrderService {
         if (!SignUtil.verify(params,app.getAppSecret()))
             return -3;
         // 验证通过后，如果用户不存在，则添加用户；否则更新用户信息
-        QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
-        planQueryWrapper.eq("plan_id",bo.getPlanId());
-        Plan plan = planMapper.selectOne(planQueryWrapper);
-
         QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
         equipmentQueryWrapper.eq("equipment_code",bo.getEquipmentCode());
         Equipment equipment = equipmentMapper.selectOne(equipmentQueryWrapper);
@@ -110,10 +108,11 @@ public class OrderServiceImpl implements OrderService {
             user.setEndEquipmentName(equipment.getEquipmentName());
             user.setEndEquipmentCode(equipment.getEquipmentCode());
             user.setEndTime(bo.getTime());
+            user.setTotalPrice(user.getTotalPrice() + bo.getGoodsPrice() * bo.getDealCount());
             dlUserMapper.update(user,userQueryWrapper);
         }
         // 添加交易行为记录
-        statisticsMapper.insert(new Statistics(bo,plan,equipment));
+        statisticsMapper.insert(new Statistics(bo,equipment));
         // 添加订单
         return orderMapper.insert(new Order(bo,app));
     }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/PlanServiceImpl.java

@@ -62,6 +62,7 @@ public class PlanServiceImpl implements PlanService {
     public String getSign(PlanAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",bo.getAppkey());
+        appQueryWrapper.eq("state",0);
         appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
@@ -88,6 +89,7 @@ public class PlanServiceImpl implements PlanService {
     public int addPlan(PlanAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",bo.getAppkey());
+        appQueryWrapper.eq("state",0);
         appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/StatisticsServiceImpl.java

@@ -65,17 +65,22 @@ public class StatisticsServiceImpl implements StatisticsService {
     public String getSign(StatisticsAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",bo.getAppkey());
+        appQueryWrapper.eq("state",0);
+        appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
             return "error";
         Map<String,Object> params = Dict.create()
             .set("appkey",bo.getAppkey())
             .set("equipmentCode",bo.getEquipmentCode())
-            .set("planId",bo.getPlanId())
+            .set("goodsId",bo.getGoodsId())
+            .set("goodsName",bo.getGoodsName())
             .set("time",bo.getTime())
             .set("userId",bo.getUserId())
             .set("userName",bo.getUserName())
             .set("userTelephone",bo.getUserTelephone())
+            .set("vendorId",bo.getVendorId())
+            .set("vendorName",bo.getVendorName())
             .set("sign",bo.getSign());
         return SignUtil.sign(params,app.getAppSecret());
     }
@@ -85,25 +90,26 @@ public class StatisticsServiceImpl implements StatisticsService {
     public int add(StatisticsAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
         appQueryWrapper.eq("appkey",bo.getAppkey());
+        appQueryWrapper.eq("state",0);
+        appQueryWrapper.eq("deleted","0");
         App app = appMapper.selectOne(appQueryWrapper);
         if (app == null)
             return -1;
         Map<String,Object> params = Dict.create()
             .set("appkey",bo.getAppkey())
             .set("equipmentCode",bo.getEquipmentCode())
-            .set("planId",bo.getPlanId())
+            .set("goodsId",bo.getGoodsId())
+            .set("goodsName",bo.getGoodsName())
             .set("time",bo.getTime())
             .set("userId",bo.getUserId())
             .set("userName",bo.getUserName())
             .set("userTelephone",bo.getUserTelephone())
+            .set("vendorId",bo.getVendorId())
+            .set("vendorName",bo.getVendorName())
             .set("sign",bo.getSign());
         if (!SignUtil.verify(params,app.getAppSecret()))
             return -3;
-        // 验证通过后，如果用户不存在，则添加用户；否则更新用户信息
-        QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
-        planQueryWrapper.eq("plan_id",bo.getPlanId());
-        Plan plan = planMapper.selectOne(planQueryWrapper);
-
+        // 验证通过后，如果用户不存在，则添加用户；否则不管
         QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
         equipmentQueryWrapper.eq("equipment_code",bo.getEquipmentCode());
         Equipment equipment = equipmentMapper.selectOne(equipmentQueryWrapper);
@@ -114,14 +120,7 @@ public class StatisticsServiceImpl implements StatisticsService {
 
         if (user == null)
             dlUserMapper.insert(new DlUser(bo,equipment));
-        else{
-            user.setEndEquipmentId(equipment.getEquipmentId());
-            user.setEndEquipmentName(equipment.getEquipmentName());
-            user.setEndEquipmentCode(equipment.getEquipmentCode());
-            user.setEndTime(bo.getTime());
-            dlUserMapper.update(user,userQueryWrapper);
-        }
         // 添加扫码行为记录
-        return statisticsMapper.insert(new Statistics(bo,plan,equipment));
+        return statisticsMapper.insert(new Statistics(bo,equipment));
     }
 }