Merge branch 'lcy' of http://47.107.53.207:3000/traineeCoder001/Digital-Investment

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

@@ -3,6 +3,8 @@ package com.ruoyi.demo.entity.vo;
 import com.ruoyi.demo.entity.Goods;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class GoodsListVo {
     private String appkey;
@@ -16,6 +18,8 @@ public class GoodsListVo {
     private Float goodsPrice;
     private String goodsClassify;
 
+    private LocalDateTime createTime;
+
     public GoodsListVo(){}
     public GoodsListVo(Goods goods){
         this.appkey = goods.getAppkey();
@@ -28,5 +32,7 @@ public class GoodsListVo {
         this.goodsName = goods.getGoodsName();
         this.goodsPrice = goods.getGoodsPrice();
         this.goodsClassify = goods.getGoodsClassify();
+
+        this.createTime = goods.getCreateTime();
     }
 }

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

@@ -0,0 +1,34 @@
+package com.ruoyi.demo.entity.vo;
+
+import com.ruoyi.demo.entity.Order;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class OrderVo {
+    private String orderId;
+    private String appName;
+    private String goodsName;
+    private String specs;
+    private Float goodsPrice;
+    private Float totalPrice;
+    private String state;
+    private String userName;
+    private String vendorName;
+    private LocalDateTime createTime;
+
+    public OrderVo(){}
+    public OrderVo(Order order){
+        this.orderId = order.getOrderId();
+        this.appName = order.getAppName();
+        this.goodsName = order.getGoodsName();
+        this.specs = order.getSpecs();
+        this.goodsPrice = order.getGoodsPrice();
+        this.totalPrice = order.getTotalPrice();
+        this.state = order.getState();
+        this.userName = order.getUserName();
+        this.vendorName = order.getVendorName();
+        this.createTime = order.getCreateTime();
+    }
+}

ruoyi-demo/src/main/java/com/ruoyi/demo/service/OrderService.java

@@ -4,11 +4,12 @@ import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.Order;
 import com.ruoyi.demo.entity.bo.OrderAddBo;
 import com.ruoyi.demo.entity.bo.PlanBo;
+import com.ruoyi.demo.entity.vo.OrderVo;
 
 import java.util.List;
 
 public interface OrderService {
     String getSign(OrderAddBo bo);
     int addOrder(OrderAddBo bo);
-    PageInfo<List<Order>> getOrderList(PlanBo bo);
+    PageInfo<List<OrderVo>> getOrderList(PlanBo bo);
 }

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

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo;
 import com.ruoyi.demo.entity.*;
 import com.ruoyi.demo.entity.bo.OrderAddBo;
 import com.ruoyi.demo.entity.bo.PlanBo;
+import com.ruoyi.demo.entity.vo.OrderVo;
 import com.ruoyi.demo.mapper.*;
 import com.ruoyi.demo.service.OrderService;
 import com.ruoyi.demo.utils.SignUtil;
@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -119,7 +121,7 @@ public class OrderServiceImpl implements OrderService {
 
     // 查询订单列表
     @Override
-    public PageInfo<List<Order>> getOrderList(PlanBo bo) {
+    public PageInfo<List<OrderVo>> getOrderList(PlanBo bo) {
         PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
         QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
         if (bo.getText() != null)
@@ -137,6 +139,9 @@ public class OrderServiceImpl implements OrderService {
         if (bo.getEndTime() != null)
             queryWrapper.apply("create_time <= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getEndTime());
         List<Order> orders = orderMapper.selectList(queryWrapper);
-        return new PageInfo(orders);
+        List<OrderVo> vos = new ArrayList<>();
+        for (Order order : orders)
+            vos.add(new OrderVo(order));
+        return new PageInfo(vos);
     }
 }

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

@@ -413,7 +413,7 @@ public class PlanServiceImpl implements PlanService {
     public void planPushStatisticsStart() {
         // 清除当前月的统计记录
         QueryWrapper<PlanPushStatistics> planPushStatisticsQueryWrapper = new QueryWrapper<>();
-        planPushStatisticsQueryWrapper.apply("DATE_FORMAT(laster_time,'%Y-%m') = STR_TO_DATE({0},'%Y-%m')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
+        planPushStatisticsQueryWrapper.apply("DATE_FORMAT(laster_time,'%Y-%m') = DATE_FORMAT({0},'%Y-%m')",LocalDateTime.now(ZoneId.of("Asia/Shanghai")));
         planPushStatisticsMapper.delete(planPushStatisticsQueryWrapper);
         // 获取所有设备，遍历
         for (Equipment equipment : equipmentMapper.selectList(null)) {