生日有礼发放修改

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java

@@ -2,11 +2,11 @@ package com.czg.account.service;
 
 import com.czg.account.dto.shopuser.*;
 import com.czg.account.entity.ShopUser;
-import com.czg.resp.CzgResult;
-import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.service.IService;
 
-import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 商户储值会员 服务层。
@@ -26,4 +26,6 @@ public interface ShopUserService extends IService<ShopUser> {
 
 
     boolean updateInfo(ShopUser shopUser);
+
+    List<ShopUser> selectBirthdayUser(LocalDate current, Long mainShopId, String userType);
 }

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

@@ -66,6 +66,7 @@ public class MkBirthdayGiftRecord implements Serializable {
     private String phone;
     private Long templateId;
     private Integer year;
+    private String userType;
 
 
 }

cash-common/cash-common-tools/src/main/java/com/czg/utils/MyQueryWrapper.java

@@ -11,6 +11,7 @@ import com.mybatisflex.core.util.MapUtil;
 import com.mybatisflex.core.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
 
+import java.io.Serializable;
 import java.lang.invoke.SerializedLambda;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -23,7 +24,7 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 @Slf4j
-public class MyQueryWrapper extends QueryWrapper {
+public class MyQueryWrapper extends QueryWrapper implements Serializable {
 
     public MyQueryWrapper selectAll(Class<?> clazz) {
         TableInfo tableInfo = TableInfoFactory.ofEntityClass(clazz);