改接口

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/PlanController.java

@@ -201,8 +201,9 @@ public class PlanController {
     @PostMapping("/push/getSign")
     public R UpDownGetSign(@RequestBody UpDownBo bo){
         String sign = planService.pushGetSign(bo);
-        if ("error".equals(sign))
+        if ("error".equals(sign)) {
             return R.fail("无效的appkey");
+        }
         return R.ok(sign);
     }
 

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

@@ -25,7 +25,6 @@ public class DlUser {
     @TableField("start_equipment_code")
     private String startEquipmentCode;
     @TableField("start_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
     @TableField("end_equipment_id")
     private String endEquipmentId;
@@ -35,7 +34,6 @@ public class DlUser {
     @TableField("end_equipment_code")
     private String endEquipmentCode;
     @TableField("end_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date endTime;
     @TableField("total_price")
     private BigDecimal totalPrice;

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

@@ -11,12 +11,8 @@ import java.math.BigDecimal;
 public class OrderAddBo extends StatisticsAddBo {
     @NotBlank(groups = {AddGroup.class},message = "订单编号不能为空")
     private String orderId;
-    @NotBlank(groups = {AddGroup.class},message = "规格不能为空")
     private String specs;
-    @NotNull(groups = {AddGroup.class},message = "商品价格不能为空")
     private BigDecimal goodsPrice;
-    @NotNull(groups = {AddGroup.class},message = "交易数量不能为空")
     private Integer dealCount;
-    @NotBlank(groups = {AddGroup.class},message = "交易状态不能为空")
     private String state;
 }

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

@@ -1,34 +1,32 @@
 package com.ruoyi.demo.entity.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.validate.AddGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.util.Date;
 
 @Data
-public class StatisticsAddBo {
+public class StatisticsAddBo implements Serializable {
+    private static final long serialVersionUID = -736373431471562730L;
+
     @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 = "客户姓名不能为空")
     private String userName;
-    @NotBlank(groups = {AddGroup.class},message = "客户联系方式不能为空")
     private String userTelephone;
-    @NotNull(groups = {AddGroup.class},message = "时间不能为空")
     private Date time;
     @NotBlank(groups = {AddGroup.class},message = "签名不能为空")
     private String sign;
+
+
 }

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

@@ -110,7 +110,9 @@ public class OrderServiceImpl implements OrderService {
             user.setEndEquipmentName(equipment.getEquipmentName());
             user.setEndEquipmentCode(equipment.getEquipmentCode());
             user.setEndTime(bo.getTime());
-            user.setTotalPrice(user.getTotalPrice().add(bo.getGoodsPrice().multiply(new BigDecimal(bo.getDealCount()))));
+//            user.setTotalPrice(user.getTotalPrice().add(bo.getGoodsPrice().multiply(new BigDecimal(bo.getDealCount()))));
+            user.setTotalPrice(user.getTotalPrice().add(bo.getGoodsPrice()));
+
             dlUserMapper.update(user, userQueryWrapper);
         }
         // 添加交易行为记录

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

@@ -103,8 +103,8 @@ public class StatisticsServiceImpl implements StatisticsService {
             .set("userId", bo.getUserId())
             .set("userName", bo.getUserName())
             .set("userTelephone", bo.getUserTelephone())
-            .set("vendorId", bo.getVendorId())
             .set("vendorName", bo.getVendorName())
+            .set("vendorId", bo.getVendorId())
             .set("sign", bo.getSign());
         if (!SignUtil.verify(params, app.getAppSecret()))
             return -3;