From fc9240bd6b246ad71c4050510880a49ce07138a3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 13 二月 2026 09:51:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/AftersaleServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 408c6a2..6ad1401 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);
@@ -1142,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());
@@ -1164,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