From 086be7eae50e48ad554fd8a3f4cb1e333d587595 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 27 一月 2026 10:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/AftersaleServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..466c82a 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
@@ -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());
//缁忛攢鍟嗗瓨鍦ㄥ墿浣欑Н鍒�
@@ -1122,6 +1124,7 @@
dealIntegralRequest.setObjId(goodsorder.getId());
dealIntegralRequest.setOrderCode(goodsorder.getCode().toString());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.MEMBER_ORDER_REFUND);
+ dealIntegralRequest.setParam1(goodsorder.getCode().toString());
integralService.dealIntegral(dealIntegralRequest);
}
@@ -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());
--
Gitblit v1.9.3