消费返现修改

cash-api/market-server/src/main/java/com/czg/controller/admin/ConsumeCashbackController.java

@@ -1,5 +1,7 @@
 package com.czg.controller.admin;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.market.dto.MkConsumeCashbackDTO;
 import com.czg.market.service.MkConsumeCashbackRecordService;
@@ -55,8 +57,9 @@ public class ConsumeCashbackController {
     @SaAdminCheckPermission(value = "consumeDiscount:record", name = "消费返现记录")
     @GetMapping("/record")
     public CzgResult<Map<String, Object>> record(@RequestParam(required = false) Long shopId, @RequestParam(required = false) String key,
-                                                 @RequestParam(required = false)LocalDateTime startTime, @RequestParam(required = false) LocalDateTime endTime) {
+                                                 @RequestParam(required = false)String startTime, @RequestParam(required = false) String endTime) {
-        return CzgResult.success(consumeCashbackRecordService.getRecord(StpKit.USER.getShopId(), shopId, key, startTime, endTime));
+        return CzgResult.success(consumeCashbackRecordService.getRecord(StpKit.USER.getShopId(), shopId, key,
+                StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null,  StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null));
     }
 
 

cash-common/cash-common-service/src/main/java/com/czg/account/dto/freeding/FreeDineConfigEditDTO.java

@@ -48,7 +48,13 @@ public class FreeDineConfigEditDTO {
      */
     private List<String> useType;
 
+    /**
+     * all 全部 part部分
+     */
     private String useShopType;
+    /**
+     * 可用门店id
+     */
     private List<Long> shopIdList;
 
 }

cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkConsumeCashbackRecordVO.java

@@ -71,4 +71,6 @@ public class MkConsumeCashbackRecordVO implements Serializable {
     private String nickName;
 
 
+
+
 }