Procházet zdrojové kódy

//..settle

release_toaliyun_real
xhxu před 2 roky
rodič
revize
ad0c377214
2 změnil soubory, kde provedl 6 přidání a 2 odebrání
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderVo.java Zobrazit soubor

@@ -102,7 +102,8 @@ public class WxProfitSharingOrderVo extends TenantEntity {
@Excel(name = "实际分账金额(元)", width = 20, orderNum = "13") @Excel(name = "实际分账金额(元)", width = 20, orderNum = "13")
public String shareAmountStr; public String shareAmountStr;


public String getPointDeduction(){
public void setPointDeduction(String pointDeduction){
this.pointDeduction = pointDeduction;
WxComposeChildOrderShare composeChildOrderShare = null; WxComposeChildOrderShare composeChildOrderShare = null;
if(StringUtils.isNotBlank(this.pointDeduction)){ if(StringUtils.isNotBlank(this.pointDeduction)){
try{ try{
@@ -127,7 +128,6 @@ 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() : this.shareAmountStr; this.shareAmountStr = shareAmount != null ? new BigDecimal(shareAmount).divide(new BigDecimal(100)).toPlainString() : this.shareAmountStr;
} }
return this.pointDeduction;
} }




+ 4
- 0
mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderShare.java Zobrazit soubor

@@ -44,6 +44,10 @@ public class WxComposeChildOrderShare {
// this.orderId = orderId; // this.orderId = orderId;
// } // }


public WxComposeChildOrderShare(){

}

public WxComposeChildOrderShare(Long orderId,Integer realPayMent,Long merchantId,String merchantUid) { public WxComposeChildOrderShare(Long orderId,Integer realPayMent,Long merchantId,String merchantUid) {
this.orderId = orderId; this.orderId = orderId;
this.realPayMent = realPayMent; this.realPayMent = realPayMent;


Načítá se…
Zrušit
Uložit