#MOD 商家订单分页页面统计

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniOrderController.java

@@ -2,10 +2,10 @@ package com.xy.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.xy.annotate.RestMappingController;
 import com.xy.dto.DeviceDataDto;
-import com.xy.dto.DeviceInfoDto;
 import com.xy.service.DeviceDataServiceImpl;
 import com.xy.utils.MercAuthUtils;
 import com.xy.utils.R;
@@ -34,10 +34,16 @@ public class MercMiniOrderController {
 
     @ApiOperation("订单列表页统计")
     @PostMapping("count")
-    public R<DeviceDataDto.MercOrdersDayCountVO> mercHomeStatistical(@RequestBody @Valid DeviceInfoDto.MercHomeQueryDTO dto) {
+    public R<DeviceDataDto.MercOrdersDayCountVO> mercHomeStatistical(@RequestBody @Valid DeviceDataDto.MercOrdersDayCountDTO dto) {
         DeviceDataDto.MercOrdersDayCountVO vo = new DeviceDataDto.MercOrdersDayCountVO().setOrderNum(0).setOrderTotalAmount(0);
+        String dateValue = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN);
         Long mercId = MercAuthUtils.getMercId();
-        List<DeviceDataDto.Vo> mercDataOneDay = deviceDataService.getMercDataOneDay(mercId, DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN));
+        DateTime orderDate = dto.getOrderDate();
+        if (orderDate != null) {
+            dateValue = DateUtil.format(orderDate, DatePattern.PURE_DATE_PATTERN);
+        }
+
+        List<DeviceDataDto.Vo> mercDataOneDay = deviceDataService.getMercDataOneDay(mercId, dateValue);
         if (CollUtil.isEmpty(mercDataOneDay)) {
             return R.ok(vo);
         }

device-api/src/main/java/com/xy/dto/DeviceDataDto.java

@@ -1,5 +1,6 @@
 package com.xy.dto;
 
+import cn.hutool.core.date.DateTime;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xy.utils.PageBean;
 import io.swagger.annotations.ApiModelProperty;
@@ -168,5 +169,15 @@ public class DeviceDataDto {
 
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class MercOrdersDayCountDTO {
+
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "日期（yyyy-MM-dd）")
+        private DateTime orderDate;
+
+    }
+
 
 }