Browse Source

//shar

release_toaliyun_real
xhxu 3 years ago
parent
commit
fa3f512dc5
2 changed files with 2 additions and 1 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java View File

@@ -33,7 +33,7 @@ public class WxProfitSharingOrderDetailsVo extends TenantEntity {
private Integer status;

public String getReceiverAccount(){
if(StringUtils.isNotBlank(this.description) && sharingReceiverId.equals(0l)){
if(sharingReceiverId.equals(0l) && StringUtils.isNotBlank(this.description)){
JSONObject jsonObject = JSON.parseObject(this.description);
if(jsonObject != null){
this.receiverAccount = jsonObject.getString("account");


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java View File

@@ -284,6 +284,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
jo.put("amount", mallAmount);
jo.put("merchantId",receiver.getMerchantId());
jo.put("description",receiver.getId());
jo.put("isPrivate",EnumYesOrNo.YES.getCode());
receivers.add(jo);
}
}


Loading…
Cancel
Save