czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加部分退款接口

Browse Source
This commit is contained in:
韩鹏辉
2023-08-17 11:23:57 +08:00
parent dd67f7b963
commit 38455ebd37
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java
View File

@@ -1585,16 +1585,17 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
update.setId(order.getId()); update.setId(order.getId());
update.setMarketAmt(BigDecimal.ZERO); update.setMarketAmt(BigDecimal.ZERO);
} }
update.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee())); update.setRefundAmt(order.getRefundAmt());
merchantOrderMapper.updateById(update); merchantOrderMapper.updateById(update);
refundOrder.convert(order, resultMap, channel.getMerchantId()); refundOrder.convert(order, resultMap, channel.getMerchantId());
order.setId(null); order.setId(null);
order.setUpdateTime(new Date()); order.setUpdateTime(new Date());
order.setStatus("2"); order.setStatus("2");
order.setMarketAmt(BigDecimal.ZERO); order.setMarketAmt(BigDecimal.ZERO);
order.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee())); order.setRefundAmt(order.getRefundAmt());
order.setOrderNumber(refundOrder.getRefundNo());
merchantOrderMapper.insert(order); merchantOrderMapper.insert(order);
realFansService.removeProfit(order.getOrderNumber()); realFansService.removeProfit(order);
merchantRefundOrderMapper.insert(refundOrder); merchantRefundOrderMapper.insert(refundOrder);
if("app".equals(type)){ if("app".equals(type)){
//向小程序后台推送退款消息 //向小程序后台推送退款消息
@@ -1702,9 +1703,9 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
update.setId(order.getId()); update.setId(order.getId());
update.setMarketAmt(BigDecimal.ZERO); update.setMarketAmt(BigDecimal.ZERO);
} }
update.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee())); update.setRefundAmt(order.getRefundAmt());
merchantOrderMapper.updateById(update); merchantOrderMapper.updateById(update);
refundOrder.convert(order, resultMap,channel.getMerchantId(),order.getRefundAmt(),mercRefundNo,notifyUrl); refundOrder.convert(order, resultMap,channel.getMerchantId(),amount,mercRefundNo,notifyUrl);
order.setId(null); order.setId(null);
order.setUpdateTime(new Date()); order.setUpdateTime(new Date());
if(order.getRefundType()==2){ if(order.getRefundType()==2){
@@ -1715,9 +1716,9 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
order.setStatus("6"); order.setStatus("6");
} }
order.setMarketAmt(BigDecimal.ZERO); order.setMarketAmt(BigDecimal.ZERO);
order.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee())); order.setRefundAmt(order.getRefundAmt());
merchantOrderMapper.insert(order); merchantOrderMapper.insert(order);
realFansService.removeProfit(order.getOrderNumber()); realFansService.removeProfit(order);
merchantRefundOrderMapper.insert(refundOrder); merchantRefundOrderMapper.insert(refundOrder);
if("app".equals(type)){ if("app".equals(type)){
//向小程序后台推送退款消息 //向小程序后台推送退款消息
@@ -1829,6 +1830,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
} }
queryMerchantOrder.setUserId(queryUserApp.getUserId().intValue()); queryMerchantOrder.setUserId(queryUserApp.getUserId().intValue());
queryMerchantOrder.setPayReturnAmount(amount);
return queryMerchantOrder; return queryMerchantOrder;
} }
@@ -2865,7 +2867,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl<MerchantOrderMapper, M
order.setMarketAmt(BigDecimal.ZERO); order.setMarketAmt(BigDecimal.ZERO);
order.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee())); order.setRefundAmt(BigDecimal.valueOf(order.getConsumeFee()));
merchantOrderMapper.insert(order); merchantOrderMapper.insert(order);
realFansService.removeProfit(order.getOrderNumber()); realFansService.removeProfit(order);
merchantRefundOrderMapper.insert(refundOrder); merchantRefundOrderMapper.insert(refundOrder);
if("app".equals(type)){ if("app".equals(type)){
//向小程序后台推送退款消息 //向小程序后台推送退款消息