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

fix: 退款修改

This commit is contained in:
张松 2024-11-21 14:37:21 +08:00
parent dd7a3a9d46
commit caac76dbd8
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@ -2831,7 +2831,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
orderDetail.setStatus("refund");
}
if (hasNormalReturn && returnAmount.compareTo(BigDecimal.ZERO) <= 0) {
if (hasNormalReturn && returnAmount.compareTo(new BigDecimal("0.01")) <= 0) {
throw new BadRequestException("退款金额必须大于0");
}
@ -2977,19 +2977,21 @@ public class TbShopTableServiceImpl implements TbShopTableService {
String couponInfoList = orderInfo.getCouponInfoList();
if (StrUtil.isNotBlank(couponInfoList)) {
OrderInfoCouponInfoDTO orderInfoCouponInfoDTO = JSONObject.parseObject(couponInfoList, OrderInfoCouponInfoDTO.class);
int remainNum = 0;
for (OrderInfoUserCouponVo item : orderInfoCouponInfoDTO.getProductCoupon()) {
if (item.getFinalUseNum() > item.getReturnNum()) {
remainNum = remainNum + (item.getFinalUseNum() - item.getReturnNum());
if (orderInfoCouponInfoDTO.getProductCoupon() != null && !orderInfoCouponInfoDTO.getProductCoupon().isEmpty()) {
int remainNum = 0;
for (OrderInfoUserCouponVo item : orderInfoCouponInfoDTO.getProductCoupon()) {
if (item.getFinalUseNum() > item.getReturnNum()) {
remainNum = remainNum + (item.getFinalUseNum() - item.getReturnNum());
}
}
}
if (remainNum == 0) {
returnCoupon(orderInfo, true);
// 返还积分
memberPointsService.addPoints(Long.valueOf(orderInfo.getMemberId()), orderInfo.getPointsNum(),
"用户退款订单积分返还: " + orderInfo.getPointsNum() + "积分", Long.valueOf(orderInfo.getId()));
if (remainNum == 0) {
returnCoupon(orderInfo, true);
// 返还积分
memberPointsService.addPoints(Long.valueOf(orderInfo.getMemberId()), orderInfo.getPointsNum(),
"用户退款订单积分返还: " + orderInfo.getPointsNum() + "积分", Long.valueOf(orderInfo.getId()));
}
}
}
}