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

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ScoreSourceTypeEnum.java

@@ -12,7 +12,11 @@ public enum ScoreSourceTypeEnum {
     SYSTEM_EXPIRED(3, "系统失效", ScoreOperateTypeEnum.REDUCE, null),
 
     EXCHANGE_REWARD_CANCEL(4, "兑换礼品撤销", ScoreOperateTypeEnum.ADD, EXCHANGE_REWARD),
-    ;
+
+    ORDER_V(5, "订单V值", ScoreOperateTypeEnum.ADD, null),
+    REGISTER(6, "注册", ScoreOperateTypeEnum.ADD, null),
+    RECOMMEND(7, "推荐", ScoreOperateTypeEnum.ADD, null),
+    SHARE(8, "分享活动", ScoreOperateTypeEnum.ADD, null);
 
     private final int value;
 
@@ -21,6 +25,7 @@ public enum ScoreSourceTypeEnum {
     private final ScoreOperateTypeEnum operateType;
 
     private final ScoreSourceTypeEnum reverseSource;
+
     ScoreSourceTypeEnum(int value, String name, ScoreOperateTypeEnum operateType, ScoreSourceTypeEnum reverseSource) {
         this.value = value;
         this.name = name;

yudao-module-member/yudao-module-member-impl/pom.xml

@@ -49,10 +49,10 @@
             <artifactId>yudao-module-depository-core</artifactId>
             <version>${revision}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>cn.iocoder.boot</groupId>-->
-<!--            <artifactId>yudao-module-order-core</artifactId>-->
-<!--            <version>${revision}</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-order-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
     </dependencies>
 </project>

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/api/score/MemberUserScoreApiImpl.java

@@ -40,7 +40,7 @@ import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
 
 @Slf4j
 @Service
-public class MemberUserScoreApiImpl implements MemberUserScoreApi{
+public class MemberUserScoreApiImpl implements MemberUserScoreApi {
 
     @Resource
     private MemberUserScoreLogService logService;
@@ -75,7 +75,7 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{
             List<ScoreDetailChangeDto> detailInfos = saveScoreDetail(req, logId);
             saveScoreDetailReleation(req, detailInfos);
             updateUserScore(req);
-            publishDetailExpireEvent(req,detailInfos);
+            publishDetailExpireEvent(req, detailInfos);
         } catch (InterruptedException e) {
             throw exception(GET_LOCK_FAILED);
         } finally {
@@ -85,7 +85,7 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{
     }
 
     private void publishDetailExpireEvent(MemberUserScoreOperateReqDTO req, List<ScoreDetailChangeDto> detailInfos) {
-        if (req.getSourceType().getReverseSource() == null || req.getOperateType() ==ScoreOperateTypeEnum.REDUCE) {
+        if (req.getSourceType().getReverseSource() == null || req.getOperateType() == ScoreOperateTypeEnum.REDUCE) {
             return;
         }
         //判断回退流程，回退的积分是否过期.如果过期再走正常的过期扣积分流程
@@ -183,6 +183,7 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{
         return logService.createScoreLog(MemberUserScoreLogCreateReq.builder()
                 .memberId(req.getMemberId())
                 .scoreCount(req.getScoreCount())
+                .ruleId(req.getRuleId())
                 .operateType(req.getSourceType() == ScoreSourceTypeEnum.MANUAL_OPERATE ?
                         req.getOperateType().getValue() : req.getSourceType().getOperateType().getValue())
                 .sourceType(req.getSourceType().getValue())

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberUserLevelConfigController.java

@@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.member.controller.admin.level;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.member.service.level.MemberUserLevelConfigService;
-import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelBaseRespVO;
-import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelReqVO;
-import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelUpdateVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigBaseRespVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigReqVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigUpdateVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
@@ -35,7 +35,7 @@ public class MemberUserLevelConfigController {
 
     @PostMapping("/page")
     @ApiOperation("列表")
-    public CommonResult<PageResult<MemberUserLevelBaseRespVO>> getLevelPage(@Valid @RequestBody MemberUserLevelReqVO query) {
+    public CommonResult<PageResult<MemberUserLevelConfigBaseRespVO>> getLevelPage(@Valid @RequestBody MemberUserLevelConfigReqVO query) {
         return success(userLevelConfigService.getLevelPage(query));
     }
 
@@ -47,13 +47,13 @@ public class MemberUserLevelConfigController {
 
     @PostMapping("/add")
     @ApiOperation("新增")
-    public CommonResult<Boolean> add(@Valid @RequestBody MemberUserLevelUpdateVO query) {
+    public CommonResult<Boolean> add(@Valid @RequestBody MemberUserLevelConfigUpdateVO query) {
         return success(userLevelConfigService.add(query));
     }
 
     @PostMapping("/update")
     @ApiOperation("编辑")
-    public CommonResult<Boolean> update(@Valid @RequestBody MemberUserLevelUpdateVO query) {
+    public CommonResult<Boolean> update(@Valid @RequestBody MemberUserLevelConfigUpdateVO query) {
         return success(userLevelConfigService.updateLevel(query));
     }
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/scoreRule/ScoreRuleController.java

 package cn.iocoder.yudao.module.member.controller.admin.scoreRule;
 
+import cn.iocoder.yudao.framework.apollo.core.event.OrderInShippingEvent;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
@@ -15,6 +16,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.ListUtils;
+import org.springframework.context.ApplicationContext;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -41,6 +43,8 @@ public class ScoreRuleController {
     private ScoreRuleService scoreRuleService;
     @Resource
     private WarehouseService warehouseService;
+    @Resource
+    private ApplicationContext applicationContext;
 
     @PostMapping("/create")
     @ApiOperation("创建积分规则")
@@ -119,6 +123,13 @@ public class ScoreRuleController {
         return success(list);
     }
 
+    @GetMapping("/test-score-rule")
+    @ApiOperation("测试订单V值触发")
+    public CommonResult<Void> testScoreRule(@RequestParam Long orderId, @RequestParam String orderNo) {
+        applicationContext.publishEvent(new OrderInShippingEvent(orderId, orderNo));
+        return success(null);
+    }
+
 
 
     @GetMapping("/export-excel")

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java

@@ -27,6 +27,7 @@ import cn.iocoder.yudao.module.member.dal.dataobject.userEnterpriseAuth.UserEnte
 import cn.iocoder.yudao.module.member.dal.dataobject.userOperationLog.UserOperationLogDO;
 import cn.iocoder.yudao.module.member.enums.ErrorCodeConstants;
 import cn.iocoder.yudao.module.member.enums.UserAuditStatusEnum;
+import cn.iocoder.yudao.module.member.service.level.MemberUserLevelConfigService;
 import cn.iocoder.yudao.module.member.service.user.MemberUserService;
 import cn.iocoder.yudao.module.member.service.userCardAuth.UserCardAuthService;
 import cn.iocoder.yudao.module.member.service.userEnterpriseAuth.UserEnterpriseAuthService;
@@ -35,6 +36,8 @@ import cn.iocoder.yudao.module.member.vo.userCardAuth.UserCardAuthBackVO;
 import cn.iocoder.yudao.module.member.vo.userCardAuth.UserCardAuthCreateReqVO;
 import cn.iocoder.yudao.module.member.vo.userEnterpriseAuth.UserEnterpriseAuthBackVO;
 import cn.iocoder.yudao.module.member.vo.userEnterpriseAuth.UserEnterpriseAuthCreateReqVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigBaseRespVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserScoreLevelVO;
 import cn.iocoder.yudao.module.member.vo.userOperationLog.UserOperationLogBackVO;
 import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -95,6 +98,9 @@ public class MemberUserController {
     @Resource
     private PasswordEncoder passwordEncoder;
 
+    @Resource
+    private MemberUserLevelConfigService memberUserLevelConfigService;
+
 
     @GetMapping("/member-user-list")
     @ApiOperation("获得会员帐号列表-下拉列表使用")
@@ -136,6 +142,16 @@ public class MemberUserController {
         if (passwordEncoder.matches("88888888", user.getPassword())) {
             userBackVO.setIsSimplePassword(Boolean.TRUE);
         }
+        MemberUserLevelConfigBaseRespVO  userScoreLevelVO = memberUserLevelConfigService.getLevelByCount(user.getTotalScore());
+        MemberUserScoreLevelVO scoreLevelVO = MemberUserScoreLevelVO.builder().memberId(user.getId())
+                .memberCode(user.getMemberCode())
+                .holdScore(user.getHoldScore())
+                .expiredScore(user.getExpiredScore())
+                .usedScore(user.getUsedScore())
+                .levelIcon(userScoreLevelVO.getIcon())
+                .levelName(userScoreLevelVO.getName())
+                .build();
+        userBackVO.setUserScoreLevelInfo(scoreLevelVO);
         userBackVO.setPassword(null);
         userBackVO.setBackLetterImg(null);
         return success(userBackVO);

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/UserBackVO.java

 package cn.iocoder.yudao.module.member.controller.admin.user.vo;
 
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserScoreLevelVO;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -233,4 +234,26 @@ public class UserBackVO {
     @ApiModelProperty(value = "是否简单密码", example = "false")
     private Boolean isSimplePassword = Boolean.FALSE;
 
+    /**
+     * 客户编码
+     */
+    @ApiModelProperty(value = "客户编码")
+    private String customerCode;
+    /**
+     * 客户编码
+     */
+    @ApiModelProperty(value = "客户id")
+    private Long customerId;
+    @ApiModelProperty(value = "会员编码")
+    private String memberCode;
+    @ApiModelProperty(value = "会员积分信息")
+    private MemberUserScoreLevelVO userScoreLevelInfo;
+    @ApiModelProperty(value = "会员国家中文")
+    private String countryTitleZh;
+    @ApiModelProperty(value = "会员国家英文")
+    private String countryTitleEn;
+    @ApiModelProperty(value = "会员城市中文")
+    private String cityTitleZh;
+    @ApiModelProperty(value = "会员国家英文")
+    private String cityTitleEn;
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/UserQueryVO.java

@@ -31,5 +31,8 @@ public class UserQueryVO {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "创建结束时间")
     private Date endCreateTime;
-
+    @ApiModelProperty(value = "客户编码")
+    private String customerCode;
+    @ApiModelProperty(value = "会员编码")
+    private String memberCode;
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java

@@ -9,6 +9,7 @@ import lombok.*;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 import java.util.Date;
+import java.util.Optional;
 
 /**
  * 会员用户 DO
@@ -237,4 +238,36 @@ public class MemberUserDO extends TenantBaseDO {
     private String code;
 
     private Integer holdScore;
+
+    private Integer usedScore;
+
+    private Integer expiredScore;
+
+    /**
+     * 客户编码
+     */
+    @TableField(exist = false)
+    private String customerCode;
+    /**
+     * 客户编码
+     */
+    @TableField(exist = false)
+    private Long customerId;
+    @TableField(exist = false)
+    private String memberCode;
+
+    @TableField(exist = false)
+    private String countryTitleZh;
+    @TableField(exist = false)
+    private String countryTitleEn;
+    @TableField(exist = false)
+    private String cityTitleZh;
+    @TableField(exist = false)
+    private String cityTitleEn;
+
+    public Integer getTotalScore() {
+        return Optional.ofNullable(holdScore).orElse(0)
+                + Optional.ofNullable(usedScore).orElse(0)
+                + Optional.ofNullable(expiredScore).orElse(0);
+    }
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java

@@ -161,12 +161,25 @@ public interface MemberUserMapper extends BaseMapperX<MemberUserDO> {
             " uea.`create_time` as enterprise_audit_create_time,",
             " uea.`audit_time` as enterprise_audit_time," ,
             " uea.`audit_remark` as enterprise_audit_remark,",
-            " ifnull( mus.`hold_score`, 0) as hold_score",
+            " ec.id as customerId,",
+            " ec.number as customerCode,",
+            " u.code as memberCode,",
+            " er.title_zh as countryTitleZh,",
+            " er.title_en as countryTitleEn,",
+            " ert.title_zh as cityTitleZh,",
+            " ert.title_en as cityTitleEn,",
+            " ifnull( mus.`hold_score`, 0) as hold_score,",
+            " ifnull( mus.`used_score`, 0) as used_score,",
+            " ifnull( mus.`expired_score`, 0) as expired_score",
             "from member_user u ",
             "left join member_user_enterprise e on e.user_id = u.id and e.deleted = 0 ",
             "left join member_user_card_auth uca on u.id = uca.user_id and uca.deleted = 0 " ,
             "left join member_user_enterprise_auth uea on u.id = uea.user_id and uea.deleted = 0 ",
             "left join member_user_score mus on u.id = mus.member_id and mus.deleted = 0 ",
+            "left join ecw_customer_contacts ecc on u.id = ecc.userid and ecc.is_default = 1 and ecc.deleted = 0",
+            "left join ecw_customer ec on ecc.customer_id = ec.id and ec.deleted = 0",
+            "left join ecw_region er on er.id = u.country",
+            "left join ecw_region ert on ert.id = u.city",
             "where ",
             "u.deleted = 0 ",
             "AND u.id = #{id} ",

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberUserLevelConfigService.java

@@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.member.service.level;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.service.IService;
 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberUserLevelConfigDO;
-import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelBaseRespVO;
-import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelReqVO;
-import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelUpdateVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigBaseRespVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigReqVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigUpdateVO;
 
 import java.util.List;
 
@@ -16,11 +16,13 @@ import java.util.List;
  */
 public interface MemberUserLevelConfigService extends IService<MemberUserLevelConfigDO> {
 
-    PageResult<MemberUserLevelBaseRespVO> getLevelPage(MemberUserLevelReqVO query);
+    PageResult<MemberUserLevelConfigBaseRespVO> getLevelPage(MemberUserLevelConfigReqVO query);
 
     Boolean delete(List<Long> ids);
 
-    Boolean add(MemberUserLevelUpdateVO query);
+    Boolean add(MemberUserLevelConfigUpdateVO query);
 
-    Boolean updateLevel(MemberUserLevelUpdateVO query);
+    Boolean updateLevel(MemberUserLevelConfigUpdateVO query);
+
+    MemberUserLevelConfigBaseRespVO getLevelByCount(Integer scoreCount);
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberUserLevelConfigServiceImpl.java

@@ -5,10 +5,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.service.AbstractService;
 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberUserLevelConfigDO;
 import cn.iocoder.yudao.module.member.dal.mysql.memberUserLevel.MemberUserLevelConfigMapper;
-import cn.iocoder.yudao.module.member.vo.memberUserScore.MemberUserScoreBackVO;
-import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelBaseRespVO;
-import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelReqVO;
-import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelUpdateVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigBaseRespVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigReqVO;
+import cn.iocoder.yudao.module.member.vo.userLevel.MemberUserLevelConfigUpdateVO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -17,11 +16,11 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.GET_LOCK_FAILED;
 import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.LEVEL_BOUND_RANGE_CONFLICT;
 import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.LEVEL_BOUND_RANGE_ERROR;
 
@@ -42,14 +41,14 @@ public class MemberUserLevelConfigServiceImpl extends AbstractService<MemberUser
     }
 
     @Override
-    public PageResult<MemberUserLevelBaseRespVO> getLevelPage(MemberUserLevelReqVO query) {
+    public PageResult<MemberUserLevelConfigBaseRespVO> getLevelPage(MemberUserLevelConfigReqVO query) {
         int start = (query.getPageNo() - 1) * query.getPageSize();
         int size = query.getPageSize();
         LambdaQueryWrapper<MemberUserLevelConfigDO> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(MemberUserLevelConfigDO::getDeleted, 0);
         wrapper.last(String.format("limit %s, %s", start, size));
         List<MemberUserLevelConfigDO> list = this.list(wrapper);
-        List<MemberUserLevelBaseRespVO> result = list.stream().map(i -> BeanUtil.copyProperties(i, MemberUserLevelBaseRespVO.class)).collect(Collectors.toList());
+        List<MemberUserLevelConfigBaseRespVO> result = list.stream().map(i -> BeanUtil.copyProperties(i, MemberUserLevelConfigBaseRespVO.class)).collect(Collectors.toList());
         Long total = memberUserLevelConfigMapper.selectCount();
         return new PageResult<>(result, total, query.getPageSize(), query.getPageNo(), (total + query.getPageSize() - 1) / query.getPageSize());
     }
@@ -66,13 +65,13 @@ public class MemberUserLevelConfigServiceImpl extends AbstractService<MemberUser
     }
 
     @Override
-    public Boolean add(MemberUserLevelUpdateVO query) {
+    public Boolean add(MemberUserLevelConfigUpdateVO query) {
         validate(query);
         MemberUserLevelConfigDO memberUserLevelConfigDO = BeanUtil.copyProperties(query, MemberUserLevelConfigDO.class);
         return this.saveOrUpdate(memberUserLevelConfigDO);
     }
 
-    private void validate(MemberUserLevelUpdateVO query) {
+    private void validate(MemberUserLevelConfigUpdateVO query) {
         if (query.getLowerCount() > query.getUpperCount()) {
             throw exception(LEVEL_BOUND_RANGE_ERROR);
         }
@@ -93,9 +92,20 @@ public class MemberUserLevelConfigServiceImpl extends AbstractService<MemberUser
     }
 
     @Override
-    public Boolean updateLevel(MemberUserLevelUpdateVO query) {
+    public Boolean updateLevel(MemberUserLevelConfigUpdateVO query) {
         validate(query);
         MemberUserLevelConfigDO memberUserLevelConfigDO = BeanUtil.copyProperties(query, MemberUserLevelConfigDO.class);
         return this.saveOrUpdate(memberUserLevelConfigDO);
     }
+
+    @Override
+    public MemberUserLevelConfigBaseRespVO getLevelByCount(Integer scoreCount) {
+        List<MemberUserLevelConfigDO> levelConfigList = this.list();
+        List<MemberUserLevelConfigDO> sortLevelConfig = levelConfigList.stream()
+                .sorted(Comparator.comparing(MemberUserLevelConfigDO::getLowerCount))
+                .collect(Collectors.toList());
+        MemberUserLevelConfigDO memberUserLevelConfigDO = sortLevelConfig.stream().filter(config -> config.getLowerCount() >= scoreCount && config.getUpperCount() <= scoreCount)
+                .findAny().orElse(sortLevelConfig.get(sortLevelConfig.size() - 1));
+        return BeanUtil.copyProperties(memberUserLevelConfigDO, MemberUserLevelConfigBaseRespVO.class);
+    }
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java

@@ -402,7 +402,12 @@ public class MemberUserServiceImpl implements MemberUserService {
         if (query.getBeginCreateTime() != null && query.getEndCreateTime() != null) {
             wrapper.between("create_time", query.getBeginCreateTime(), query.getEndCreateTime());
         }
-
+        if (StringUtils.isNotBlank(query.getCustomerCode())) {
+            wrapper.like("customerCode", query.getCustomerCode());
+        }
+        if (StringUtils.isNotBlank(query.getMemberCode())) {
+            wrapper.like("code", query.getMemberCode());
+        }
         //成交状态
         Boolean isDeal = query.getIsDeal();
         wrapper.apply(isDeal != null, "customer_status " + (Boolean.TRUE.equals(isDeal) ? " = 3 " : " != 3"), null);

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/memberUserScore/MemberUserScoreQueryVO.java

@@ -31,4 +31,6 @@ public class MemberUserScoreQueryVO extends PageParam {
     private Date startTime;
     @ApiModelProperty(value = "会员创建时间结束")
     private Date endTime;
+    @ApiModelProperty(value = "会员id")
+    private Long memberId;
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/memberUserScoreLog/MemberUserScoreLogQueryVO.java

@@ -29,4 +29,6 @@ public class MemberUserScoreLogQueryVO extends PageParam {
     private Date startTime;
     @ApiModelProperty(value = "结束时间")
     private Date endTime;
+    @ApiModelProperty(value = "会员id")
+    private Long memberId;
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/userLevel/MemberUserLevelBaseRespVO.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/userLevel/MemberUserLevelConfigBaseRespVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 
 @Data
 @ApiModel("管理后台 - 会员等级查询返回 VO")
-public class MemberUserLevelBaseRespVO {
+public class MemberUserLevelConfigBaseRespVO {
     @ApiModelProperty(value = "id")
     private Long id;
     /**

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/userLevel/MemberUserLevelReqVO.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/userLevel/MemberUserLevelConfigReqVO.java

@@ -10,7 +10,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel("管理后台 - 会员等级配置查询 VO")
-public class MemberUserLevelReqVO extends PageParam {
+public class MemberUserLevelConfigReqVO extends PageParam {
     @ApiModelProperty(value = "id")
     private Long id;
 }

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/userLevel/MemberUserLevelUpdateVO.java → yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/userLevel/MemberUserLevelConfigUpdateVO.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 
 @Data
 @ApiModel("管理后台 - 会员等级编辑 VO")
-public class MemberUserLevelUpdateVO {
+public class MemberUserLevelConfigUpdateVO {
     @ApiModelProperty(value = "id")
     private Long id;
     /**

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/userLevel/MemberUserScoreLevelVO.java

+package cn.iocoder.yudao.module.member.vo.userLevel;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@ApiModel("管理后台 - 会员积分等级 VO")
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class MemberUserScoreLevelVO {
+    @ApiModelProperty(value = "会员id")
+    private Long memberId;
+    @ApiModelProperty(value = "会员编码")
+    private String memberCode;
+    @ApiModelProperty(value = "持有积分")
+    private Integer holdScore;
+    @ApiModelProperty(value = "已使用积分")
+    private Integer usedScore;
+    @ApiModelProperty(value = "过期积分")
+    private Integer expiredScore;
+    @ApiModelProperty(value = "会员等级名称")
+    private String levelName;
+    @ApiModelProperty(value = "会员等级图标")
+    private String levelIcon;
+}

yudao-module-member/yudao-module-member-impl/src/main/resources/mapper/user/MemberUserMapper.xml

@@ -24,10 +24,15 @@
                uea.`create_time` as enterprise_audit_create_time,
                uea.`audit_time` as enterprise_audit_time,
 
-               uea.`audit_remark` as enterprise_audit_remark
+               uea.`audit_remark` as enterprise_audit_remark,
+               ec.id as customerId,
+               ec.number as customerCode,
+               u.code as memberCode
         from member_user u
          left join member_user_card_auth uca on u.id = uca.user_id
          left join member_user_enterprise_auth uea on u.id = uea.user_id
+         left join ecw_customer_contacts ecc on u.id = ecc.userid
+         left join ecw_customer ec on ec.id = ecc.customer_id
         where 1 = 1
         and uca.deleted = 0 or uca.deleted is null
     </sql>

yudao-module-member/yudao-module-member-impl/src/main/resources/mapper/user/MemberUserScoreLogMapper.xml

@@ -68,5 +68,8 @@
                 and musl.score_count < #{query.scoreCount}
             </if>
         </if>
+        <if test="query.memberId != null">
+            and musl.member_id = #{query.memberId}
+        </if>
     </sql>
 </mapper>

yudao-module-order/pom.xml

@@ -16,6 +16,7 @@
     <modules>
         <module>yudao-module-order-core</module>
         <module>yudao-module-order-rest</module>
+        <module>yudao-module-order-api</module>
     </modules>
 
     <description>

yudao-module-order/yudao-module-order-api/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.iocoder.boot</groupId>
+        <artifactId>yudao-module-order</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>yudao-module-order-api</artifactId>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-common</artifactId>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

yudao-module-order/yudao-module-order-api/src/main/java/cn/iocoder/boot/module/order/api/OrderApi.java

+package cn.iocoder.boot.module.order.api;
+
+import cn.iocoder.boot.module.order.api.dto.OrderRespDTO;
+
+/**
+ * 订单 api
+ */
+public interface OrderApi {
+    /**
+     * 根据订单id或编号获取订单
+     */
+    OrderRespDTO getOrder(Long id, String orderNo);
+    /**
+     * 判断是否用户首单
+     */
+    boolean isFirstOrder(Long userId);
+}

yudao-module-order/yudao-module-order-api/src/main/java/cn/iocoder/boot/module/order/api/dto/OrderObjectiveApiDO.java

+package cn.iocoder.boot.module.order.api.dto;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+ * 订单目的仓库
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class OrderObjectiveApiDO extends BaseDO {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+    /**
+     * 目的地id
+     */
+    private Long objectiveId;
+
+    @ApiModelProperty(value = "目的国家id")
+    private Long objectiveCountryId;
+
+    @ApiModelProperty(value = "目的仓库id")
+    private Long objectiveWarehouseId;
+    /**
+     * 目的地详情
+     */
+    private String objective;
+    /**
+     * 0调仓标志;1原始数据，实际的目的地仓库
+     */
+    private Integer type;
+    /**
+     * 货到没到这个仓库：0未到；1已到
+     */
+    private Boolean isThis;
+
+}

yudao-module-order/yudao-module-order-api/src/main/java/cn/iocoder/boot/module/order/api/dto/OrderRespDTO.java

+package cn.iocoder.boot.module.order.api.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderRespDTO {
+    /**
+     * 主键ID
+     */
+    private Long orderId;
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+    /**
+     * 快递单号
+     */
+    private String number;
+    /**
+     * 运输方式id
+     */
+    private Integer transportId;
+    /**
+     * 渠道ID
+     */
+    private Long channelId;
+    /**
+     * 订单类型(可多选)：1 集运服务 2 海外仓
+     */
+    private String type;
+
+    /**
+     * 下单会员id
+     */
+    private Long userId;
+    /**
+     * 客户经理ID
+     */
+    private Long salesmanId;
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+    /**
+     * 唛头
+     */
+    private String marks;
+
+    /**
+     * 订单状态详情见字典
+     */
+    private Integer status;
+
+    /**
+     * 订单异常状态(字典 order_abnormal_state)
+     */
+    private Integer abnormalState;
+
+    /**
+     * 订单入仓状态(字典 order_warehouse_in_status)
+     */
+    private Integer inWarehouseState;
+
+    /**
+     * 订单出货状态(字典 order_shipment_state)
+     */
+    private Integer shipmentState;
+
+    /**
+     * 上次订单主状态值
+     */
+    private Integer oldStatus;
+
+    /**
+     * 上次订单入仓状态值
+     */
+    private Integer oldInWarehouseState;
+
+    /**
+     * 上次订单出货状态值
+     */
+    private Integer oldShipmentState;
+
+    /**
+     * 是否被删掉 1 删掉；0正常
+     */
+    private Boolean isDel;
+
+    @ApiModelProperty(value = "代收金额")
+    private BigDecimal collectionProxy;
+
+    @ApiModelProperty(value = "代收货币ID")
+    private Integer collectionProxyCurrency;
+    /**
+     * 是否代收货款收款 0为否 1为是
+     */
+    private Boolean isCollection;
+    /**
+     * 重货体积
+     */
+    private BigDecimal wVolume;
+    /**
+     * 泡货重量
+     */
+    private BigDecimal vWeight;
+
+    /**
+     * 原应收重货体积
+     */
+    private BigDecimal orgWVolume;
+    /**
+     * 原应收泡货重量
+     */
+    private BigDecimal orgVWeight;
+
+
+    @ApiModelProperty(value = "最小计量重量")
+    private BigDecimal minMeteringWeight = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "最小计量体积")
+    private BigDecimal minMeteringVolume = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "最小计量个数")
+    private BigDecimal minMeteringQuantity = BigDecimal.ZERO;
+    /**
+     * 重货标准基数
+     */
+    private BigDecimal weightUnit;
+    /**
+     * 泡货标准基数
+     */
+    private BigDecimal volumeUnit;
+
+    @ApiModelProperty(value = "原重货标准基数")
+    private BigDecimal orgWeightUnit;
+
+    @ApiModelProperty(value = "原泡货标准基数")
+    private BigDecimal orgVolumeUnit;
+
+    @ApiModelProperty(value = "计算使用的重货标准基数")
+    private BigDecimal useWeightUnit;
+
+    @ApiModelProperty(value = "计算使用的泡货标准基数")
+    private BigDecimal useVolumeUnit;
+    /**
+     * 入仓类型
+     */
+    private Integer warehouseType;
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 调仓始发仓
+     */
+    private Long adjustToStartWarehouseId;
+    /**
+     * 调仓目的仓
+     */
+    private Long adjustToDestWarehouseId;
+
+    /**
+     * 目的地调仓始发仓
+     */
+    private Long destAdjustToStartWarehouseId;
+    /**
+     * 目的地调仓目的仓
+     */
+    private Long destAdjustToDestWarehouseId;
+
+    @ApiModelProperty(value = "入仓数量", required = true)
+    private Integer sumQuantity;
+    /**
+     * 入仓件数
+     */
+    private Integer sumNum;
+    /**
+     * 自定义入仓体积
+     */
+    private BigDecimal customSumVolume;
+    /**
+     * 入仓体积
+     */
+    private BigDecimal sumVolume;
+    /**
+     * 自定义入仓重量
+     */
+    private BigDecimal customSumWeight;
+    /**
+     * 入仓重量
+     */
+    private BigDecimal sumWeight;
+    /**
+     * 重货比
+     */
+    private BigDecimal weightRatio;
+    /**
+     * 发货人的客户id
+     */
+    private Long customerId;
+
+
+    /**
+     * 完成入仓的入仓体积
+     */
+    private BigDecimal sumVolumeFinishedWarehouseIn;
+    /**
+     * 完成入仓的入仓重量
+     */
+    private BigDecimal sumWeightFinishedWarehouseIn;
+
+    /**
+     * 完成入仓的箱/件数
+     */
+    private Integer sumCartonsNumFinishedWarehouseIn;
+
+    /**
+     * 完成入仓的所有箱内总货物数量
+     */
+    private Integer sumQuantityAllFinishedWarehouseIn;
+
+    /**
+     * 上次打包的入仓体积
+     */
+    @ApiModelProperty(value = "上次打包的入仓体积")
+    private BigDecimal sumVolumePrevPacked;
+    /**
+     * 上次打包的入仓重量
+     */
+    @ApiModelProperty(value = "上次打包的入仓重量")
+    private BigDecimal sumWeightPrevPacked;
+
+    /**
+     * 上次打包的箱/件数
+     */
+    @ApiModelProperty(value = "上次打包的箱数")
+    private Integer sumCartonsNumPrevPacked;
+
+    /**
+     * 上次打包的所有箱内总货物数量
+     */
+    @ApiModelProperty(value = "上次打包的所有箱内总货物数量")
+    private Integer sumQuantityAllPrevPacked;
+
+
+    @ApiModelProperty(value = "付款人： 1 发货人 2 收货人 3 自定义")
+    private Integer drawee;
+
+    @ApiModelProperty(value = "自定义付款人信息")
+    private String customDrawee;
+
+    @ApiModelProperty(value = "打包前入仓重量")
+    private BigDecimal weightBeforePack;
+
+
+    @ApiModelProperty(value = "打包后入仓重量")
+    private BigDecimal weightAfterPack;
+
+
+    @ApiModelProperty(value = "是否有收货人，1-是，0-否")
+    private Boolean hasConsignee = true;
+
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "目的地信息")
+    @NotNull(message = "目的地信息不能为空")
+    private OrderObjectiveApiDO orderObjectiveDO;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "目的地ID")
+    private Long objectiveId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "目的地")
+    private String objectiveName;
+
+}

yudao-module-order/yudao-module-order-api/src/main/java/cn/iocoder/boot/module/order/enums/OrderStatusApiEnum.java

+package cn.iocoder.boot.module.order.enums;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.iocoder.yudao.framework.common.util.json.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+@AllArgsConstructor
+@Getter
+public enum OrderStatusApiEnum implements IntArrayValuable {
+    DRAFT(0, "草稿", "draft", "",""),
+    //1未使用
+    ORDER_PLACED(2, "已下单", "Order placed", "",""),
+    WAREHOUSING(3, "入仓中", "Warehousing in progress", "",""),
+//    SPECIAL_APPLY_PROGRESS(4, "特价申请中", "Special offer application in progress", "",""),
+    IN_WAREHOUSE(5, "已入仓", "Warehousing", "货物已入捷道%s","The shipment has been delivered to E&C %s"),
+    WITHDRAWN_EXPENSES_NOT_CLEARED(6, "已退仓-费用未清", "Withdrawn - expense not cleared", "",""),
+    WITHDRAWN(7, "已退仓", "Withdrawn", "",""),
+    WAREHOUSE_ADJUSTMENT(8, "调仓中", "Warehouse adjustment in progress", "",""),
+    MERGED_ORDER(9, "已合单", "Closed order", "",""),
+    SPLIT_ORDER(10, "已拆单", "Split order", "",""),
+    PRE_INSTALLED(11, "已预装", "Pre installed", "",""),
+    INSTALLED_CABINET(12, "已装柜", "Installed cabinet", "预计开船时间：","Estimated time of departure:"),
+    IN_SHIPPING(13, "航运中", "In shipping", "货物已出仓，预计到港时间：","The goods have been warehoused, and the estimated arrival time is:"),
+
+    ARRIVED(14, "已到目的港", "Arrived", "",""),
+    CLEARED(15, "已清关", "Cleared", "货物已清关","The shipment been cleared out"),
+    UNLOADED_CABINET(16, "已卸柜", "Unloaded cabinet", "",""),
+    TWP_WAY_TAKEOFF(17, "二程起飞", "Two way takeoff", "",""),
+    TWP_WAY_ARRIVAL(18, "二程到目的港", "Two way arrival", "",""),
+//    WRITTEN_OFF(19, "已核销", "Written off"),
+    PICKED_UP(20, "已提货", "Picked up", "提货时间：","Pickup time:"),
+    PART_PICKED_UP(21, "部分提货", "Part Picked up", "提货时间：","Pickup time:"),
+
+    //....预留定义
+//    TALLY(31, "理货", "tally", "", ""),
+    SHIPMENT(32, "出货", "shipment", "", ""),
+
+
+//    ORDER_UPDATE(50, "订单修改中", "Order update in progress", "",""),
+    CANCEL(88, "取消订单", "cancellation of order", "",""),
+
+    // 此状态为状态13的空运转义状态，当运输方式为空运时，状态13为已起飞
+    HAS_TAKEN_OFF(130, "已起飞", "Has taken off", "货物已起飞，预计在%s日期抵达%s机场","The shipment has departed China.ETA date to %s is %s"),
+    CUSTOMS_PASS_AIR(12421, "已报关", "Customs Declaration", "货物报关已放行，候机中","Shipment been released by China custom.waiting to departed China"),
+    CUSTOMS_PART_EXIT(12322, "已报关", "Customs Inspection", "报关查验退场，返回仓库中","Shipment been Inspected by China custom.waiting return to warehouse"),
+    CUSTOMS_FULL_EXIT(12323, "已报关", "Customs Inspection", "报关查验退场，返回仓库中","Shipment been Inspected by China custom.waiting return to warehouse"),
+    WAREHOUSED(32412,"出仓", "Sent out","",""),
+    UNLOADED_CABINET_AIR(16435,"到仓", "Location","货物已抵达捷道%s提货仓","The shipment been delivered at E&C %s branch"),
+
+    ;
+
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(OrderStatusApiEnum::getValue).toArray();
+
+    /**
+     * 类型
+     */
+    private final Integer value;
+    /**
+     * 类型中文名
+     */
+    private final String nameZh;
+
+    /**
+     * 类型英文名
+     */
+    private final String nameEn;
+
+    /**
+     * 备注中文名
+     */
+    private final String remarksZh;
+
+    /**
+     * 备注英文名
+     */
+    private final String remarksEn;
+
+
+
+    public static OrderStatusApiEnum valueOf(Integer value) {
+        return ArrayUtil.firstMatch(orderStatus -> orderStatus.getValue().equals(value), OrderStatusApiEnum.values());
+    }
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+}

yudao-module-order/yudao-module-order-core/pom.xml

@@ -57,7 +57,11 @@
             <artifactId>yudao-module-infra-impl</artifactId>
             <version>${revision}</version>
         </dependency>
-
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>yudao-module-order-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
 
         <dependency>
             <groupId>com.itextpdf</groupId>

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/api/OrderApiImpl.java

+package cn.iocoder.yudao.module.order.api;
+
+import cn.iocoder.boot.module.order.api.OrderApi;
+import cn.iocoder.boot.module.order.api.dto.OrderObjectiveApiDO;
+import cn.iocoder.boot.module.order.api.dto.OrderRespDTO;
+import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
+import cn.iocoder.yudao.module.order.dal.dataobject.orderObjective.OrderObjectiveDO;
+import cn.iocoder.yudao.module.order.service.order.OrderObjectiveService;
+import cn.iocoder.yudao.module.order.service.order.OrderService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+@Service
+@Validated
+public class OrderApiImpl implements OrderApi {
+    @Resource
+    private OrderService orderService;
+    @Resource
+    private OrderObjectiveService objectiveService;
+
+    @Override
+    public OrderRespDTO getOrder(Long id, String orderNo) {
+        OrderDO orderDO;
+        if (id != null) {
+            orderDO = orderService.getById(id);
+        } else {
+            orderDO = orderService.selectOne(new LambdaQueryWrapper<OrderDO>().eq(OrderDO::getOrderNo, orderNo).last("limit 1"));
+        }
+        if (orderDO == null) {
+            return null;
+        }
+        OrderRespDTO orderRespDTO = new OrderRespDTO();
+        BeanUtils.copyProperties(orderDO, orderRespDTO);
+
+        OrderObjectiveDO orderObjectiveDO = objectiveService.getByOrderId(id);
+        if (orderObjectiveDO == null) {
+            return orderRespDTO;
+        }
+        OrderObjectiveApiDO orderObjectiveApiDO = new OrderObjectiveApiDO();
+        BeanUtils.copyProperties(orderObjectiveDO, orderObjectiveApiDO);
+        orderRespDTO.setOrderObjectiveDO(orderObjectiveApiDO);
+        return orderRespDTO;
+    }
+
+    @Override
+    public boolean isFirstOrder(Long userId) {
+        Long count = orderService.selectCount(new LambdaQueryWrapper<OrderDO>().eq(OrderDO::getUserId, userId));
+        return count <= 0;
+    }
+}

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/api/reward/RedeemRewardApiImpl.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.reward.api.reward;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.generator.SnowflakeGenerator;
-import cn.iocoder.yudao.framework.redis.helper.RedisDistributedLock;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.module.member.api.score.MemberUserScoreApi;
 import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreOperateReqDTO;
 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
@@ -18,12 +18,18 @@ import cn.iocoder.yudao.module.reward.dal.mysql.reward.RewardMapper;
 import cn.iocoder.yudao.module.reward.enums.RewardRedeemStatusEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.GET_LOCK_FAILED;
@@ -42,7 +48,7 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
     @Resource
     private MemberUserApi memberUserApi;
     @Resource
-    private RedisDistributedLock redisDistributedLock;
+    private RedissonClient redissonClient;
     @Resource
     private MemberUserScoreApi memberUserScoreApi;
     @Resource
@@ -71,10 +77,10 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
             throw exception(REWARD_PICK_METHOD_NOT_ALLOW_CREATE);
         }
         verifyMemberUser(redeemRewardReqVO, rewardDO);
-        boolean lock = false;
+        String lockKey = "reward:redeem:lock:" + redeemRewardReqVO.getRewardId();
+        RLock lock = redissonClient.getLock(lockKey);
         try {
-            lock = redisDistributedLock.lock("reward:redeem:lock:" + redeemRewardReqVO.getRewardId());
-            if (!lock) {
+            if (!lock.tryLock(2, 10, TimeUnit.SECONDS)) {
                 throw exception(GET_LOCK_FAILED);
             }
             // 添加兑换记录
@@ -83,10 +89,10 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
             updateMemberScore(redeemRewardReqVO, rewardDO, redeemId);
             // 更新礼品
             redeemReward(rewardDO, redeemRewardReqVO.getRewardCount());
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+        } catch (InterruptedException e) {
+            throw exception(GET_LOCK_FAILED);
         } finally {
-            redisDistributedLock.releaseLock("reward:redeem:lock:" + redeemRewardReqVO.getRewardId());
+            lock.unlock();
         }
         return null;
     }
@@ -118,7 +124,7 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
         RewardRedeemDO rewardRedeemDO = BeanUtil.copyProperties(redeemRewardReqVO, RewardRedeemDO.class);
         rewardRedeemDO.setId(snowflakeGenerator.next());
         rewardRedeemDO.setStatus(RewardRedeemStatusEnum.REDEEMING.getValue());
-        rewardRedeemDO.setScoreCount(redeemRewardReqVO.getRewardCount()* rewardDO.getPointsRequire());
+        rewardRedeemDO.setScoreCount(redeemRewardReqVO.getRewardCount() * rewardDO.getPointsRequire());
         rewardRedeemMapper.insert(rewardRedeemDO);
         return rewardRedeemDO.getId();
     }
@@ -156,10 +162,10 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
                 throw exception(REWARD_COUNT_NOT_ENOUGH);
             }
         }
-        boolean lock = false;
+        String lockKey = "reward:redeem:lock:" + rewardId;
+        RLock lock = redissonClient.getLock(lockKey);
         try {
-            lock = redisDistributedLock.lock("reward:redeem:lock:" + rewardId);
-            if (!lock) {
+            if (!lock.tryLock(2, 10, TimeUnit.SECONDS)) {
                 throw exception(GET_LOCK_FAILED);
             }
             for (RedeemRewardReqVO redeemRewardReqVO : redeemRewardReqVOList) {
@@ -170,11 +176,13 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
                 // 更新礼品
                 redeemReward(rewardDO, redeemRewardReqVO.getRewardCount());
             }
-        } catch (Exception e) {
-            log.error("redeem reward exception",e);
+        } catch (ServiceException e) {
+            log.error("batch redeem rewards exception", e);
             throw e;
+        } catch (InterruptedException e) {
+            throw exception(GET_LOCK_FAILED);
         } finally {
-            redisDistributedLock.releaseLock("reward:redeem:lock:" + rewardId);
+            lock.unlock();
         }
         return null;
     }

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemPageReqVO.java

@@ -32,4 +32,6 @@ public class RewardRedeemPageReqVO extends PageParam {
     private Integer entrance;
     @ApiModelProperty(value = "兑换网点")
     private Integer nodeId;
+    @ApiModelProperty(value = "会员id")
+    private Long memberId;
 }

yudao-module-reward/yudao-module-reward-impl/src/main/resources/mapper/RewardRedeemMapper.xml

@@ -151,5 +151,8 @@
         <if test="req.endTime != null ">
             and err.create_time &lt;= #{req.endTime}
         </if>
+        <if test="req.memberId != null">
+            and err.member_id = #{req.memberId}
+        </if>
     </sql>
 </mapper>