From 5c535c68bac36b4b79a58400c2014bd0ea33067e Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jul 2023 12:22:20 +0800 Subject: [PATCH] //..settle --- .../iformall/domain/vo/WxProfitSharingOrderVo.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 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 f95dfd621..417494fa6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java @@ -84,16 +84,6 @@ public class WxProfitSharingOrderVo extends TenantEntity { private String receivers; 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") public String realRateAmountStr; @Excel(name = "官方抽佣(元)", width = 20, orderNum = "7") @@ -112,7 +102,7 @@ public class WxProfitSharingOrderVo extends TenantEntity { @Excel(name = "实际分账金额(元)", width = 20, orderNum = "13") public String shareAmountStr; - public void getShareAmountStr(){ + public WxComposeChildOrderShare getComposeChildOrderShare(){ WxComposeChildOrderShare composeChildOrderShare = getComposeChildOrderShare(); if(composeChildOrderShare != null){ Integer realRateAmount = composeChildOrderShare.getRealRateAmount(); @@ -132,6 +122,7 @@ public class WxProfitSharingOrderVo extends TenantEntity { Integer shareAmount = composeChildOrderShare.getShareAmount(); this.shareAmountStr = shareAmount != null ? new BigDecimal(shareAmount).divide(new BigDecimal(100)).toPlainString() : shareAmountStr; } + return composeChildOrderShare; }