From ad0c377214b38f5389137739fe7ebe3b4402d633 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jul 2023 13:07:57 +0800 Subject: [PATCH] //..settle --- .../java/com/iformall/domain/vo/WxProfitSharingOrderVo.java | 4 ++-- .../service/order/entity/WxComposeChildOrderShare.java | 4 ++++ 2 files changed, 6 insertions(+), 2 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 9f6934772..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 String getPointDeduction(){ + public void setPointDeduction(String pointDeduction){ + this.pointDeduction = pointDeduction; WxComposeChildOrderShare composeChildOrderShare = null; if(StringUtils.isNotBlank(this.pointDeduction)){ try{ @@ -127,7 +128,6 @@ public class WxProfitSharingOrderVo extends TenantEntity { Integer shareAmount = composeChildOrderShare.getShareAmount(); this.shareAmountStr = shareAmount != null ? new BigDecimal(shareAmount).divide(new BigDecimal(100)).toPlainString() : this.shareAmountStr; } - return this.pointDeduction; } diff --git a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java index 41842a326..41fb447c8 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java +++ b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java @@ -44,6 +44,10 @@ public class WxComposeChildOrderShare { // this.orderId = orderId; // } + public WxComposeChildOrderShare(){ + + } + public WxComposeChildOrderShare(Long orderId,Integer realPayMent,Long merchantId,String merchantUid) { this.orderId = orderId; this.realPayMent = realPayMent;