From a948faa4c5cb6b4cbfc2aa49b7dc67b705909293 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 21 Sep 2022 16:42:32 +0800 Subject: [PATCH] //shar --- .../domain/vo/WxProfitSharingOrderDetailsVo.java | 15 +++++++++++++++ .../impl/WxProfitSharingOrderServiceImpl.java | 7 ++++--- .../mapper/WxProfitSharingOrderMapper.xml | 3 ++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java index 5e5e4aecb..dbb2060f5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java @@ -1,8 +1,12 @@ package com.iformall.domain.vo; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumProfitSharingReceiverType; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; import java.util.Date; @@ -21,9 +25,20 @@ public class WxProfitSharingOrderDetailsVo extends TenantEntity { private String finishTime; private String failedReason; private String description; + private Long sharingReceiverId; private Integer receiverType; private String receiverAccount; private String receiverComments; private Integer sharingType; private Integer status; + + public String getReceiverAccount(){ + if(StringUtils.isNotBlank(this.description) && sharingReceiverId.equals(0l)){ + JSONObject jsonObject = JSON.parseObject(this.description); + if(jsonObject != null){ + this.receiverAccount = jsonObject.getString("account"); + } + } + return this.receiverAccount; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 8c1f9b489..a653b94d2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -256,7 +256,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ JSONObject jo = new JSONObject(); jo.put("type",payShareAdapterService.getShareAccount(receiver.getReceiverType()).getMessage()); jo.put("account",receiver.getReceiverAccount()); - jo.put("amount", sellerAmount); + jo.put("amount", systemAmount); jo.put("merchantId",receiver.getMerchantId()); jo.put("description",receiver.getId()); jo.put("isPrivate",EnumYesOrNo.YES.getCode()); @@ -281,7 +281,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ JSONObject jo = new JSONObject(); jo.put("type",payShareAdapterService.getShareAccount(receiver.getReceiverType()).getMessage()); jo.put("account",receiver.getReceiverAccount()); - jo.put("amount", sellerAmount); + jo.put("amount", mallAmount); jo.put("merchantId",receiver.getMerchantId()); jo.put("description",receiver.getId()); receivers.add(jo); @@ -345,7 +345,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ jo.put("account",payAccount.getSubMchId()); jo.put("amount", shareAmount); jo.put("merchantId",0); - jo.put("description",receiver.getId()); + jo.put("description",0); receivers.add(jo); }else if(EnumPayMchType.DIRECT.getCode().equals(payOrder.getMchType())){ //解冻给收款方(门店) @@ -371,6 +371,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ result.setSharingReceiverId(Long.valueOf(o.getString("description"))); result.setPayAmount(o.getInteger("amount")); result.setIsPrivate(o.getInteger("isPrivate")); + result.setDescription(o.toJSONString()); result.setCreateTime(currentDate); result.setUpdateTime(currentDate); result.setSharingStatus(EnumProfitSharingResultStatus.PROFIT_SHARING_RESULT_PENDING.getCode()); diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml index f330580d6..41d369547 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml @@ -253,6 +253,7 @@ + @@ -263,7 +264,7 @@