czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev-3.0.0' into dev

Browse Source
This commit is contained in:
张松
2024-12-17 14:28:58 +08:00
parent 96247fab7d 2c69dcc4d3
commit 255ce6a491
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -1297,7 +1297,7 @@ public class PayService {
throw new MsgException("退款金额必须大于0"); throw new MsgException("退款金额必须大于0");
} }
oldOrderInfo.setCouponInfoList(JSONObject.toJSONString(couponInfoDTO)); oldOrderInfo.setCouponInfoList(couponInfoDTO == null ? null : JSONObject.toJSONString(couponInfoDTO));
// 保存剩余未退款的订单详情 // 保存剩余未退款的订单详情
if (!remainOrderDetailList.isEmpty()) { if (!remainOrderDetailList.isEmpty()) {
@@ -1500,8 +1500,10 @@ public class PayService {
if (count == 0) { if (count == 0) {
returnCoupon(orderInfo, true); returnCoupon(orderInfo, true);
// 返还积分 // 返还积分
memberPointsService.addPoints(Long.valueOf(orderInfo.getMemberId()), orderInfo.getPointsNum(), if (orderInfo.getMemberId() != null && orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {
"用户退款订单积分返还: " + orderInfo.getPointsNum() + "积分", Long.valueOf(orderInfo.getId())); memberPointsService.addPoints(Long.valueOf(orderInfo.getMemberId()), orderInfo.getPointsNum(),
"用户退款订单积分返还: " + orderInfo.getPointsNum() + "积分", Long.valueOf(orderInfo.getId()));
}
} }
} }
mPOrderInfoMapper.updateById(orderInfo); mPOrderInfoMapper.updateById(orderInfo);