Commit 0f51229954daef96f1b4e0f952a55ab00fa5acf2

Authored by YunaiV
1 parent 7e2498d4

【代码评审】商城:快递鸟相关的修复代码

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/aftersale/AfterSaleLogMapper.java
@@ -11,10 +11,9 @@ import java.util.List; @@ -11,10 +11,9 @@ import java.util.List;
11 public interface AfterSaleLogMapper extends BaseMapperX<AfterSaleLogDO> { 11 public interface AfterSaleLogMapper extends BaseMapperX<AfterSaleLogDO> {
12 12
13 default List<AfterSaleLogDO> selectListByAfterSaleId(Long afterSaleId) { 13 default List<AfterSaleLogDO> selectListByAfterSaleId(Long afterSaleId) {
14 - LambdaQueryWrapper<AfterSaleLogDO> queryWrapper = new LambdaQueryWrapper<>();  
15 - queryWrapper.eq(AfterSaleLogDO::getAfterSaleId, afterSaleId);  
16 - queryWrapper.orderByDesc(AfterSaleLogDO::getCreateTime);  
17 - return selectList(queryWrapper); 14 + return selectList(new LambdaQueryWrapper<AfterSaleLogDO>()
  15 + .eq(AfterSaleLogDO::getAfterSaleId, afterSaleId)
  16 + .orderByDesc(AfterSaleLogDO::getCreateTime));
18 } 17 }
19 18
20 } 19 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderLogMapper.java
@@ -11,10 +11,9 @@ import java.util.List; @@ -11,10 +11,9 @@ import java.util.List;
11 public interface TradeOrderLogMapper extends BaseMapperX<TradeOrderLogDO> { 11 public interface TradeOrderLogMapper extends BaseMapperX<TradeOrderLogDO> {
12 12
13 default List<TradeOrderLogDO> selectListByOrderId(Long orderId) { 13 default List<TradeOrderLogDO> selectListByOrderId(Long orderId) {
14 - LambdaQueryWrapper<TradeOrderLogDO> queryWrapper = new LambdaQueryWrapper<>();  
15 - queryWrapper.eq(TradeOrderLogDO::getOrderId, orderId);  
16 - queryWrapper.orderByDesc(TradeOrderLogDO::getCreateTime);  
17 - return selectList(queryWrapper); 14 + return selectList(new LambdaQueryWrapper<TradeOrderLogDO>()
  15 + .eq(TradeOrderLogDO::getOrderId, orderId)
  16 + .orderByDesc(TradeOrderLogDO::getCreateTime));
18 } 17 }
19 18
20 } 19 }
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
@@ -219,6 +219,7 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService { @@ -219,6 +219,7 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
219 public List<ExpressTrackRespDTO> getExpressTrackList(String code, String logisticsNo, String receiverMobile) { 219 public List<ExpressTrackRespDTO> getExpressTrackList(String code, String logisticsNo, String receiverMobile) {
220 return expressClientFactory.getDefaultExpressClient().getExpressTrackList( 220 return expressClientFactory.getDefaultExpressClient().getExpressTrackList(
221 new ExpressTrackQueryReqDTO().setExpressCode(code).setLogisticsNo(logisticsNo) 221 new ExpressTrackQueryReqDTO().setExpressCode(code).setLogisticsNo(logisticsNo)
  222 + // TODO @卢越:1)为什么 customerName 使用 mobile 哈?2)如果使用 mobile,其实可以考虑通过 phone 计算下
222 .setPhone(receiverMobile).setCustomerName(StrUtil.subSuf(receiverMobile, receiverMobile.length() - 4))); 223 .setPhone(receiverMobile).setCustomerName(StrUtil.subSuf(receiverMobile, receiverMobile.length() - 4)));
223 } 224 }
224 225
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeMemberPointOrderHandler.java
@@ -80,13 +80,13 @@ public class TradeMemberPointOrderHandler implements TradeOrderHandler { @@ -80,13 +80,13 @@ public class TradeMemberPointOrderHandler implements TradeOrderHandler {
80 public void afterCancelOrderItem(TradeOrderDO order, TradeOrderItemDO orderItem) { 80 public void afterCancelOrderItem(TradeOrderDO order, TradeOrderItemDO orderItem) {
81 // 增加(回滚)积分(订单抵扣) 81 // 增加(回滚)积分(订单抵扣)
82 addPoint(order.getUserId(), orderItem.getUsePoint(), MemberPointBizTypeEnum.ORDER_USE_CANCEL_ITEM, orderItem.getId()); 82 addPoint(order.getUserId(), orderItem.getUsePoint(), MemberPointBizTypeEnum.ORDER_USE_CANCEL_ITEM, orderItem.getId());
83 -  
84 // 扣减(回滚)积分(订单赠送) 83 // 扣减(回滚)积分(订单赠送)
85 reducePoint(order.getUserId(), orderItem.getGivePoint(), MemberPointBizTypeEnum.ORDER_GIVE_CANCEL_ITEM, orderItem.getId()); 84 reducePoint(order.getUserId(), orderItem.getGivePoint(), MemberPointBizTypeEnum.ORDER_GIVE_CANCEL_ITEM, orderItem.getId());
86 85
87 // 扣减(回滚)用户经验 86 // 扣减(回滚)用户经验
88 AfterSaleDO afterSale = afterSaleService.getAfterSale(orderItem.getAfterSaleId()); 87 AfterSaleDO afterSale = afterSaleService.getAfterSale(orderItem.getAfterSaleId());
89 - memberLevelApi.reduceExperience(order.getUserId(), afterSale.getRefundPrice(), MemberExperienceBizTypeEnum.ORDER_GIVE_CANCEL_ITEM.getType(), String.valueOf(orderItem.getId())); 88 + memberLevelApi.reduceExperience(order.getUserId(), afterSale.getRefundPrice(),
  89 + MemberExperienceBizTypeEnum.ORDER_GIVE_CANCEL_ITEM.getType(), String.valueOf(orderItem.getId()));
90 } 90 }
91 91
92 /** 92 /**