From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/AftersaleServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 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 6ad1401..e1c461d 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
@@ -59,6 +59,8 @@
@Autowired
private GoodsorderMapper goodsorderMapper;
@Autowired
+ private NoticeMapper noticeMapper;
+ @Autowired
private ShopMapper shopMapper;
@Autowired
private MemberMapper memberMapper;
@@ -318,7 +320,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) {
@@ -1064,7 +1066,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);
}
}
}
@@ -1109,7 +1111,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);
}
}
}
@@ -1125,7 +1127,7 @@
dealIntegralRequest.setOrderCode(goodsorder.getCode().toString());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.MEMBER_ORDER_REFUND);
dealIntegralRequest.setParam1(goodsorder.getCode().toString());
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
}
//璁㈠崟閫�娆� 閫�鍥炲鎴蜂娇鐢ㄧ殑浼樻儬鍒�
@@ -1173,6 +1175,22 @@
.eq(Goodsorder::getId, goodsorder.getId())
);
+ //閲婃斁鏍搁攢鐮�
+ if(Constants.equalsInteger(goodsorder.getReceiveType(),Constants.ONE)&&StringUtils.isNotBlank(goodsorder.getExchangeCode())){
+ RedisUtil.deleteObject(redisTemplate,Constants.RedisKeys.EXCHANGE_KEY+goodsorder.getExchangeCode());
+ }
+
+
+ //鍙戦�佽鍗曢��娆剧珯鍐呬俊
+ Notice notice = Notice.getNotice(
+ Constants.NoticeType.NOTICE_ORDER_REFUND,
+ goodsorder.getMemberId(),
+ goodsorder.getId()
+ );
+ notice.setContent(notice.getContent().replace("{param}",goodsorder.getCode().toString()));
+ noticeMapper.insert(notice);
+
+
}
--
Gitblit v1.9.3