|
|
|
@@ -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()); |
|
|
|
|