Merge branch 'master' into lcy

ruoyi-admin/src/main/resources/application-dev.yml

@@ -49,17 +49,17 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/digital-investment?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://192.168.2.64:3306/digital-investment?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
-          password: Aa@1230
+          password: benyun
         # 从库数据源
-        slave:
-          lazy: true
-          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/digital-investment?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-          username: root
-          password: Aa@1230
+#        slave:
+#          lazy: true
+#          type: ${spring.datasource.type}
+#          driverClassName: com.mysql.cj.jdbc.Driver
+#          url: jdbc:mysql://localhost:3306/digital-investment?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+#          username: root
+#          password: Aa@1230
 #        oracle:
 #          type: ${spring.datasource.type}
 #          driverClassName: oracle.jdbc.OracleDriver
@@ -102,7 +102,7 @@ spring:
 spring:
   redis:
     # 地址
-    host: localhost
+    host: 192.168.2.241
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("dl_app")
@@ -42,7 +43,7 @@ public class App {
     @TableField("prove_5")
     private String prove5;
     @TableField("create_time")
-    private LocalDateTime createTime;
+    private Date createTime;
     @TableField("annotation")
     private String annotation;
     @TableField("deleted")

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("dl_commercial")
@@ -45,7 +46,7 @@ public class Commercial {
     @TableField("addr_info")
     private String addrInfo;
     @TableField("create_time")
-    private LocalDateTime createTime;
+    private Date createTime;
     @TableField("deleted")
     private Integer deleted;
 

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

@@ -11,9 +11,11 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.bo.StatisticsAddBo;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 
 @Data
 @TableName("dl_user")
@@ -34,7 +36,7 @@ public class DlUser {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime startTime;
+    private Date startTime;
     @TableField("end_equipment_id")
     private String endEquipmentId;
     @TableField("end_equipment_name")
@@ -46,9 +48,9 @@ public class DlUser {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime endTime;
+    private Date endTime;
     @TableField("total_price")
-    private Float totalPrice;
+    private BigDecimal totalPrice;
 
     @TableField("deleted")
     private int deleted;
@@ -66,6 +68,6 @@ public class DlUser {
         this.endEquipmentName = equipment.getEquipmentName();
         this.endEquipmentCode = equipment.getEquipmentCode();
         this.endTime = s.getTime();
-        this.totalPrice = Float.valueOf(0);
+        this.totalPrice = BigDecimal.ZERO;
     }
 }

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

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("dl_equipment")
@@ -46,9 +47,9 @@ public class Equipment {
     @TableField("annotation")
     private String annotation;
     @TableField("enter_time")
-    private LocalDateTime enterTime;
+    private Date enterTime;
     @TableField("update_time")
-    private LocalDateTime updateTime;
+    private Date updateTime;
     @TableField("deleted")
     private Integer deleted;
 

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

@@ -12,6 +12,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("dl_exposure")
@@ -29,5 +30,5 @@ public class Exposure {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime createTime;
+    private Date createTime;
 }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.entity;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -9,8 +10,10 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.Date;
 
 @Data
 @TableName("dl_goods")
@@ -36,14 +39,14 @@ public class Goods {
     @TableField("goods_introduce")
     private String goodsIntroduce;
     @TableField("goods_price")
-    private Float goodsPrice;
+    private BigDecimal goodsPrice;
     @TableField("goods_classify")
     private String goodsClassify;
     @TableField("create_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @TableField("deleted")
     private int deleted;
@@ -63,6 +66,6 @@ public class Goods {
         this.goodsIntroduce = plan.getGoodsIntroduce();
         this.goodsPrice = plan.getGoodsPrice();
         this.goodsClassify = plan.getGoodsClassify();
-        this.createTime = LocalDateTime.now(ZoneId.of("Asia/Shanghai"));
+        this.createTime = DateUtil.date();
     }
 }

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

@@ -10,9 +10,8 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.bo.OrderAddBo;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
+import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @TableName("dl_order")
@@ -32,9 +31,9 @@ public class Order {
     @TableField("specs")
     private String specs;
     @TableField("goods_price")
-    private Float goodsPrice;
+    private BigDecimal goodsPrice;
     @TableField("total_price")
-    private Float totalPrice;
+    private BigDecimal totalPrice;
     @TableField("state")
     private String state;
     @TableField("user_id")
@@ -51,13 +50,15 @@ public class Order {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @TableField("deleted")
     private int deleted;
 
-    public Order() {}
-    public Order (OrderAddBo bo, App app){
+    public Order() {
+    }
+
+    public Order(OrderAddBo bo, App app) {
         this.orderId = bo.getOrderId();
         this.vendorId = bo.getVendorId();
         this.vendorName = bo.getVendorName();
@@ -65,7 +66,7 @@ public class Order {
         this.goodsName = bo.getGoodsName();
         this.goodsPrice = bo.getGoodsPrice();
         this.specs = bo.getSpecs();
-        this.totalPrice = bo.getDealCount() * bo.getGoodsPrice();
+        this.totalPrice = bo.getGoodsPrice().multiply(new BigDecimal(bo.getDealCount()));
         this.state = bo.getState();
         this.userId = bo.getUserId();
         this.userName = bo.getUserName();

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

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.entity;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -14,11 +15,13 @@ import com.ruoyi.demo.utils.OnStateUtil;
 import com.ruoyi.demo.utils.StateUtil;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 
 @Data
 @TableName("dl_plan")
@@ -54,7 +57,7 @@ public class Plan {
     @TableField("goods_introduce")
     private String goodsIntroduce;
     @TableField("goods_price")
-    private Float goodsPrice;
+    private BigDecimal goodsPrice;
     @TableField("goods_classify")
     private String goodsClassify;
     @TableField("template")
@@ -64,22 +67,22 @@ public class Plan {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planCreateTime;
+    private Date planCreateTime;
     @TableField("plan_start_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planStartTime;
+    private Date planStartTime;
     @TableField("plan_end_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planEndTime;
+    private Date planEndTime;
     @TableField("audit_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime auditTime;
+    private Date auditTime;
     @TableField("state")
     private Integer state;
 
@@ -114,7 +117,7 @@ public class Plan {
         this.goodsClassify = bo.getGoodsClassify();
         this.template = bo.getTemplate();
 
-        this.planCreateTime = LocalDateTime.now(ZoneId.of("Asia/Shanghai"));
+        this.planCreateTime = DateUtil.date();
         this.planStartTime = bo.getPlanStartTime();
         this.planEndTime = bo.getPlanEndTime();
 

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

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.entity;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -11,6 +12,7 @@ import lombok.Data;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.Date;
 
 @Data
 @TableName("dl_plan_audit")
@@ -31,7 +33,7 @@ public class PlanAudit {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime auditTime;
+    private Date auditTime;
 
     @TableField("deleted")
     private int deleted;
@@ -48,6 +50,6 @@ public class PlanAudit {
         else if (bo.getState() == 0)
             this.setAuditComment("未进行审核");
         else this.setAuditComment("审核不通过");
-        this.setAuditTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        this.setAuditTime(DateUtil.date());
     }
 }

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

@@ -11,7 +11,9 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("dl_plan_push_statistics")
@@ -35,10 +37,10 @@ public class PlanPushStatistics {
     @TableField("total_user_count")
     private Integer totalUserCount;
     @TableField("total_price")
-    private Float totalPrice;
+    private BigDecimal totalPrice;
     @TableField("laster_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime lasterTime;
+    private Date lasterTime;
 }

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

@@ -13,14 +13,13 @@ import com.ruoyi.demo.entity.bo.OrderAddBo;
 import com.ruoyi.demo.entity.bo.StatisticsAddBo;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
+import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @TableName("dl_statistics")
 public class Statistics {
-    @TableId(value = "statistics_id",type = IdType.ASSIGN_ID)
+    @TableId(value = "statistics_id", type = IdType.ASSIGN_ID)
     private String statisticsId;
 
     @TableField("appkey")
@@ -47,7 +46,7 @@ public class Statistics {
     @TableField("deal_tool_count")
     private Integer dealToolCount;
     @TableField("deal_tool_price")
-    private Float dealToolPrice;
+    private BigDecimal dealToolPrice;
     @TableField("user_id")
     private String userId;
     @TableField("user_name")
@@ -60,14 +59,16 @@ public class Statistics {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime time;
+    private Date time;
 
     @TableField("deleted")
     private int deleted;
 
-    public Statistics (){}
+    public Statistics() {
+    }
+
     // 客户扫码时调用
-    public Statistics (StatisticsAddBo bo, Equipment equipment){
+    public Statistics(StatisticsAddBo bo, Equipment equipment) {
         this.appkey = bo.getAppkey();
         this.equipmentId = equipment.getEquipmentId();
         this.equipmentCode = bo.getEquipmentCode();
@@ -78,15 +79,16 @@ public class Statistics {
         this.vendorId = bo.getVendorId();
         this.vendorName = bo.getVendorName();
         this.dealToolCount = 0;
-        this.dealToolPrice = Float.valueOf(0);
+        this.dealToolPrice = BigDecimal.ZERO;
         this.userId = bo.getUserId();
         this.userName = bo.getUserName();
         this.userTelephone = bo.getUserTelephone();
         this.behavior = 0;
         this.time = bo.getTime();
     }
+
     // 客户交易时调用
-    public Statistics (OrderAddBo bo, Equipment equipment){
+    public Statistics(OrderAddBo bo, Equipment equipment) {
         this.appkey = bo.getAppkey();
         this.equipmentId = equipment.getEquipmentId();
         this.equipmentCode = bo.getEquipmentCode();
@@ -97,7 +99,7 @@ public class Statistics {
         this.vendorId = bo.getVendorId();
         this.vendorName = bo.getVendorName();
         this.dealToolCount = bo.getDealCount();
-        this.dealToolPrice = bo.getGoodsPrice() * bo.getDealCount();
+        this.dealToolPrice = bo.getGoodsPrice().multiply(new BigDecimal(bo.getDealCount()));
         this.userId = bo.getUserId();
         this.userName = bo.getUserName();
         this.userTelephone = bo.getUserTelephone();

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

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("dl_store")
@@ -32,7 +33,7 @@ public class Store {
     @TableField("point")
     private String point;
     @TableField("create_time")
-    private LocalDateTime createTime;
+    private Date createTime;
     @TableField("principal_name")
     private String principalName;
     @TableField("principal_telephone")

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

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class CallBackBean {
@@ -19,5 +20,5 @@ public class CallBackBean {
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime auditTime;
+    private Date auditTime;
 }

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

@@ -8,6 +8,7 @@ import com.ruoyi.demo.entity.vo.CommercialVo;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -27,7 +28,7 @@ public class CommercialBo {
     private String addrCode;
     private String addrCodeInfo;
     private String addrInfo;
-    private LocalDateTime createTime;
+    private Date createTime;
     private Integer deleted;
     private List<String> apps;
 

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

@@ -5,6 +5,8 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
+
 @Data
 public class EquipmentBo {
     private String equipmentId;
@@ -23,8 +25,8 @@ public class EquipmentBo {
     private String maintainName;
     private String maintainTelephone;
     private String annotation;
-    private LocalDateTime enterTime;
-    private LocalDateTime updateTime;
+    private Date enterTime;
+    private Date updateTime;
     private Integer deleted;
 
     public EquipmentBo(Equipment equipment) {

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

@@ -2,6 +2,8 @@ package com.ruoyi.demo.entity.bo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class GoodsAddBo {
     private String appkey;
@@ -10,6 +12,6 @@ public class GoodsAddBo {
     private String goodsName;
     private String goodsLogo;
     private String goodsIntroduce;
-    private Float goodsPrice;
+    private BigDecimal goodsPrice;
     private String goodsClassify;
 }

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

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 @Data
 public class OrderAddBo extends StatisticsAddBo {
@@ -13,7 +14,7 @@ public class OrderAddBo extends StatisticsAddBo {
     @NotBlank(groups = {AddGroup.class},message = "规格不能为空")
     private String specs;
     @NotNull(groups = {AddGroup.class},message = "商品价格不能为空")
-    private Float goodsPrice;
+    private BigDecimal goodsPrice;
     @NotNull(groups = {AddGroup.class},message = "交易数量不能为空")
     private Integer dealCount;
     @NotBlank(groups = {AddGroup.class},message = "交易状态不能为空")

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

@@ -4,50 +4,50 @@ import com.ruoyi.common.core.validate.AddGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
-import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Data
 public class PlanAddBo {
-    @NotBlank(groups = {AddGroup.class},message = "计划名称不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "计划名称不能为空")
     private String planName;
 
-    @NotBlank(groups = {AddGroup.class},message = "appkey不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "appkey不能为空")
     private String appkey;
 
-    @NotBlank(groups = {AddGroup.class},message = "供应商Id不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "供应商Id不能为空")
     private String vendorId;
-    @NotBlank(groups = {AddGroup.class},message = "供应商名称不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "供应商名称不能为空")
     private String vendorName;
 
-    @NotBlank(groups = {AddGroup.class},message = "商品Id不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "商品Id不能为空")
     private String goodsId;
-    @NotBlank(groups = {AddGroup.class},message = "商品图片不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "商品图片不能为空")
     private String goodsImg;
-    @NotBlank(groups = {AddGroup.class},message = "商品名称不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "商品名称不能为空")
     private String goodsName;
-    @NotBlank(groups = {AddGroup.class},message = "海报不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "海报不能为空")
     private String goodsLogo;
-    @NotBlank(groups = {AddGroup.class},message = "商品介绍不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "商品介绍不能为空")
     private String goodsIntroduce;
-    @NotNull(groups = {AddGroup.class},message = "商品价格不能为空")
-    private Float goodsPrice;
+    @NotNull(groups = {AddGroup.class}, message = "商品价格不能为空")
+    private BigDecimal goodsPrice;
     private String goodsClassify;
     private String template;
 
-    @NotBlank(groups = {AddGroup.class},message = "广告负责人名称不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "广告负责人名称不能为空")
     private String principalName;
-    @NotBlank(groups = {AddGroup.class},message = "负责人联系方式不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "负责人联系方式不能为空")
     private String principalTelephone;
 
-    @NotNull(groups = {AddGroup.class},message = "计划开始时间不能为空")
-    private LocalDateTime planStartTime;
-    @NotNull(groups = {AddGroup.class},message = "计划结束时间不能为空")
-    private LocalDateTime planEndTime;
-    @NotNull(groups = {AddGroup.class},message = "设备不能为空")
+    @NotNull(groups = {AddGroup.class}, message = "计划开始时间不能为空")
+    private Date planStartTime;
+    @NotNull(groups = {AddGroup.class}, message = "计划结束时间不能为空")
+    private Date planEndTime;
+    @NotNull(groups = {AddGroup.class}, message = "设备不能为空")
     private List<PlanItemAddBo> items;
-    @NotBlank(groups = {AddGroup.class},message = "签名不能为空")
+    @NotBlank(groups = {AddGroup.class}, message = "签名不能为空")
     private String sign;
 }

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

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -25,11 +26,11 @@ public class PlanBo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime startTime;
+    private Date startTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime endTime;
+    private Date endTime;
     private String commercialId;
     private List<String> addrCodes;
 }

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

@@ -12,7 +12,9 @@ import com.ruoyi.demo.entity.Plan;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @NoArgsConstructor
@@ -29,21 +31,21 @@ public class PlanItemBo {
     private String goodsName;
     private String goodsLogo;
     private String goodsIntroduce;
-    private Float goodsPrice;
+    private BigDecimal goodsPrice;
     private String goodsClassify;
     private int sort;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planCreateTime;
+    private Date planCreateTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planStartTime;
+    private Date planStartTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planEndTime;
+    private Date planEndTime;
 
     @TableField("deleted")
     private int deleted;

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

@@ -6,6 +6,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class StatisticsAddBo {
@@ -28,7 +29,7 @@ public class StatisticsAddBo {
     @NotBlank(groups = {AddGroup.class},message = "客户联系方式不能为空")
     private String userTelephone;
     @NotNull(groups = {AddGroup.class},message = "时间不能为空")
-    private LocalDateTime time;
+    private Date time;
     @NotBlank(groups = {AddGroup.class},message = "签名不能为空")
     private String sign;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/AppVo.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class AppVo {
@@ -36,7 +37,7 @@ public class AppVo {
     private String prove3;
     private String prove4;
     private String prove5;
-    private LocalDateTime createTime;
+    private Date createTime;
     private String annotation;
     private Integer deleted;
 

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/CommercialVo.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class CommercialVo {
@@ -36,7 +37,7 @@ public class CommercialVo {
     private String addrCodeInfo;
     @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "公司注册地址不能为空")
     private String addrInfo;
-    private LocalDateTime createTime;
+    private Date createTime;
     private Integer deleted;
 
     private String searchText;

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/DlUserListVo.java

@@ -8,7 +8,9 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.DlUser;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class DlUserListVo {
@@ -20,14 +22,14 @@ public class DlUserListVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime startTime;
+    private Date startTime;
     private String endEquipmentId;
     private String endEquipmentName;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime endTime;
-    private Float totalPrice;
+    private Date endTime;
+    private BigDecimal totalPrice;
 
     public DlUserListVo(){}
     public DlUserListVo(DlUser user){

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/EquipmentVo.java

@@ -10,6 +10,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class EquipmentVo {
@@ -44,7 +45,7 @@ public class EquipmentVo {
     private String maintainName;
     @NotBlank(groups = {AddGroup.class, EditGroup.class},message = "维护人员联系方式不能为空")
     private String maintainTelephone;
-    private LocalDateTime enterTime;
-    private LocalDateTime updateTime;
+    private Date enterTime;
+    private Date updateTime;
     private Integer deleted;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/GoodsListVo.java

@@ -3,7 +3,9 @@ package com.ruoyi.demo.entity.vo;
 import com.ruoyi.demo.entity.Goods;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class GoodsListVo {
@@ -15,10 +17,10 @@ public class GoodsListVo {
     private String goodsId;
     private String goodsImg;
     private String goodsName;
-    private Float goodsPrice;
+    private BigDecimal goodsPrice;
     private String goodsClassify;
 
-    private LocalDateTime createTime;
+    private Date createTime;
 
     public GoodsListVo(){}
     public GoodsListVo(Goods goods){

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/OrderVo.java

@@ -3,7 +3,9 @@ package com.ruoyi.demo.entity.vo;
 import com.ruoyi.demo.entity.Order;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class OrderVo {
@@ -11,12 +13,12 @@ public class OrderVo {
     private String appName;
     private String goodsName;
     private String specs;
-    private Float goodsPrice;
-    private Float totalPrice;
+    private BigDecimal goodsPrice;
+    private BigDecimal totalPrice;
     private String state;
     private String userName;
     private String vendorName;
-    private LocalDateTime createTime;
+    private Date createTime;
 
     public OrderVo(){}
     public OrderVo(Order order){

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanHomeVo.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class PlanHomeVo {
@@ -15,5 +16,5 @@ public class PlanHomeVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime time;
+    private Date time;
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanListVo.java

@@ -10,6 +10,7 @@ import com.ruoyi.demo.utils.OnStateUtil;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 // 广告计划列表
 @Data
@@ -22,15 +23,15 @@ public class PlanListVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planCreateTime;
+    private Date planCreateTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planStartTime;
+    private Date planStartTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planEndTime;
+    private Date planEndTime;
     private String onState;
 
     public PlanListVo(){}

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanManageDetailVo.java

@@ -9,7 +9,9 @@ import com.ruoyi.demo.entity.Plan;
 import com.ruoyi.demo.utils.StateUtil;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -18,14 +20,14 @@ public class PlanManageDetailVo {
     private String appName;
     private String goodsName;
     private String goodsImg;
-    private Float goodsPrice;
+    private BigDecimal goodsPrice;
     private String goodsLogo;
     private String commercialName;
     private String state;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planCreateTime;
+    private Date planCreateTime;
     private List<PlanManageItemVo> planItems;
 
     public PlanManageDetailVo(){}

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanManageListVo.java

@@ -9,7 +9,9 @@ import com.ruoyi.demo.entity.Plan;
 import com.ruoyi.demo.utils.StateUtil;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class PlanManageListVo {
@@ -17,26 +19,26 @@ public class PlanManageListVo {
     private String appName;
     private String goodsImg;
     private String goodsName;
-    private Float goodsPrice;
+    private BigDecimal goodsPrice;
     private String commercialName;
     private Integer equipmentCount;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planStartTime;
+    private Date planStartTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planEndTime;
+    private Date planEndTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime auditTime;
+    private Date auditTime;
     private String state;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planCreateTime;
+    private Date planCreateTime;
 
     public PlanManageListVo(){}
     public PlanManageListVo(Plan plan){

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanPushListVo.java

@@ -10,6 +10,7 @@ import com.ruoyi.demo.utils.StateUtil;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 // 广告推送计划列表
 @Data
@@ -23,16 +24,16 @@ public class PlanPushListVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planStartTime;
+    private Date planStartTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planEndTime;
+    private Date planEndTime;
     private Integer equipmentCount;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime planCreateTime;
+    private Date planCreateTime;
 
     public PlanPushListVo(){}
     public PlanPushListVo(Plan plan){

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanPushStatisticsListVo.java

@@ -8,7 +8,9 @@ import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.PlanPushStatistics;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 // 广告投放列表
 @Data
@@ -21,11 +23,11 @@ public class PlanPushStatisticsListVo {
     private Integer scanCodeCount;
     private String ratio;
     private Integer totalUserCount;
-    private Float totalPrice;
+    private BigDecimal totalPrice;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime lasterTime;
+    private Date lasterTime;
 
     public PlanPushStatisticsListVo(){}
     public PlanPushStatisticsListVo(PlanPushStatistics statistics){

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanPushVo.java

@@ -5,6 +5,8 @@ import com.ruoyi.demo.entity.PlanItem;
 import com.ruoyi.demo.entity.SystemSetter;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class PlanPushVo {
     private String itemId;
@@ -15,7 +17,7 @@ public class PlanPushVo {
     private String goodsName;
     private String goodsLogo;
     private String goodsIntroduce;
-    private Float goodsPrice;
+    private BigDecimal goodsPrice;
     private String goodsClassify;
     private String template;
     private Integer sort;

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/ScanListVo.java

@@ -9,6 +9,7 @@ import com.ruoyi.demo.entity.Statistics;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class ScanListVo {
@@ -24,7 +25,7 @@ public class ScanListVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime time;
+    private Date time;
 
     public ScanListVo(){}
     public ScanListVo(Statistics statistics){

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/StoreVo.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class StoreVo {
@@ -25,7 +26,7 @@ public class StoreVo {
     private BigDecimal lat;
     private BigDecimal lng;
     private String point;
-    private LocalDateTime createTime;
+    private Date createTime;
 
     private String searchText;
 

ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/StatisticsMapper.java

@@ -5,6 +5,7 @@ import com.ruoyi.demo.entity.Statistics;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -18,7 +19,7 @@ public interface StatisticsMapper extends BaseMapper<Statistics> {
     // 累计交易
     Integer selectDealCountByEquipmentCode(@Param("equipmentCode") String equipmentCode);
     // 累计收入
-    Float selectTotalPriceByEquipmentCode(@Param("equipmentCode") String equipmentCode);
+    BigDecimal selectTotalPriceByEquipmentCode(@Param("equipmentCode") String equipmentCode);
 
 //     扫码记录
     // 按月分析

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

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -62,7 +63,7 @@ public class AppServiceImpl implements AppService {
             //生成密钥
             app.setAppSecret(UuidUtil.getUUID());
             //时间
-            app.setCreateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            app.setCreateTime(DateUtil.date());
             appMapper.insert(app);
             return R.ok("添加成功");
         }

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

@@ -1,6 +1,7 @@
 package com.ruoyi.demo.service.impl;
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -52,7 +53,7 @@ public class CommercialServiceImpl implements CommericalService {
     @Override
     public void addCommercial(CommercialVo commercialVo) {
         Commercial commercial = new Commercial(commercialVo);
-        commercial.setCreateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        commercial.setCreateTime(DateUtil.date());
         commercial.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(commercial.getAddrCode()));
         commercialMapper.insert(commercial);
     }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -86,7 +87,7 @@ public class EquipmentServiceImpl implements EquipmentService {
             //equipment.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(equipment.getAddrCode()));
 
             //2.新增创建时间
-            equipment.setEnterTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            equipment.setEnterTime(DateUtil.date());
 
             if (equipmentVo.getOnState() == 1){
                 //唤醒
@@ -115,7 +116,7 @@ public class EquipmentServiceImpl implements EquipmentService {
 
         if (equipment != null){
             //2.更新时间
-            equipmentVo.setUpdateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            equipmentVo.setUpdateTime(DateUtil.date());
             UpdateWrapper<Equipment> updateWrapper = new UpdateWrapper<>();
             updateWrapper.eq("equipment_id",equipmentVo.getEquipmentId());
             updateWrapper.set("equipment_name",equipmentVo.getEquipmentName())
@@ -207,7 +208,7 @@ public class EquipmentServiceImpl implements EquipmentService {
             planItemBoQueryWrapper.eq("dl_plan_item.deleted",0);
         });
         queryWrapper.and(planItemBoQueryWrapper -> {
-            planItemBoQueryWrapper.gt("plan_end_time",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            planItemBoQueryWrapper.gt("plan_end_time",DateUtil.date());
         });
         Integer count = planItemMapper.getEuipmentPlanCont(queryWrapper);
         if (count > 0)
@@ -292,7 +293,7 @@ public class EquipmentServiceImpl implements EquipmentService {
             planItemBoQueryWrapper.eq("dl_plan.on_state",1);  //上架
         });
         queryWrapper.and(planItemBoQueryWrapper -> {
-            planItemBoQueryWrapper.gt("plan_end_time",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));  //结束时间大于当前时间
+            planItemBoQueryWrapper.gt("plan_end_time",DateUtil.date());  //结束时间大于当前时间
         });
 
         queryWrapper.apply("dl_plan.`plan_id` = dl_plan_item.`plan_id`");

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

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.ruoyi.demo.entity.Exposure;
 import com.ruoyi.demo.mapper.ExposureMapper;
 import com.ruoyi.demo.service.ExposureService;
@@ -18,7 +19,7 @@ public class ExposureServiceImpl implements ExposureService {
 
     @Override
     public int add(Exposure bo) {
-        bo.setCreateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        bo.setCreateTime(DateUtil.date());
         return exposureMapper.insert(bo);
     }
 }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -37,7 +38,7 @@ public class GoodsServiceImpl implements GoodsService {
         Goods one = goodsMapper.selectOne(goodsQueryWrapper);
         if (one != null)
             return 2;
-        goods.setCreateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        goods.setCreateTime(DateUtil.date());
         return goodsMapper.insert(goods);
     }
 

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

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -39,105 +40,105 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public String getSign(OrderAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
-        appQueryWrapper.eq("appkey",bo.getAppkey());
-        appQueryWrapper.eq("state",1);
-        appQueryWrapper.eq("deleted","0");
+        appQueryWrapper.eq("appkey", bo.getAppkey());
+        appQueryWrapper.eq("state", 1);
+        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("createTime",bo.getTime())
-            .set("dealCount",bo.getDealCount())
-            .set("equipmentCode",bo.getEquipmentCode())
-            .set("goodsId",bo.getGoodsId())
-            .set("goodsName",bo.getGoodsName())
-            .set("goodsPrice",bo.getGoodsPrice())
-            .set("orderId",bo.getOrderId())
-            .set("userId",bo.getUserId())
-            .set("userName",bo.getUserName())
-            .set("userTelephone",bo.getUserTelephone())
-            .set("vendorId",bo.getVendorId())
-            .set("vendorName",bo.getVendorName())
-            .set("sign",null)
-            .set("specs",bo.getSpecs())
-            .set("state",bo.getState());
-        return SignUtil.sign(params,app.getAppSecret());
+        Map<String, Object> params = Dict.create()
+            .set("appkey", bo.getAppkey())
+            .set("createTime", bo.getTime())
+            .set("dealCount", bo.getDealCount())
+            .set("equipmentCode", bo.getEquipmentCode())
+            .set("goodsId", bo.getGoodsId())
+            .set("goodsName", bo.getGoodsName())
+            .set("goodsPrice", bo.getGoodsPrice())
+            .set("orderId", bo.getOrderId())
+            .set("userId", bo.getUserId())
+            .set("userName", bo.getUserName())
+            .set("userTelephone", bo.getUserTelephone())
+            .set("vendorId", bo.getVendorId())
+            .set("vendorName", bo.getVendorName())
+            .set("sign", null)
+            .set("specs", bo.getSpecs())
+            .set("state", bo.getState());
+        return SignUtil.sign(params, app.getAppSecret());
     }
 
     // 添加订单
     @Override
     public int addOrder(OrderAddBo bo) {
         QueryWrapper<App> appQueryWrapper = new QueryWrapper<>();
-        appQueryWrapper.eq("appkey",bo.getAppkey());
-        appQueryWrapper.eq("state",1);
-        appQueryWrapper.eq("deleted","0");
+        appQueryWrapper.eq("appkey", bo.getAppkey());
+        appQueryWrapper.eq("state", 1);
+        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("createTime",bo.getTime())
-            .set("dealCount",bo.getDealCount())
-            .set("equipmentCode",bo.getEquipmentCode())
-            .set("goodsId",bo.getGoodsId())
-            .set("goodsName",bo.getGoodsName())
-            .set("goodsPrice",bo.getGoodsPrice())
-            .set("orderId",bo.getOrderId())
-            .set("userId",bo.getUserId())
-            .set("userName",bo.getUserName())
-            .set("userTelephone",bo.getUserTelephone())
-            .set("vendorId",bo.getVendorId())
-            .set("vendorName",bo.getVendorName())
-            .set("sign",bo.getSign())
-            .set("specs",bo.getSpecs())
-            .set("state",bo.getState());
-        if (!SignUtil.verify(params,app.getAppSecret()))
+        Map<String, Object> params = Dict.create()
+            .set("appkey", bo.getAppkey())
+            .set("createTime", bo.getTime())
+            .set("dealCount", bo.getDealCount())
+            .set("equipmentCode", bo.getEquipmentCode())
+            .set("goodsId", bo.getGoodsId())
+            .set("goodsName", bo.getGoodsName())
+            .set("goodsPrice", bo.getGoodsPrice())
+            .set("orderId", bo.getOrderId())
+            .set("userId", bo.getUserId())
+            .set("userName", bo.getUserName())
+            .set("userTelephone", bo.getUserTelephone())
+            .set("vendorId", bo.getVendorId())
+            .set("vendorName", bo.getVendorName())
+            .set("sign", bo.getSign())
+            .set("specs", bo.getSpecs())
+            .set("state", bo.getState());
+        if (!SignUtil.verify(params, app.getAppSecret()))
             return -3;
         // 验证通过后，如果用户不存在，则添加用户；否则更新用户信息
         QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
-        equipmentQueryWrapper.eq("equipment_code",bo.getEquipmentCode());
+        equipmentQueryWrapper.eq("equipment_code", bo.getEquipmentCode());
         Equipment equipment = equipmentMapper.selectOne(equipmentQueryWrapper);
 
         QueryWrapper<DlUser> userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.eq("user_id",bo.getUserId());
+        userQueryWrapper.eq("user_id", bo.getUserId());
         DlUser user = dlUserMapper.selectOne(userQueryWrapper);
 
         if (user == null)
-            dlUserMapper.insert(new DlUser(bo,equipment));
-        else{
+            dlUserMapper.insert(new DlUser(bo, equipment));
+        else {
             user.setEndEquipmentId(equipment.getEquipmentId());
             user.setEndEquipmentName(equipment.getEquipmentName());
             user.setEndEquipmentCode(equipment.getEquipmentCode());
             user.setEndTime(bo.getTime());
-            user.setTotalPrice(user.getTotalPrice() + bo.getGoodsPrice() * bo.getDealCount());
-            dlUserMapper.update(user,userQueryWrapper);
+            user.setTotalPrice(user.getTotalPrice().add(bo.getGoodsPrice().multiply(new BigDecimal(bo.getDealCount()))));
+            dlUserMapper.update(user, userQueryWrapper);
         }
         // 添加交易行为记录
-        statisticsMapper.insert(new Statistics(bo,equipment));
+        statisticsMapper.insert(new Statistics(bo, equipment));
         // 添加订单
-        return orderMapper.insert(new Order(bo,app));
+        return orderMapper.insert(new Order(bo, app));
     }
 
     // 查询订单列表
     @Override
     public PageInfo<List<OrderVo>> getOrderList(PlanBo bo) {
-        PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
+        PageHelper.startPage(bo.getPageNum(), bo.getPageSize(), true);
         QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
         if (bo.getText() != null)
             queryWrapper.and(orderQueryWrapper -> {
-                orderQueryWrapper.like("order_id",bo.getText())
+                orderQueryWrapper.like("order_id", bo.getText())
                     .or()
-                    .like("goods_name",bo.getText())
+                    .like("goods_name", bo.getText())
                     .or()
-                    .like("user_name",bo.getText())
+                    .like("user_name", bo.getText())
                     .or()
-                    .like("vendor_name",bo.getText());
+                    .like("vendor_name", bo.getText());
             });
         if (bo.getStartTime() != null) // 搜索开始时间小于等于订单创建时间
-            queryWrapper.apply("create_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
+            queryWrapper.apply("create_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getStartTime());
         if (bo.getEndTime() != null) // 搜索结束时间大于等于订单创建时间
-            queryWrapper.apply("create_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
+            queryWrapper.apply("create_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')", bo.getEndTime());
         List<Order> orders = orderMapper.selectList(queryWrapper);
         List<OrderVo> vos = new ArrayList<>();
         for (Order order : orders)

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

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Dict;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -20,12 +21,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 @Transactional
@@ -175,7 +174,7 @@ public class PlanServiceImpl implements PlanService {
             return -1;
         // 确定审核状态并更新广告计划
         plan.setState(bo.getState());
-        LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Shanghai")); // 启动回调地址时也用该时间
+        Date now = DateUtil.date(); // 启动回调地址时也用该时间
         plan.setAuditTime(now);
         int i = planMapper.updateById(plan);
         if (i == 0) return 0;
@@ -256,8 +255,8 @@ public class PlanServiceImpl implements PlanService {
             QueryWrapper<Plan> planQueryWrapper = new QueryWrapper<>();
 
             // 广告计划开始时间 <= 当前时间 < 广告计划结束时间
-            planQueryWrapper.apply("plan_start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
-            planQueryWrapper.apply("plan_end_time > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            planQueryWrapper.apply("plan_start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",DateUtil.date());
+            planQueryWrapper.apply("plan_end_time > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",DateUtil.date());
 
             planQueryWrapper.eq("plan_id",item.getPlanId());
             planQueryWrapper.eq("state",StateUtil.APPROVED);
@@ -284,8 +283,8 @@ public class PlanServiceImpl implements PlanService {
             planQueryWrapper.eq("plan_id",item.getPlanId());
 
             // 广告计划开始时间 <= 当前时间 < 广告计划结束时间
-            planQueryWrapper.apply("plan_start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
-            planQueryWrapper.apply("plan_end_time > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            planQueryWrapper.apply("plan_start_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",DateUtil.date());
+            planQueryWrapper.apply("plan_end_time > STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",DateUtil.date());
 
             planQueryWrapper.eq("state",StateUtil.APPROVED);
             planQueryWrapper.eq("on_state", OnStateUtil.UP);
@@ -430,7 +429,7 @@ public class PlanServiceImpl implements PlanService {
     public void planPushStatisticsStart() {
         // 清除当前月的统计记录
         QueryWrapper<PlanPushStatistics> planPushStatisticsQueryWrapper = new QueryWrapper<>();
-        planPushStatisticsQueryWrapper.apply("DATE_FORMAT(laster_time,'%Y-%m') = DATE_FORMAT({0},'%Y-%m')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        planPushStatisticsQueryWrapper.apply("DATE_FORMAT(laster_time,'%Y-%m') = DATE_FORMAT({0},'%Y-%m')",DateUtil.date());
         planPushStatisticsMapper.delete(planPushStatisticsQueryWrapper);
         // 获取所有设备，遍历
         for (Equipment equipment : equipmentMapper.selectList(null)) {
@@ -441,7 +440,7 @@ public class PlanServiceImpl implements PlanService {
             Integer scanCount = statisticsMapper.selectScanByEquipmentCode(equipment.getEquipmentCode());
             Integer tradeCount = statisticsMapper.selectDealCountByEquipmentCode(equipment.getEquipmentCode());
             List<String> users = statisticsMapper.selectUserIdsByEquipmentCode(equipment.getEquipmentCode());
-            Float totalPrice = statisticsMapper.selectTotalPriceByEquipmentCode(equipment.getEquipmentCode());
+            BigDecimal totalPrice = statisticsMapper.selectTotalPriceByEquipmentCode(equipment.getEquipmentCode());
             // 插入记录
             PlanPushStatistics planPushStatistics = new PlanPushStatistics();
             planPushStatistics.setEquipmentId(equipment.getEquipmentId());
@@ -451,8 +450,8 @@ public class PlanServiceImpl implements PlanService {
             planPushStatistics.setScanCodeCount(scanCount);
             planPushStatistics.setTradeCount(tradeCount);
             planPushStatistics.setTotalUserCount(users == null ? 0 : users.size());
-            planPushStatistics.setTotalPrice(totalPrice == null ? Float.valueOf(0) : totalPrice);
-            planPushStatistics.setLasterTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+            planPushStatistics.setTotalPrice(totalPrice == null ? BigDecimal.ZERO : totalPrice);
+            planPushStatistics.setLasterTime(DateUtil.date());
             planPushStatisticsMapper.insert(planPushStatistics);
         }
     }

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

@@ -1,5 +1,7 @@
 package com.ruoyi.demo.service.impl;
 
+import cn.hutool.core.date.DateField;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Dict;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
@@ -56,7 +58,7 @@ public class StatisticsServiceImpl implements StatisticsService {
     public PlanHomeVo getScanTotal() {
         PlanHomeVo vo = new PlanHomeVo();
         vo.setTotal(statisticsMapper.selectTotal());
-        vo.setTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        vo.setTime(DateUtil.date());
         return vo;
     }
 
@@ -128,17 +130,17 @@ public class StatisticsServiceImpl implements StatisticsService {
         Map<String, Integer> map = new LinkedHashMap<>();
         if (option.equals("day")){ // 时间粒度：天
             for (int i=0;i<30;i++){
-                String day = LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusDays(-i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+                String day = DateUtil.yesterday().toString();
                 map.put(day,statisticsMapper.selectTimeDisByDay(day));
             }
         } else if (option.equals("year")){ // 时间粒度：年
             for (int i=0;i<12;i++){
-                String year = LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusYears(-i).format(DateTimeFormatter.ofPattern("yyyy"));
+                String year = DateUtil.offset(DateUtil.date(), DateField.YEAR,-1).toString();
                 map.put(year,statisticsMapper.selectTimeDisByYear(year));
             }
         } else { // 时间粒度：月
             for (int i=0;i<12;i++){
-                String month = LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM"));
+                String month = DateUtil.lastMonth().toString();
                 map.put(month,statisticsMapper.selectTimeDisByMonth(month));
             }
         }
@@ -151,21 +153,21 @@ public class StatisticsServiceImpl implements StatisticsService {
         if (option.equals("day")){ // 时间粒度：天
             for (int i=0;i<30;i++){
                 TimeAndCountVo vo = new TimeAndCountVo();
-                vo.setTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusDays(-i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+                vo.setTime( DateUtil.yesterday().toString());
                 vo.setCount(statisticsMapper.selectTimeDisByDay(vo.getTime()));
                 vos.add(vo);
             }
         } else if (option.equals("year")){ // 时间粒度：年
             for (int i=0;i<12;i++){
                 TimeAndCountVo vo = new TimeAndCountVo();
-                vo.setTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusYears(-i).format(DateTimeFormatter.ofPattern("yyyy")));
+                vo.setTime(DateUtil.offset(DateUtil.date(), DateField.YEAR,-1).toString());
                 vo.setCount(statisticsMapper.selectTimeDisByYear(vo.getTime()));
                 vos.add(vo);
             }
         } else { // 时间粒度：月
             for (int i=0;i<12;i++){
                 TimeAndCountVo vo = new TimeAndCountVo();
-                vo.setTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")).plusMonths(-i).format(DateTimeFormatter.ofPattern("yyyy-MM")));
+                vo.setTime(DateUtil.lastMonth().toString());
                 vo.setCount(statisticsMapper.selectTimeDisByMonth(vo.getTime()));
                 vos.add(vo);
             }

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

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -45,7 +46,7 @@ public class StoreServiceImpl implements StoreService {
     public void addStore(StoreVo storeVo) {
         Store store = new Store(storeVo);
         //store.setAddrCodeInfo(initMapUtil.getInitAddrCodeMap(store.getAddrCode()));
-        store.setCreateTime(LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        store.setCreateTime(DateUtil.date());
         storeMapper.insert(store);
     }
 

ruoyi-demo/src/main/java/com/ruoyi/demo/utils/SendCallBackUtil.java

@@ -1,5 +1,6 @@
 package com.ruoyi.demo.utils;
 
+import cn.hutool.core.date.DateUtil;
 import com.ruoyi.demo.entity.bo.CallBackBean;
 import org.springframework.web.client.RestTemplate;
 
@@ -14,7 +15,7 @@ public class SendCallBackUtil {
         callBackBean.setState("测试");
         callBackBean.setAuditPerson("自动回复");
         callBackBean.setAuditComment("这是个测试信息,请勿回复");
-        callBackBean.setAuditTime(LocalDateTime.now());
+        callBackBean.setAuditTime(DateUtil.date());
         restTemplate.postForObject(callBack,callBackBean,String.class);
     }
 

ruoyi-job/src/main/java/com/ruoyi/job/service/PlanPushService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.job.service;
 
+import cn.hutool.core.date.DateUtil;
 import com.ruoyi.demo.service.PlanService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.context.XxlJobHelper;
@@ -19,8 +20,8 @@ public class PlanPushService {
 
     @XxlJob("planPushJobHandler")
     public void start() throws Exception {
-        XxlJobHelper.log("start planPushStatistics"+ LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        XxlJobHelper.log("start planPushStatistics"+ DateUtil.date());
         planService.planPushStatisticsStart();
-        XxlJobHelper.log("finish planPushStatistics"+ LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        XxlJobHelper.log("finish planPushStatistics"+ DateUtil.date());
     }
 }