| @@ -84,16 +84,6 @@ public class WxProfitSharingOrderVo extends TenantEntity { | |||||
| private String receivers; | private String receivers; | ||||
| private String errorMsg; | private String errorMsg; | ||||
| //获取各种扣点费用 | |||||
| public WxComposeChildOrderShare getComposeChildOrderShare(){ | |||||
| if(StringUtils.isNotBlank(pointDeduction)){ | |||||
| try { | |||||
| WxComposeChildOrderShare wxComposeChildOrderShare = JSON.parseObject(pointDeduction, WxComposeChildOrderShare.class); | |||||
| return wxComposeChildOrderShare; | |||||
| }catch(Exception e){} | |||||
| } | |||||
| return null; | |||||
| } | |||||
| @Excel(name = "支付手续费(元)", width = 20, orderNum = "6") | @Excel(name = "支付手续费(元)", width = 20, orderNum = "6") | ||||
| public String realRateAmountStr; | public String realRateAmountStr; | ||||
| @Excel(name = "官方抽佣(元)", width = 20, orderNum = "7") | @Excel(name = "官方抽佣(元)", width = 20, orderNum = "7") | ||||
| @@ -112,7 +102,7 @@ public class WxProfitSharingOrderVo extends TenantEntity { | |||||
| @Excel(name = "实际分账金额(元)", width = 20, orderNum = "13") | @Excel(name = "实际分账金额(元)", width = 20, orderNum = "13") | ||||
| public String shareAmountStr; | public String shareAmountStr; | ||||
| public void getShareAmountStr(){ | |||||
| public WxComposeChildOrderShare getComposeChildOrderShare(){ | |||||
| WxComposeChildOrderShare composeChildOrderShare = getComposeChildOrderShare(); | WxComposeChildOrderShare composeChildOrderShare = getComposeChildOrderShare(); | ||||
| if(composeChildOrderShare != null){ | if(composeChildOrderShare != null){ | ||||
| Integer realRateAmount = composeChildOrderShare.getRealRateAmount(); | Integer realRateAmount = composeChildOrderShare.getRealRateAmount(); | ||||
| @@ -132,6 +122,7 @@ public class WxProfitSharingOrderVo extends TenantEntity { | |||||
| Integer shareAmount = composeChildOrderShare.getShareAmount(); | 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() : shareAmountStr; | ||||
| } | } | ||||
| return composeChildOrderShare; | |||||
| } | } | ||||