From 8fe7282ea44922b47f75ea88df36d2afb5ca2a5d Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jul 2023 12:36:27 +0800 Subject: [PATCH] //..settle --- .../domain/vo/WxProfitSharingOrderVo.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java index 9777c8dbd..b4eeee18b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -102,7 +102,8 @@ public class WxProfitSharingOrderVo extends TenantEntity { @Excel(name = "实际分账金额(元)", width = 20, orderNum = "13") public String shareAmountStr; - public WxComposeChildOrderShare getComposeChildOrderShare(){ + public void setPointDeduction(String pointDeduction){ + this.pointDeduction = pointDeduction; WxComposeChildOrderShare composeChildOrderShare = null; if(StringUtils.isNotBlank(this.pointDeduction)){ try{ @@ -111,23 +112,22 @@ public class WxProfitSharingOrderVo extends TenantEntity { } if(composeChildOrderShare != null){ Integer realRateAmount = composeChildOrderShare.getRealRateAmount(); - this.realRateAmountStr = realRateAmount != null ? new BigDecimal(realRateAmount).divide(new BigDecimal(100)).toPlainString() : realRateAmountStr; + this.realRateAmountStr = realRateAmount != null ? new BigDecimal(realRateAmount).divide(new BigDecimal(100)).toPlainString() : this.realRateAmountStr; Integer commissionAmount = composeChildOrderShare.getCommissionAmount(); - this.commissionAmountStr = commissionAmount != null ? new BigDecimal(commissionAmount).divide(new BigDecimal(100)).toPlainString() : commissionAmountStr; + this.commissionAmountStr = commissionAmount != null ? new BigDecimal(commissionAmount).divide(new BigDecimal(100)).toPlainString() : this.commissionAmountStr; Integer cpsCommission = composeChildOrderShare.getCpsCommission(); - this.cpsCommissionStr = cpsCommission != null ? new BigDecimal(cpsCommission).divide(new BigDecimal(100)).toPlainString() : cpsCommissionStr; + this.cpsCommissionStr = cpsCommission != null ? new BigDecimal(cpsCommission).divide(new BigDecimal(100)).toPlainString() : this.cpsCommissionStr; Integer systemAmount = composeChildOrderShare.getSystemAmount(); - this.systemAmountStr = systemAmount != null ? new BigDecimal(systemAmount).divide(new BigDecimal(100)).toPlainString() : systemAmountStr; + this.systemAmountStr = systemAmount != null ? new BigDecimal(systemAmount).divide(new BigDecimal(100)).toPlainString() : this.systemAmountStr; Integer sellerAmount = composeChildOrderShare.getSellerAmount(); - this.sellerAmountStr = sellerAmount != null ? new BigDecimal(sellerAmount).divide(new BigDecimal(100)).toPlainString() : sellerAmountStr; + this.sellerAmountStr = sellerAmount != null ? new BigDecimal(sellerAmount).divide(new BigDecimal(100)).toPlainString() : this.sellerAmountStr; Integer rateAmount = composeChildOrderShare.getRateAmount(); - this.rateAmountStr = rateAmount != null ? new BigDecimal(rateAmount).divide(new BigDecimal(100)).toPlainString() : rateAmountStr; + this.rateAmountStr = rateAmount != null ? new BigDecimal(rateAmount).divide(new BigDecimal(100)).toPlainString() : this.rateAmountStr; Integer serviceAmount = composeChildOrderShare.getServiceAmount(); - this.serviceAmountStr = serviceAmount != null ? new BigDecimal(serviceAmount).divide(new BigDecimal(100)).toPlainString() : serviceAmountStr; + this.serviceAmountStr = serviceAmount != null ? new BigDecimal(serviceAmount).divide(new BigDecimal(100)).toPlainString() : this.serviceAmountStr; Integer shareAmount = composeChildOrderShare.getShareAmount(); - this.shareAmountStr = shareAmount != null ? new BigDecimal(shareAmount).divide(new BigDecimal(100)).toPlainString() : shareAmountStr; + this.shareAmountStr = shareAmount != null ? new BigDecimal(shareAmount).divide(new BigDecimal(100)).toPlainString() : this.shareAmountStr; } - return composeChildOrderShare; }