BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 7e2498d4173f1c78cf86facd702e735a7537a9d3

Authored by 芋道源码
Committed by Gitee
2 parents 9b2ec3d3 427cf8e4

!1049 【功能修复】修复快递鸟顺丰查询问题、订单退款问题、订单日志查询优化等 

Merge pull request !1049 from 卢越/master-jdk17
Inline Side-by-side
Showing 7 changed files with 29 additions and 11 deletions
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/aftersale/AfterSaleConvert.java
  View file @7e2498d
... ... @@ -43,7 +43,8 @@ public interface AfterSaleConvert {
43 43 @Mapping(source = "afterSale.orderId", target = "merchantOrderId"),
44 44 @Mapping(source = "afterSale.id", target = "merchantRefundId"),
45 45 @Mapping(source = "afterSale.applyReason", target = "reason"),
46   - @Mapping(source = "afterSale.refundPrice", target = "price")
  46 + @Mapping(source = "afterSale.refundPrice", target = "price"),
  47 + @Mapping(source = "orderProperties.payAppKey", target = "appKey")
47 48 })
48 49 PayRefundCreateReqDTO convert(String userIp, AfterSaleDO afterSale,
49 50 TradeOrderProperties orderProperties);
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/aftersale/AfterSaleLogMapper.java
  View file @7e2498d
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.trade.dal.mysql.aftersale;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 4 import cn.iocoder.yudao.module.trade.dal.dataobject.aftersale.AfterSaleLogDO;
  5 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 6 import org.apache.ibatis.annotations.Mapper;
6 7  
7 8 import java.util.List;
... ... @@ -10,7 +11,10 @@ import java.util.List;
10 11 public interface AfterSaleLogMapper extends BaseMapperX<AfterSaleLogDO> {
11 12  
12 13 default List<AfterSaleLogDO> selectListByAfterSaleId(Long afterSaleId) {
13   - return selectList(AfterSaleLogDO::getAfterSaleId, afterSaleId);
  14 + LambdaQueryWrapper<AfterSaleLogDO> queryWrapper = new LambdaQueryWrapper<>();
  15 + queryWrapper.eq(AfterSaleLogDO::getAfterSaleId, afterSaleId);
  16 + queryWrapper.orderByDesc(AfterSaleLogDO::getCreateTime);
  17 + return selectList(queryWrapper);
14 18 }
15 19  
16 20 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderLogMapper.java
  View file @7e2498d
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.trade.dal.mysql.order;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 4 import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderLogDO;
  5 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 6 import org.apache.ibatis.annotations.Mapper;
6 7  
7 8 import java.util.List;
... ... @@ -10,7 +11,10 @@ import java.util.List;
10 11 public interface TradeOrderLogMapper extends BaseMapperX<TradeOrderLogDO> {
11 12  
12 13 default List<TradeOrderLogDO> selectListByOrderId(Long orderId) {
13   - return selectList(TradeOrderLogDO::getOrderId, orderId);
  14 + LambdaQueryWrapper<TradeOrderLogDO> queryWrapper = new LambdaQueryWrapper<>();
  15 + queryWrapper.eq(TradeOrderLogDO::getOrderId, orderId);
  16 + queryWrapper.orderByDesc(TradeOrderLogDO::getCreateTime);
  17 + return selectList(queryWrapper);
14 18 }
15 19  
16 20 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/delivery/core/client/dto/ExpressTrackQueryReqDTO.java
  View file @7e2498d
... ... @@ -28,4 +28,9 @@ public class ExpressTrackQueryReqDTO {
28 28 */
29 29 private String phone;
30 30  
  31 + /**
  32 + * 自定义名称（顺丰专用）
  33 + */
  34 + private String customerName;
  35 +
31 36 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/delivery/core/client/dto/kdniao/KdNiaoExpressQueryReqDTO.java
  View file @7e2498d
... ... @@ -29,4 +29,10 @@ public class KdNiaoExpressQueryReqDTO {
29 29 @JsonProperty("OrderCode")
30 30 private String orderNo;
31 31  
  32 + /**
  33 + * 自定义名称（顺丰专用）
  34 + */
  35 + @JsonProperty("CustomerName")
  36 + private String customerName;
  37 +
32 38 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
  View file @7e2498d
... ... @@ -219,7 +219,7 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
219 219 public List<ExpressTrackRespDTO> getExpressTrackList(String code, String logisticsNo, String receiverMobile) {
220 220 return expressClientFactory.getDefaultExpressClient().getExpressTrackList(
221 221 new ExpressTrackQueryReqDTO().setExpressCode(code).setLogisticsNo(logisticsNo)
222   - .setPhone(receiverMobile));
  222 + .setPhone(receiverMobile).setCustomerName(StrUtil.subSuf(receiverMobile, receiverMobile.length() - 4)));
223 223 }
224 224  
225 225 // =================== Order Item ===================
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeMemberPointOrderHandler.java
  View file @7e2498d
... ... @@ -78,17 +78,15 @@ public class TradeMemberPointOrderHandler implements TradeOrderHandler {
78 78  
79 79 @Override
80 80 public void afterCancelOrderItem(TradeOrderDO order, TradeOrderItemDO orderItem) {
81   - // 扣减（回滚）积分（订单赠送）
82   - reducePoint(order.getUserId(), orderItem.getGivePoint(), MemberPointBizTypeEnum.ORDER_GIVE_CANCEL_ITEM,
83   - orderItem.getId());
84 81 // 增加（回滚）积分（订单抵扣）
85   - addPoint(order.getUserId(), orderItem.getUsePoint(), MemberPointBizTypeEnum.ORDER_USE_CANCEL_ITEM,
86   - orderItem.getId());
  82 + addPoint(order.getUserId(), orderItem.getUsePoint(), MemberPointBizTypeEnum.ORDER_USE_CANCEL_ITEM, orderItem.getId());
  83 +
  84 + // 扣减（回滚）积分（订单赠送）
  85 + reducePoint(order.getUserId(), orderItem.getGivePoint(), MemberPointBizTypeEnum.ORDER_GIVE_CANCEL_ITEM, orderItem.getId());
87 86  
88 87 // 扣减（回滚）用户经验
89 88 AfterSaleDO afterSale = afterSaleService.getAfterSale(orderItem.getAfterSaleId());
90   - memberLevelApi.reduceExperience(order.getUserId(), afterSale.getRefundPrice(),
91   - MemberExperienceBizTypeEnum.ORDER_GIVE_CANCEL_ITEM.getType(), String.valueOf(orderItem.getId()));
  89 + memberLevelApi.reduceExperience(order.getUserId(), afterSale.getRefundPrice(), MemberExperienceBizTypeEnum.ORDER_GIVE_CANCEL_ITEM.getType(), String.valueOf(orderItem.getId()));
92 90 }
93 91  
94 92 /**
... ...