序列化尝试4

生日有礼统计

cash-api/account-server/src/main/resources/application-dev.yml

@@ -37,6 +37,10 @@ dubbo:
     name: dubbo
     serialization: hessian2
     port: 10101
+  serialization:
+    allow-list:
+      - com.czg.utils.CzgUpdateChain
+
 
 
 seata:

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

@@ -1,8 +1,11 @@
 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.MkBirthdayGiftDTO;
 import com.czg.market.service.MkBirthdayGiftService;
+import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO;
 import com.czg.market.vo.MkBirthdayGiftRecordVO;
 import com.czg.market.vo.MkBirthdayGiftVO;
 import com.czg.resp.CzgResult;
@@ -23,6 +26,16 @@ import java.time.LocalDateTime;
 public class BirthdayGiftController {
     @Resource
     private MkBirthdayGiftService service;
+    /**
+     * 记录获取
+     * @return 是否成功
+     */
+    @SaAdminCheckPermission(parentName = "生日有礼",value = "birthdayGift:summary", name = "生日有礼概述")
+    @GetMapping("/summary")
+    public CzgResult<MkBirthdayGiftRecordSummaryVO> summary(@RequestParam(required = false) String dateTime, @RequestParam(required = false) String key) {
+        return CzgResult.success(service.summary(StpKit.USER.getMainShopId(), key, StrUtil.isNotBlank(dateTime) ? DateUtil.parseLocalDateTime(dateTime) : null));
+//        return null;
+    }
 
     /**
      * 配置信息获取

cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java

@@ -4,6 +4,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.IoUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.CzgPayUtils;
+import com.czg.account.entity.ShopUser;
+import com.czg.account.service.ShopUserService;
 import com.czg.entity.CzgBaseRespParams;
 import com.czg.market.entity.MkShopConsumeDiscountRecord;
 import com.czg.market.service.MkDistributionUserService;
@@ -38,6 +40,9 @@ import java.io.IOException;
 public class NotifyController {
     private static final String SUCCESS = "SUCCESS";
 
+    @Resource
+    private ShopUserService shopUserService;
+
     @Resource
     private OrderInfoCustomService orderInfoCustomService;
     @Resource
@@ -52,9 +57,10 @@ public class NotifyController {
     private MkShopConsumeDiscountRecordService consumeDiscountRecordService;
 
     @RequestMapping("clear")
-    public String clear(@RequestParam Integer shopId) {
+    public String clear() {
-        consumeDiscountRecordService.remove(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId));
+        shopUserService.updateChain().eq(ShopUser::getId, 127437).set(ShopUser::getAmount, 999);
-        orderInfoService.remove(new QueryWrapper().eq(OrderInfo::getShopId, shopId));
+//        consumeDiscountRecordService.remove(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId));
+//        orderInfoService.remove(new QueryWrapper().eq(OrderInfo::getShopId, shopId));
         return "success";
     }
 

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

@@ -2,6 +2,7 @@ package com.czg.market.service;
 
 import com.czg.market.dto.MkBirthdayGiftDTO;
 import com.czg.market.entity.MkBirthdayGift;
+import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO;
 import com.czg.market.vo.MkBirthdayGiftRecordVO;
 import com.czg.market.vo.MkBirthdayGiftVO;
 import com.mybatisflex.core.paginate.Page;
@@ -24,6 +25,8 @@ public interface MkBirthdayGiftService extends IService<MkBirthdayGift> {
     Boolean edit(Long shopId, MkBirthdayGiftDTO giftDTO);
 
     Page<MkBirthdayGiftRecordVO> getRecord(Long shopId, String key, LocalDateTime dateTime);
+    MkBirthdayGiftRecordSummaryVO summary(Long shopId, String key, LocalDateTime dateTime);
+
 
     void deliver();
 

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

@@ -40,10 +40,10 @@ public class MkBirthdayGiftRecordVO implements Serializable  {
      */
     private List<MkBirthdayGiftRecordCoupon> couponList;
 
-//    /**
+    /**
-//     * 已经使用的优惠券
+     * 已经使用的优惠券
-//     */
+     */
-//    private List<MkBirthdayGiftRecordCoupon> usedCouponList;
+    private List<MkBirthdayGiftRecordCoupon> usedCouponList;
 
     /**
      * 创建时间

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java

@@ -19,6 +19,7 @@ import com.czg.market.dto.MkRewardCouponDTO;
 import com.czg.market.dto.ShopCouponDTO;
 import com.czg.market.entity.*;
 import com.czg.market.service.*;
+import com.czg.market.vo.MkBirthdayGiftRecordSummaryVO;
 import com.czg.market.vo.MkBirthdayGiftRecordVO;
 import com.czg.market.vo.MkBirthdayGiftVO;
 import com.czg.service.market.mapper.MkBirthdayGiftMapper;
@@ -90,6 +91,26 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
         return vo;
     }
 
+    @Override
+    public MkBirthdayGiftRecordSummaryVO summary(Long shopId, String key, LocalDateTime dateTime) {
+        QueryWrapper queryWrapper = new MyQueryWrapper()
+                .leftJoin(MkBirthdayGiftRecord.class).on(MkBirthdayGiftRecord::getId, MkBirthdayGiftRecordCoupon::getRecordId)
+                .select("sum( IF(type = 'give', num, 0)) as totalNum", "sum( IF(type = 'consume', num, 0)) as usedNum")
+                .eq(MkBirthdayGiftRecord::getMainShopId, shopId)
+                .leftJoin(ShopUser.class).on(ShopUser::getId, MkBirthdayGiftRecord::getShopUserId);
+        if (StrUtil.isNotBlank(key)) {
+            queryWrapper.and(and -> {
+                and.or(or -> {
+                    or.like(ShopUser::getNickName, key);
+                }).or(or -> {
+                    or.like(ShopUser::getPhone, key);
+                });
+            });
+        }
+
+        return birthdayGiftRecordCouponService.getOneAsOpt(queryWrapper, MkBirthdayGiftRecordSummaryVO.class).orElseGet(MkBirthdayGiftRecordSummaryVO::new);
+    }
+
     @Override
     @CacheEvict(key = "#shopId")
     public Boolean edit(Long shopId, MkBirthdayGiftDTO giftDTO) {