Skip to content

J
jiedao-api-boot-master
Commit bd09ff4c authored by zhaobiyan's avatar zhaobiyan
Browse files
Options

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

parents 5190b971 8f123cc5
Hide whitespace changes
Inline Side-by-side
Showing with 800 additions and 183 deletions
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ScoreSourceTypeEnum.java
View file @ bd09ff4c
...@@ -12,7 +12,11 @@ public enum ScoreSourceTypeEnum { ...@@ -12,7 +12,11 @@ public enum ScoreSourceTypeEnum {
SYSTEM_EXPIRED(3, "系统失效", ScoreOperateTypeEnum.REDUCE, null), SYSTEM_EXPIRED(3, "系统失效", ScoreOperateTypeEnum.REDUCE, null),
EXCHANGE_REWARD_CANCEL(4, "兑换礼品撤销", ScoreOperateTypeEnum.ADD, EXCHANGE_REWARD), 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; private final int value;
...@@ -21,6 +25,7 @@ public enum ScoreSourceTypeEnum { ...@@ -21,6 +25,7 @@ public enum ScoreSourceTypeEnum {
private final ScoreOperateTypeEnum operateType; private final ScoreOperateTypeEnum operateType;
private final ScoreSourceTypeEnum reverseSource; private final ScoreSourceTypeEnum reverseSource;
ScoreSourceTypeEnum(int value, String name, ScoreOperateTypeEnum operateType, ScoreSourceTypeEnum reverseSource) { ScoreSourceTypeEnum(int value, String name, ScoreOperateTypeEnum operateType, ScoreSourceTypeEnum reverseSource) {
this.value = value; this.value = value;
this.name = name; this.name = name;
......
yudao-module-member/yudao-module-member-impl/pom.xml
View file @ bd09ff4c
...@@ -49,10 +49,10 @@ ...@@ -49,10 +49,10 @@
<artifactId>yudao-module-depository-core</artifactId> <artifactId>yudao-module-depository-core</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- <dependency>--> <dependency>
<!-- <groupId>cn.iocoder.boot</groupId>--> <groupId>cn.iocoder.boot</groupId>
<!-- <artifactId>yudao-module-order-core</artifactId>--> <artifactId>yudao-module-order-api</artifactId>
<!-- <version>${revision}</version>--> <version>${revision}</version>
<!-- </dependency>--> </dependency>
</dependencies> </dependencies>
</project> </project>
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/api/score/MemberUserScoreApiImpl.java
View file @ bd09ff4c
...@@ -40,7 +40,7 @@ import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*; ...@@ -40,7 +40,7 @@ import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
@Slf4j @Slf4j
@Service @Service
public class MemberUserScoreApiImpl implements MemberUserScoreApi{ public class MemberUserScoreApiImpl implements MemberUserScoreApi {
@Resource @Resource
private MemberUserScoreLogService logService; private MemberUserScoreLogService logService;
...@@ -75,7 +75,7 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{ ...@@ -75,7 +75,7 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{
List<ScoreDetailChangeDto> detailInfos = saveScoreDetail(req, logId); List<ScoreDetailChangeDto> detailInfos = saveScoreDetail(req, logId);
saveScoreDetailReleation(req, detailInfos); saveScoreDetailReleation(req, detailInfos);
updateUserScore(req); updateUserScore(req);
publishDetailExpireEvent(req,detailInfos); publishDetailExpireEvent(req, detailInfos);
} catch (InterruptedException e) { } catch (InterruptedException e) {
throw exception(GET_LOCK_FAILED); throw exception(GET_LOCK_FAILED);
} finally { } finally {
...@@ -85,7 +85,7 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{ ...@@ -85,7 +85,7 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{
} }
private void publishDetailExpireEvent(MemberUserScoreOperateReqDTO req, List<ScoreDetailChangeDto> detailInfos) { 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; return;
} }
//判断回退流程，回退的积分是否过期.如果过期再走正常的过期扣积分流程 //判断回退流程，回退的积分是否过期.如果过期再走正常的过期扣积分流程
...@@ -122,12 +122,12 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{ ...@@ -122,12 +122,12 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{
} }
} }
return req.getMemberIds().stream().map(memberId -> operateScore(MemberUserScoreOperateReqDTO.builder() return req.getMemberIds().stream().map(memberId -> operateScore(MemberUserScoreOperateReqDTO.builder()
.memberId(memberId) .memberId(memberId)
.scoreCount(req.getScoreCount()) .scoreCount(req.getScoreCount())
.operateType(req.getOperateType()) .operateType(req.getOperateType())
.sourceType(req.getSourceType()) .sourceType(req.getSourceType())
.extParam(req.getExtParam()) .extParam(req.getExtParam())
.build())) .build()))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
...@@ -158,24 +158,24 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{ ...@@ -158,24 +158,24 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{
private void updateUserScore(MemberUserScoreOperateReqDTO req) { private void updateUserScore(MemberUserScoreOperateReqDTO req) {
memberUserScoreService.updateUserScore(MemberUserScoreUpdateReqDTO.builder() memberUserScoreService.updateUserScore(MemberUserScoreUpdateReqDTO.builder()
.memberId(req.getMemberId()) .memberId(req.getMemberId())
.scoreCount(req.getScoreCount()) .scoreCount(req.getScoreCount())
.operateType(req.getSourceType() == ScoreSourceTypeEnum.MANUAL_OPERATE ? .operateType(req.getSourceType() == ScoreSourceTypeEnum.MANUAL_OPERATE ?
req.getOperateType() : req.getSourceType().getOperateType()) req.getOperateType() : req.getSourceType().getOperateType())
.sourceType(req.getSourceType()) .sourceType(req.getSourceType())
.build()); .build());
} }
private List<ScoreDetailChangeDto> saveScoreDetail(MemberUserScoreOperateReqDTO req, Long scoreLogId) { private List<ScoreDetailChangeDto> saveScoreDetail(MemberUserScoreOperateReqDTO req, Long scoreLogId) {
return scoreDetailService.updateScoreDetail(MemberUserScoreDetailUpdateReqDto.builder() return scoreDetailService.updateScoreDetail(MemberUserScoreDetailUpdateReqDto.builder()
.memberId(req.getMemberId()) .memberId(req.getMemberId())
.scoreCount(req.getScoreCount()) .scoreCount(req.getScoreCount())
.operateType(req.getSourceType() == ScoreSourceTypeEnum.MANUAL_OPERATE ? .operateType(req.getSourceType() == ScoreSourceTypeEnum.MANUAL_OPERATE ?
req.getOperateType() : req.getSourceType().getOperateType()) req.getOperateType() : req.getSourceType().getOperateType())
.sourceType(req.getSourceType()) .sourceType(req.getSourceType())
.scoreLogId(scoreLogId) .scoreLogId(scoreLogId)
.expireDays(req.getExpireDays()) .expireDays(req.getExpireDays())
.releationId(req.getReleationId()) .releationId(req.getReleationId())
.build()); .build());
} }
...@@ -183,6 +183,7 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{ ...@@ -183,6 +183,7 @@ public class MemberUserScoreApiImpl implements MemberUserScoreApi{
return logService.createScoreLog(MemberUserScoreLogCreateReq.builder() return logService.createScoreLog(MemberUserScoreLogCreateReq.builder()
.memberId(req.getMemberId()) .memberId(req.getMemberId())
.scoreCount(req.getScoreCount()) .scoreCount(req.getScoreCount())
.ruleId(req.getRuleId())
.operateType(req.getSourceType() == ScoreSourceTypeEnum.MANUAL_OPERATE ? .operateType(req.getSourceType() == ScoreSourceTypeEnum.MANUAL_OPERATE ?
req.getOperateType().getValue() : req.getSourceType().getOperateType().getValue()) req.getOperateType().getValue() : req.getSourceType().getOperateType().getValue())
.sourceType(req.getSourceType().getValue()) .sourceType(req.getSourceType().getValue())
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/admin/scoreRule/ScoreRuleController.java
View file @ bd09ff4c
package cn.iocoder.yudao.module.member.controller.admin.scoreRule; 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.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.excel.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
...@@ -15,6 +16,7 @@ import io.swagger.annotations.Api; ...@@ -15,6 +16,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.ListUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -41,6 +43,8 @@ public class ScoreRuleController { ...@@ -41,6 +43,8 @@ public class ScoreRuleController {
private ScoreRuleService scoreRuleService; private ScoreRuleService scoreRuleService;
@Resource @Resource
private WarehouseService warehouseService; private WarehouseService warehouseService;
@Resource
private ApplicationContext applicationContext;
@PostMapping("/create") @PostMapping("/create")
@ApiOperation("创建积分规则") @ApiOperation("创建积分规则")
...@@ -119,6 +123,13 @@ public class ScoreRuleController { ...@@ -119,6 +123,13 @@ public class ScoreRuleController {
return success(list); 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") @GetMapping("/export-excel")
......
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/listener/OrderInShippingListener.java
View file @ bd09ff4c
//package cn.iocoder.yudao.module.member.listener; package cn.iocoder.yudao.module.member.listener;
//
//import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.collection.CollUtil;
//import cn.hutool.json.JSONUtil; import cn.hutool.core.util.ArrayUtil;
//import cn.iocoder.yudao.framework.apollo.core.event.OrderInShippingEvent; import cn.hutool.json.JSONUtil;
//import cn.iocoder.yudao.module.member.api.score.MemberUserScoreApi; import cn.iocoder.boot.module.order.api.OrderApi;
//import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreOperateReqDTO; import cn.iocoder.boot.module.order.api.dto.OrderObjectiveApiDO;
//import cn.iocoder.yudao.module.member.dal.dataobject.scoreRule.ScoreRuleDO; import cn.iocoder.boot.module.order.api.dto.OrderRespDTO;
//import cn.iocoder.yudao.module.member.enums.ScoreSourceTypeEnum; import cn.iocoder.boot.module.order.enums.OrderStatusApiEnum;
//import cn.iocoder.yudao.module.member.enums.TransportTypeEnum; import cn.iocoder.yudao.framework.apollo.core.event.OrderInShippingEvent;
//import cn.iocoder.yudao.module.member.enums.YesOrNoTypeEnum; import cn.iocoder.yudao.module.member.api.score.MemberUserScoreApi;
//import cn.iocoder.yudao.module.member.service.memberUserScoreLog.MemberUserScoreLogService; import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreOperateReqDTO;
//import cn.iocoder.yudao.module.member.service.scoreRule.ScoreRuleService; import cn.iocoder.yudao.module.member.dal.dataobject.scoreLog.MemberUserScoreLogDO;
//import cn.iocoder.yudao.module.member.vo.scoreRule.extra.ScoreRuleOrderVExtraVO; import cn.iocoder.yudao.module.member.dal.dataobject.scoreRule.ScoreRuleDO;
//import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO; import cn.iocoder.yudao.module.member.enums.PlatformTypeEnum;
//import cn.iocoder.yudao.module.order.dal.dataobject.orderObjective.OrderObjectiveDO; import cn.iocoder.yudao.module.member.enums.ScoreSourceTypeEnum;
//import cn.iocoder.yudao.module.order.enums.OrderStatusEnum; import cn.iocoder.yudao.module.member.enums.TransportTypeEnum;
//import cn.iocoder.yudao.module.order.service.order.OrderService; import cn.iocoder.yudao.module.member.enums.YesOrNoTypeEnum;
//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import cn.iocoder.yudao.module.member.service.scoreLog.MemberUserScoreLogService;
//import lombok.AllArgsConstructor; import cn.iocoder.yudao.module.member.service.scoreRule.ScoreRuleService;
//import lombok.extern.slf4j.Slf4j; import cn.iocoder.yudao.module.member.vo.scoreRule.extra.ScoreRuleOrderVExtraVO;
//import org.springframework.context.event.EventListener; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
//import org.springframework.stereotype.Component; import lombok.AllArgsConstructor;
// import lombok.extern.slf4j.Slf4j;
//import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils;
//import java.math.BigDecimal; import org.springframework.context.event.EventListener;
//import java.math.RoundingMode; import org.springframework.stereotype.Component;
//import java.util.Date;
//import java.util.List; import javax.annotation.Resource;
//import java.util.Objects; import java.math.BigDecimal;
// import java.math.RoundingMode;
//@Component import java.util.Date;
//@AllArgsConstructor import java.util.HashMap;
//@Slf4j import java.util.List;
//public class OrderInShippingListener { import java.util.Objects;
// @Resource
// private OrderService orderService; @Component
// @Resource @AllArgsConstructor
// private ScoreRuleService scoreRuleService; @Slf4j
// @Resource public class OrderInShippingListener {
// private MemberUserScoreApi memberUserScoreApi; @Resource
// @Resource private OrderApi orderApi;
// private MemberUserScoreLogService memberUserScoreLogService; @Resource
// private ScoreRuleService scoreRuleService;
// @EventListener(OrderInShippingEvent.class) @Resource
// public void listen(OrderInShippingEvent event) { private MemberUserScoreApi memberUserScoreApi;
// Long orderId = event.getOrderId(); @Resource
// String orderNo = event.getOrderNo(); private MemberUserScoreLogService memberUserScoreLogService;
// OrderDO orderDO;
// if (orderId != null) { @EventListener(OrderInShippingEvent.class)
// orderDO = orderService.getById(orderId); public void listen(OrderInShippingEvent event) {
// } else { Long orderId = event.getOrderId();
// orderDO = orderService.selectOne(new LambdaQueryWrapper<OrderDO>().eq(OrderDO::getOrderNo, orderNo).last("limit 1")); String orderNo = event.getOrderNo();
// } OrderRespDTO order;
// if (Objects.isNull(orderDO)) { try {
// log.error("Order in shipping listening error: The order does not exist,orderId:{},orderNo:{}", orderId, orderNo); order = orderApi.getOrder(orderId, orderNo);
// } } catch (Exception e) {
// // 目的地信息 log.error("Order in shipping listener: Get order error,orderId:{},orderNo:{}", orderId, orderNo);
// OrderObjectiveDO orderObjectiveDO = orderDO.getOrderObjectiveDO(); return;
// // 订单状态应为起运 }
// if (!Objects.equals(orderDO.getStatus(), OrderStatusEnum.IN_SHIPPING.getValue())) { if (Objects.isNull(order)) {
// return; log.error("Order in shipping listener: The order does not exist,orderId:{},orderNo:{}", orderId, orderNo);
// } return;
// // 判断海运空运 }
// Integer transportId = orderDO.getTransportId(); // 订单状态应为起运
// ScoreRuleDO scoreRuleDO = scoreRuleService.getEnabledOrderVScoreRuleByTransportType(transportId); if (!Objects.equals(order.getStatus(), OrderStatusApiEnum.IN_SHIPPING.getValue())) {
// if (Objects.isNull(scoreRuleDO)) { return;
// log.info("No score rule match"); }
// return; // 判断海运空运
// } Integer transportId = order.getTransportId();
// // 是否过期 ScoreRuleDO scoreRuleDO = scoreRuleService.getEnabledOrderVScoreRuleByTransportType(transportId);
// if (scoreRuleDO.getEndTime().after(new Date())) { if (Objects.isNull(scoreRuleDO)) {
// log.info("The score rule has expired"); log.info("Order in shipping listener: No score rule match");
// return; return;
// } }
// ScoreRuleOrderVExtraVO extraInfo = JSONUtil.toBean(scoreRuleDO.getExtra(), ScoreRuleOrderVExtraVO.class); // 是否过期，或者活动还没开始
// // 是否首单，首单只加一次 if (!scoreRuleDO.getEndTime().after(new Date()) || !scoreRuleDO.getStartTime().before(new Date())) {
// if (extraInfo.getFirstOrder() == YesOrNoTypeEnum.YES.ordinal()){ log.info("Order in shipping listener: The score rule has expired");
// Long count = orderService.selectCount(new LambdaQueryWrapper<OrderDO>().eq(OrderDO::getUserId, orderDO.getUserId())); return;
// if (count > 1) { }
// log.info("Not first order"); // 目的地信息
// return; OrderObjectiveApiDO orderObjectiveDO = order.getOrderObjectiveDO();
// } ScoreRuleOrderVExtraVO extraInfo = JSONUtil.toBean(scoreRuleDO.getExtra(), ScoreRuleOrderVExtraVO.class);
// } // 提货点是否包含
// // 提货点是否包含 String[] warehouseIds = extraInfo.getReceiveAddr().split(",");
// String[] warehouseIds = extraInfo.getReceiveAddr().split(","); if (!ArrayUtil.contains(warehouseIds, orderObjectiveDO.getObjectiveWarehouseId().toString())) {
// if (!ArrayUtil.contains(warehouseIds, orderObjectiveDO.getObjectiveWarehouseId().toString())) { return;
// return; }
// } // 计算积分
// // 计算积分 List<ScoreRuleOrderVExtraVO.OrderVRule> orderVRules = extraInfo.getOrderVRule();
// Integer scoreCount = 0; Integer scoreCount = 0;
// List<ScoreRuleOrderVExtraVO.OrderVRule> orderVRule = extraInfo.getOrderVRule(); if (transportId == TransportTypeEnum.OCEAN_LCL.getValue()) {
// if (transportId == TransportTypeEnum.OCEAN_LCL.getValue()) { // 海运算重量
// // 海运算重量 BigDecimal orgVWeight = order.getOrgVWeight();
// BigDecimal orgVWeight = orderDO.getOrgVWeight(); scoreCount = computeScoreCount(orgVWeight, orderVRules);
// int w = orgVWeight.setScale(0, RoundingMode.HALF_UP).intValue(); } else if (transportId == TransportTypeEnum.SPECIAL_LINE_AIR_FREIGHT.getValue()) {
// for (ScoreRuleOrderVExtraVO.OrderVRule rule : orderVRule) { // 空运校验渠道
// if (rule.getLow() <= w && rule.getHigh() >= w) { // 渠道id
// scoreCount = rule.getScore(); Long channelId = order.getChannelId();
// break; String[] channels = extraInfo.getChannel().split(",");
// } if (!ArrayUtil.contains(channels, channelId.toString())) {
// } return;
// } else if (transportId == TransportTypeEnum.SPECIAL_LINE_AIR_FREIGHT.getValue()) { }
// // 空运校验渠道 // 空运算体积
// // 渠道id BigDecimal orgWVolume = order.getOrgWVolume();
// Long channelId = orderDO.getChannelId(); scoreCount = computeScoreCount(orgWVolume, orderVRules);
// String[] channels = extraInfo.getChannel().split(","); }
// if (!ArrayUtil.contains(channels, channelId.toString())) { if (scoreCount > scoreRuleDO.getGetScoreOnce()) {
// return; scoreCount = scoreRuleDO.getGetScoreOnce();
// } }
// // 空运算体积
// BigDecimal orgWVolume = orderDO.getOrgWVolume(); // 会员id
// int v = orgWVolume.setScale(0, RoundingMode.HALF_UP).intValue(); Long userId = order.getUserId();
// for (ScoreRuleOrderVExtraVO.OrderVRule rule : orderVRule) { // 订单入口
// if (rule.getLow() <= v && rule.getHigh() >= v) { String orderEntryString = extraInfo.getOrderEntry();
// scoreCount = rule.getScore(); if (StringUtils.isBlank(orderEntryString)) {
// break; log.info("Order in shipping listener: orderEntry is null");
// } return;
// } }
// } String[] orderEntry = orderEntryString.split(",");
// if (scoreCount > scoreRuleDO.getGetScoreOnce()){ // TODO：后台下单会员获取待确认
// scoreCount = scoreRuleDO.getGetScoreOnce(); if (userId <= 0) {
// } // 后台下单
// // 校验累计最高分，查member_user_score_log if (!ArrayUtil.contains(orderEntry, String.valueOf(PlatformTypeEnum.BACKEND.getValue()))) {
// log.info("Order in shipping listener: The order is placed by the background, userId:{}", userId);
// // 增加积分 return;
// // 会员id }
// Long userId = orderDO.getUserId(); //userId = order.getCustomerId();
// memberUserScoreApi.operateScore(MemberUserScoreOperateReqDTO.builder() } else if (!ArrayUtil.contains(orderEntry, String.valueOf(PlatformTypeEnum.APP.getValue())) && !ArrayUtil.contains(orderEntry, String.valueOf(PlatformTypeEnum.WEB.getValue()))) {
// .memberId(userId) log.info("Order in shipping listener: The order is placed by the app or web, userId:{}", userId);
// .scoreCount(scoreCount) return;
// .sourceType(ScoreSourceTypeEnum.EXCHANGE_REWARD) }
// .ruleId(scoreRuleDO.getId()) // 是否首单，首单只加一次
// .expireDays(scoreRuleDO.getScorePeriod()) if (extraInfo.getFirstOrder() == YesOrNoTypeEnum.YES.ordinal()) {
// .build() if (!orderApi.isFirstOrder(userId)) {
// ); log.info("Order in shipping listener: Not first order");
// } return;
//} }
}
// 校验累计最高分
Integer userScoreTotalCount = 0;
LambdaQueryWrapper<MemberUserScoreLogDO> scoreLogQueryWrapper = new LambdaQueryWrapper<>();
scoreLogQueryWrapper.eq(MemberUserScoreLogDO::getMemberId, userId)
.eq(MemberUserScoreLogDO::getRuleId, scoreRuleDO.getId());
List<MemberUserScoreLogDO> memberUserScoreLogs = memberUserScoreLogService.selectList(scoreLogQueryWrapper);
if (CollUtil.isNotEmpty(memberUserScoreLogs)) {
for (MemberUserScoreLogDO memberUserScoreLog : memberUserScoreLogs) {
userScoreTotalCount += memberUserScoreLog.getScoreCount();
}
}
if (userScoreTotalCount >= scoreRuleDO.getMaxScoreTotal()) {
log.info("Order in shipping listener: The user has reached the maximum score,userId:{},scoreRuleId:{}", userId, scoreRuleDO.getId());
return;
}
//if (userScoreTotalCount + scoreCount > scoreRuleDO.getMaxScoreTotal()) {
// scoreCount = scoreRuleDO.getMaxScoreTotal() - userScoreTotalCount;
//}
// 增加积分
try {
HashMap<String, Object> map = new HashMap<>();
map.put("orderId", orderId);
memberUserScoreApi.operateScore(MemberUserScoreOperateReqDTO.builder()
.memberId(userId)
.scoreCount(scoreCount)
.sourceType(ScoreSourceTypeEnum.ORDER_V)
.ruleId(scoreRuleDO.getId())
.expireDays(scoreRuleDO.getScorePeriod())
.extParam(map)
.build()
);
} catch (Exception e) {
log.error("Order in shipping listener: operateScore error", e);
}
}
/**
* 根据规则计算获取积分
*
* @param weightOrVolume 重量或体积
* @param orderVRules 规则
* @return
*/
private Integer computeScoreCount(BigDecimal weightOrVolume, List<ScoreRuleOrderVExtraVO.OrderVRule> orderVRules) {
Integer scoreCount = 0;
int w = weightOrVolume.setScale(0, RoundingMode.HALF_UP).intValue();
for (int i = orderVRules.size() - 1; i >= 0; i--) {
ScoreRuleOrderVExtraVO.OrderVRule orderVRule = orderVRules.get(i);
if (w > orderVRule.getHigh()) {
scoreCount = orderVRule.getScore();
break;
}
if (orderVRule.getLow() <= w && orderVRule.getHigh() > w) {
scoreCount = orderVRule.getScore();
break;
}
}
return scoreCount;
}
}
yudao-module-order/pom.xml
View file @ bd09ff4c
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<modules> <modules>
<module>yudao-module-order-core</module> <module>yudao-module-order-core</module>
<module>yudao-module-order-rest</module> <module>yudao-module-order-rest</module>
<module>yudao-module-order-api</module>
</modules> </modules>
<description> <description>
......
yudao-module-order/yudao-module-order-api/pom.xml 0 → 100644
View file @ bd09ff4c
<?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 0 → 100644
View file @ bd09ff4c
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 0 → 100644
View file @ bd09ff4c
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 0 → 100644
View file @ bd09ff4c
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 0 → 100644
View file @ bd09ff4c
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
View file @ bd09ff4c
...@@ -57,7 +57,11 @@ ...@@ -57,7 +57,11 @@
<artifactId>yudao-module-infra-impl</artifactId> <artifactId>yudao-module-infra-impl</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-module-order-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency> <dependency>
<groupId>com.itextpdf</groupId> <groupId>com.itextpdf</groupId>
......
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/api/OrderApiImpl.java 0 → 100644
View file @ bd09ff4c
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
View file @ bd09ff4c
...@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.reward.api.reward; ...@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.reward.api.reward;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.generator.SnowflakeGenerator; 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.MemberUserScoreApi;
import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreOperateReqDTO; import cn.iocoder.yudao.module.member.api.score.dto.MemberUserScoreOperateReqDTO;
import cn.iocoder.yudao.module.member.api.user.MemberUserApi; import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
...@@ -18,12 +18,18 @@ import cn.iocoder.yudao.module.reward.dal.mysql.reward.RewardMapper; ...@@ -18,12 +18,18 @@ import cn.iocoder.yudao.module.reward.dal.mysql.reward.RewardMapper;
import cn.iocoder.yudao.module.reward.enums.RewardRedeemStatusEnum; import cn.iocoder.yudao.module.reward.enums.RewardRedeemStatusEnum;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource; 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.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.GET_LOCK_FAILED; import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.GET_LOCK_FAILED;
...@@ -42,7 +48,7 @@ public class RedeemRewardApiImpl implements RedeemRewardApi { ...@@ -42,7 +48,7 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
@Resource @Resource
private MemberUserApi memberUserApi; private MemberUserApi memberUserApi;
@Resource @Resource
private RedisDistributedLock redisDistributedLock; private RedissonClient redissonClient;
@Resource @Resource
private MemberUserScoreApi memberUserScoreApi; private MemberUserScoreApi memberUserScoreApi;
@Resource @Resource
...@@ -71,10 +77,10 @@ public class RedeemRewardApiImpl implements RedeemRewardApi { ...@@ -71,10 +77,10 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
throw exception(REWARD_PICK_METHOD_NOT_ALLOW_CREATE); throw exception(REWARD_PICK_METHOD_NOT_ALLOW_CREATE);
} }
verifyMemberUser(redeemRewardReqVO, rewardDO); verifyMemberUser(redeemRewardReqVO, rewardDO);
boolean lock = false; String lockKey = "reward:redeem:lock:" + redeemRewardReqVO.getRewardId();
RLock lock = redissonClient.getLock(lockKey);
try { try {
lock = redisDistributedLock.lock("reward:redeem:lock:" + redeemRewardReqVO.getRewardId()); if (!lock.tryLock(2, 10, TimeUnit.SECONDS)) {
if (!lock) {
throw exception(GET_LOCK_FAILED); throw exception(GET_LOCK_FAILED);
} }
// 添加兑换记录 // 添加兑换记录
...@@ -83,10 +89,10 @@ public class RedeemRewardApiImpl implements RedeemRewardApi { ...@@ -83,10 +89,10 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
updateMemberScore(redeemRewardReqVO, rewardDO, redeemId); updateMemberScore(redeemRewardReqVO, rewardDO, redeemId);
// 更新礼品 // 更新礼品
redeemReward(rewardDO, redeemRewardReqVO.getRewardCount()); redeemReward(rewardDO, redeemRewardReqVO.getRewardCount());
} catch (Exception e) { } catch (InterruptedException e) {
throw new RuntimeException(e); throw exception(GET_LOCK_FAILED);
} finally { } finally {
redisDistributedLock.releaseLock("reward:redeem:lock:" + redeemRewardReqVO.getRewardId()); lock.unlock();
} }
return null; return null;
} }
...@@ -118,7 +124,7 @@ public class RedeemRewardApiImpl implements RedeemRewardApi { ...@@ -118,7 +124,7 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
RewardRedeemDO rewardRedeemDO = BeanUtil.copyProperties(redeemRewardReqVO, RewardRedeemDO.class); RewardRedeemDO rewardRedeemDO = BeanUtil.copyProperties(redeemRewardReqVO, RewardRedeemDO.class);
rewardRedeemDO.setId(snowflakeGenerator.next()); rewardRedeemDO.setId(snowflakeGenerator.next());
rewardRedeemDO.setStatus(RewardRedeemStatusEnum.REDEEMING.getValue()); rewardRedeemDO.setStatus(RewardRedeemStatusEnum.REDEEMING.getValue());
rewardRedeemDO.setScoreCount(redeemRewardReqVO.getRewardCount()* rewardDO.getPointsRequire()); rewardRedeemDO.setScoreCount(redeemRewardReqVO.getRewardCount() * rewardDO.getPointsRequire());
rewardRedeemMapper.insert(rewardRedeemDO); rewardRedeemMapper.insert(rewardRedeemDO);
return rewardRedeemDO.getId(); return rewardRedeemDO.getId();
} }
...@@ -156,10 +162,10 @@ public class RedeemRewardApiImpl implements RedeemRewardApi { ...@@ -156,10 +162,10 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
throw exception(REWARD_COUNT_NOT_ENOUGH); throw exception(REWARD_COUNT_NOT_ENOUGH);
} }
} }
boolean lock = false; String lockKey = "reward:redeem:lock:" + rewardId;
RLock lock = redissonClient.getLock(lockKey);
try { try {
lock = redisDistributedLock.lock("reward:redeem:lock:" + rewardId); if (!lock.tryLock(2, 10, TimeUnit.SECONDS)) {
if (!lock) {
throw exception(GET_LOCK_FAILED); throw exception(GET_LOCK_FAILED);
} }
for (RedeemRewardReqVO redeemRewardReqVO : redeemRewardReqVOList) { for (RedeemRewardReqVO redeemRewardReqVO : redeemRewardReqVOList) {
...@@ -170,11 +176,13 @@ public class RedeemRewardApiImpl implements RedeemRewardApi { ...@@ -170,11 +176,13 @@ public class RedeemRewardApiImpl implements RedeemRewardApi {
// 更新礼品 // 更新礼品
redeemReward(rewardDO, redeemRewardReqVO.getRewardCount()); redeemReward(rewardDO, redeemRewardReqVO.getRewardCount());
} }
} catch (Exception e) { } catch (ServiceException e) {
log.error("redeem reward exception",e); log.error("batch redeem rewards exception", e);
throw e; throw e;
} catch (InterruptedException e) {
throw exception(GET_LOCK_FAILED);
} finally { } finally {
redisDistributedLock.releaseLock("reward:redeem:lock:" + rewardId); lock.unlock();
} }
return null; return null;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment