Просмотр исходного кода

//..settle

release_toaliyun_real
xhxu 2 лет назад
Родитель
Сommit
ad0c377214
2 измененных файлов: 6 добавлений и 2 удалений
  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 Просмотреть файл

@@ -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;
}



+ 4
- 0
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;


Загрузка…
Отмена
Сохранить