From 417e33605dda0f28366a1d6e13c41198a156e3a7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 16:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/AftersaleServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/AftersaleServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/AftersaleServiceImpl.java
index f3be3c6..4d1003d 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/AftersaleServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/AftersaleServiceImpl.java
@@ -318,7 +318,7 @@
param.setDealType(Constants.ZERO);
param.setIntegralNum(integral);
param.setIntegralObjType(Constants.IntegralObjType.AFTERSALE_BACK);
- integralService.dealIntegral(param);
+ integralService.dealIntegral(param,null);
}
private void isBackMoneyValid(BigDecimal actmoney, BigDecimal perPrice, Integer goodsNum, BigDecimal orderPrice,BigDecimal orderIntegral, BigDecimal orderCouponPrice) {
@@ -1009,7 +1009,8 @@
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
- public void afterSaleApply(AfterSaleApplyRequest afterSaleApplyRequest, Integer userId){
+ public void afterSaleApply(AfterSaleApplyRequest afterSaleApplyRequest){
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Objects.isNull(afterSaleApplyRequest)
|| Objects.isNull(afterSaleApplyRequest.getOrderId())
|| Objects.isNull(afterSaleApplyRequest.getReturnUseIntegralStatus())
@@ -1032,6 +1033,7 @@
}
Aftersale aftersale = new Aftersale();
aftersale.setCreateDate(new Date());
+ aftersale.setCreator(loginUserInfo.getId());
aftersale.setIsdeleted(Constants.ZERO);
aftersale.setOrderId(goodsorder.getId());
aftersale.setType(Constants.ZERO);
@@ -1045,7 +1047,7 @@
aftersale.setReturnShopSettlement(BigDecimal.ZERO);
aftersale.setCode(getNextInCode());
- //璁㈠崟閫�鍥� 杩斿洖缁欑粡閿�鍟嗙殑绉垎
+ //璁㈠崟閫�鍥炶繑鍥炵粰缁忛攢鍟嗙殑绉垎
if(Objects.nonNull(goodsorder.getDistributionShopId())&&goodsorder.getReturnCustomerIntegral().compareTo(BigDecimal.ZERO)>Constants.ZERO){
Shop shop = shopMapper.selectById(goodsorder.getDistributionShopId());
//缁忛攢鍟嗗瓨鍦ㄥ墿浣欑Н鍒�
@@ -1062,7 +1064,7 @@
dealIntegralRequest.setObjId(goodsorder.getId());
dealIntegralRequest.setOrderCode(goodsorder.getCode().toString());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.SHOP_ORDER_REFUND_INTEGRAL);
- integralService.dealShopIntegral(dealIntegralRequest);
+ integralService.dealShopIntegral(dealIntegralRequest,null);
}
}
}
@@ -1107,7 +1109,7 @@
dealIntegralRequest.setObjId(goodsorder.getId());
dealIntegralRequest.setOrderCode(goodsorder.getCode().toString());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.MEMBER_ORDER_REFUND_RETURN);
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
}
}
}
@@ -1122,7 +1124,8 @@
dealIntegralRequest.setObjId(goodsorder.getId());
dealIntegralRequest.setOrderCode(goodsorder.getCode().toString());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.MEMBER_ORDER_REFUND);
- integralService.dealIntegral(dealIntegralRequest);
+ dealIntegralRequest.setParam1(goodsorder.getCode().toString());
+ integralService.dealIntegral(dealIntegralRequest,null);
}
//璁㈠崟閫�娆� 閫�鍥炲鎴蜂娇鐢ㄧ殑浼樻儬鍒�
@@ -1141,10 +1144,10 @@
String refundCode = WxMiniUtilService.wxRefund(goodsorder.getCode().toString(), goodsorder.getPrice(), afterSaleApplyRequest.getMoney());
Fund fund = new Fund();
fund.setOrderCode(refundCode);
- fund.setCreator(userId);
+ fund.setCreator(loginUserInfo.getId());
fund.setCreateDate(new Date());
fund.setIsdeleted(Constants.ZERO);
- fund.setRemark(userId.toString());
+ fund.setRemark(loginUserInfo.getId().toString());
fund.setMemberId(goodsorder.getCreator());
fund.setTitle("璁㈠崟閫�娆�");
fund.setContent(afterSaleApplyRequest.getRemark());
@@ -1163,6 +1166,10 @@
goodsorderMapper.update(null,new UpdateWrapper<Goodsorder>().lambda()
.set(Goodsorder::getStatus, Constants.OrderStatus.REFUND.getKey())
+ .set(Goodsorder::getRefundTime, DateUtil.getCurrDateTime())
+ .set(Goodsorder::getRefundMoney, afterSaleApplyRequest.getMoney())
+ .set(Goodsorder::getRefundUserId, loginUserInfo.getId())
+ .set(Goodsorder::getRefundInfo, afterSaleApplyRequest.getRemark())
.eq(Goodsorder::getId, goodsorder.getId())
);
--
Gitblit v1.9.3