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:25:55 +08:00
parent 23daecb536
commit 8fb56270fc
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pluss-service-bundle/src/main/java/cn/pluss/platform/realFans/impl/RealFansServiceImpl.java
View File

@@ -45,14 +45,11 @@ public class RealFansServiceImpl extends ServiceImpl<RealFansMapper, RealFans> i
private GeneralPushUtil generalPushUtil; private GeneralPushUtil generalPushUtil;
@Override @Override
public void removeProfit(String orderNumber) { public void removeProfit(MerchantOrder order) {
MerchantOrder order= merchantOrderService.queryMerchantOrder(new MerchantOrder().setOrderNumber(orderNumber));
if(ObjectUtil.isEmpty(order)){ if(ObjectUtil.isEmpty(order)){
log.error("订单信息不存在:{}",orderNumber); log.error("订单信息不存在");
return; return;
} }
cancelUserProfitV2(order); cancelUserProfitV2(order);
} }
@@ -90,7 +87,7 @@ public class RealFansServiceImpl extends ServiceImpl<RealFansMapper, RealFans> i
for (MerchantProfit p : profitList) { for (MerchantProfit p : profitList) {
sumProfitMoney = sumProfitMoney.add(new BigDecimal(String.valueOf(p.getPrice()))); sumProfitMoney = sumProfitMoney.add(new BigDecimal(String.valueOf(p.getPrice())));
} }
order.setProfitShareMoney(sumProfitMoney.abs().negate().setScale(4, BigDecimal.ROUND_DOWN).doubleValue()); order.setProfitShareMoney(new BigDecimal(order.getProfitShareMoney()).add(sumProfitMoney.abs().negate().setScale(4, BigDecimal.ROUND_DOWN)).doubleValue());
log.info("【去除分润结算结束】订单号：{}产生的分润总额：{}", order.getOrderNumber(), sumProfitMoney); log.info("【去除分润结算结束】订单号：{}产生的分润总额：{}", order.getOrderNumber(), sumProfitMoney);
} }
} }
@@ -156,7 +153,7 @@ public class RealFansServiceImpl extends ServiceImpl<RealFansMapper, RealFans> i
return; return;
} }
log.info("userId:{},rate:{},amount:{}",nowUserApp.getUserId(),profitRate,order.getConsumeFee()); log.info("userId:{},rate:{},amount:{}",nowUserApp.getUserId(),profitRate,order.getConsumeFee());
BigDecimal profitAmt = profitRate.divide(BigDecimal.valueOf(100)).multiply(BigDecimal.valueOf(order.getConsumeFee())).setScale(4, BigDecimal.ROUND_DOWN); BigDecimal profitAmt = profitRate.divide(BigDecimal.valueOf(100)).multiply(order.getRefundAmt()).setScale(4, BigDecimal.ROUND_DOWN);
MerchantProfit profit = new MerchantProfit(nowUserApp,nowUserApp , order, profitAmt.abs().negate(), profitRate, "5", "1"); MerchantProfit profit = new MerchantProfit(nowUserApp,nowUserApp , order, profitAmt.abs().negate(), profitRate, "5", "1");
profits.add(profit); profits.add(profit);
// sendProfitMessage(nowUserApp, profitAmt, order.getOrderNumber()); // sendProfitMessage(nowUserApp, profitAmt, order.getOrderNumber());
@@ -171,7 +168,7 @@ public class RealFansServiceImpl extends ServiceImpl<RealFansMapper, RealFans> i
public void removeProfit(MerchantOrder order, BigDecimal refundAmt,BigDecimal useRefundAmt) { public void removeProfit(MerchantOrder order, BigDecimal refundAmt,BigDecimal useRefundAmt) {
BigDecimal consumeFee = BigDecimal.valueOf(order.getConsumeFee()); BigDecimal consumeFee = BigDecimal.valueOf(order.getConsumeFee());
if(refundAmt.compareTo(consumeFee) == 0){ if(refundAmt.compareTo(consumeFee) == 0){
removeProfit(order.getOrderNumber()); removeProfit(order);
}else{ }else{
QueryWrapper<MerchantProfit> queryWrapper = new QueryWrapper<MerchantProfit>(); QueryWrapper<MerchantProfit> queryWrapper = new QueryWrapper<MerchantProfit>();
queryWrapper.eq("orderNumber",order.getOrderNumber()); queryWrapper.eq("orderNumber",order.getOrderNumber());