Merge remote-tracking branch 'origin/test' into test

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserAddDTO.java

@@ -3,14 +3,17 @@ package com.czg.account.dto.shopuser;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
  * @author Administrator
  */
 @Data
-public class ShopUserAddDTO {
+@Accessors(chain = true)
+public class ShopUserAddDTO implements Serializable {
 
     /**
      * 用户头像

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

@@ -7,6 +7,7 @@ import com.mybatisflex.annotation.Table;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -24,6 +25,7 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("tb_shop_user")
+@Accessors(chain = true)
 public class ShopUser implements Serializable {
 
     @Serial

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

@@ -16,6 +16,7 @@ public interface UserInfoService extends IService<UserInfo> {
 
     UserInfoDTO getInfo(long userInfoId);
 
+
     Boolean updateInfo(long shopId, long userId, UserInfoEditDTO userInfoEditDTO);
 
     Boolean updatePwd(long userId, UserInfoPwdEditDTO userInfoPwdEditDTO);

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

@@ -3,6 +3,7 @@ package com.czg.market.dto;
 
 import java.io.Serializable;
 
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
@@ -33,17 +34,20 @@ public class MemberOrderDTO implements Serializable {
     /**
      * 名称
      */
-    @NotBlank(message = "方案名称不为空")
+
     private String name;
 
 
     /**
      * 数量
      */
-    @NotNull(message = "数量不为空")
+    @Min(1)
     private Integer num;
     private String platformType;
     private Long userId;
     private String orderType;
+    private Integer sex;
+    private String birthDay;
+    private String nickName;
 
 }

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

@@ -4,15 +4,13 @@ import com.czg.constant.TableValueConstant;
 import com.czg.exception.ApiNotPrintException;
 import com.czg.market.dto.MemberConfigDTO;
 import com.czg.market.dto.MemberLevelDTO;
-import com.czg.market.dto.MemberOrderDTO;
-import com.czg.market.entity.MemberOrder;
-import com.czg.market.vo.MemberConfigVO;
-import com.czg.market.vo.MemberLevelVO;
+import com.czg.market.vo.*;
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.TbMemberConfig;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 会员基础配置 服务层。
@@ -23,6 +21,7 @@ import java.util.ArrayList;
 public interface TbMemberConfigService extends IService<TbMemberConfig> {
 
     MemberConfigVO detail(Long shopId);
+    UMemberConfigVO detail(Long shopId, Long userId);
 
     Boolean edit(Long shopId, MemberConfigDTO memberDTO);
 
@@ -48,4 +47,13 @@ public interface TbMemberConfigService extends IService<TbMemberConfig> {
      */
     boolean deliver(Long shopId, Long userId, TableValueConstant.MemberExpFlow.Type type, BigDecimal money, Integer expVal, Long sourceId);
 
+    /**
+     * 获取用户会员列表
+     */
+    List<MemberListVO> getMemberList(Long userId);
+
+    /**
+     * 获取用户会员详情
+     */
+    MemberDetailVO getUserDetail(Long userId, Long shopId);
 }

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

@@ -0,0 +1,35 @@
+package com.czg.market.vo;
+
+import com.czg.account.entity.ShopInfo;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+public class MemberDetailVO implements Serializable {
+    /**
+     * 店铺信息
+     */
+    private ShopInfo shopInfo;
+    /**
+     * 当前会员等级信息
+     */
+    private MemberLevelVO memberLevel;
+
+
+    /**
+     * 距离下一等级经验值
+     */
+    private Long nextExperienceValue;
+    /**
+     * 当前经验值
+     */
+    private Long experience;
+    /**
+     * 到期时间
+     */
+    private LocalDateTime endTime;
+}

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

@@ -84,5 +84,8 @@ public class MemberLevelVO implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    /**
+     * 是否消费增积分
+     */
     private Integer isCostRewardPoints;
 }

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

@@ -0,0 +1,14 @@
+package com.czg.market.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+public class MemberListVO implements Serializable {
+    private String logo;
+    private Long shopId;
+    private String shopName;
+}

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

@@ -0,0 +1,27 @@
+package com.czg.market.vo;
+
+import com.czg.market.dto.MemberConfigDTO;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class UMemberConfigVO implements Serializable {
+   /**
+    * 店铺会员配置信息
+    */
+   private MemberConfigVO memberConfig;
+   /**
+    * kv形式，BIND_PHONE绑定手机号 ORDER订单数 COST_AMOUNT消费金额 RECHARGE_AMOUNT充值金额, true满足 false不满足
+    */
+   private Map<String, Object> conditionMap;
+}