| @@ -235,6 +235,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| jo.put("account",receiver.getReceiverAccount()); | jo.put("account",receiver.getReceiverAccount()); | ||||
| jo.put("amount", sellerAmount); | jo.put("amount", sellerAmount); | ||||
| jo.put("merchantId",receiver.getMerchantId()); | jo.put("merchantId",receiver.getMerchantId()); | ||||
| jo.put("receiverId",receiver.getId()); | |||||
| jo.put("description","系统1"); | jo.put("description","系统1"); | ||||
| receivers.add(jo); | receivers.add(jo); | ||||
| } | } | ||||
| @@ -257,6 +258,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| jo.put("account",receiver.getReceiverAccount()); | jo.put("account",receiver.getReceiverAccount()); | ||||
| jo.put("amount", sellerAmount); | jo.put("amount", sellerAmount); | ||||
| jo.put("merchantId",receiver.getMerchantId()); | jo.put("merchantId",receiver.getMerchantId()); | ||||
| jo.put("receiverId",receiver.getId()); | |||||
| jo.put("description","系统2"); | jo.put("description","系统2"); | ||||
| receivers.add(jo); | receivers.add(jo); | ||||
| } | } | ||||
| @@ -281,6 +283,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| jo.put("account",receiver.getReceiverAccount()); | jo.put("account",receiver.getReceiverAccount()); | ||||
| jo.put("amount", sellerAmount); | jo.put("amount", sellerAmount); | ||||
| jo.put("merchantId",receiver.getMerchantId()); | jo.put("merchantId",receiver.getMerchantId()); | ||||
| jo.put("receiverId",receiver.getId()); | |||||
| jo.put("description","服务台"); | jo.put("description","服务台"); | ||||
| receivers.add(jo); | receivers.add(jo); | ||||
| } | } | ||||
| @@ -302,6 +305,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| jo.put("account",receiver.getReceiverAccount()); | jo.put("account",receiver.getReceiverAccount()); | ||||
| jo.put("amount", shareAmount); | jo.put("amount", shareAmount); | ||||
| jo.put("merchantId",receiver.getMerchantId()); | jo.put("merchantId",receiver.getMerchantId()); | ||||
| jo.put("receiverId",receiver.getId()); | |||||
| jo.put("description","商户"); | jo.put("description","商户"); | ||||
| receivers.add(jo); | receivers.add(jo); | ||||
| } | } | ||||
| @@ -343,6 +347,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| jo.put("account",receiver.getReceiverAccount()); | jo.put("account",receiver.getReceiverAccount()); | ||||
| jo.put("amount", shareAmount); | jo.put("amount", shareAmount); | ||||
| jo.put("merchantId",receiver.getMerchantId()); | jo.put("merchantId",receiver.getMerchantId()); | ||||
| jo.put("receiverId",receiver.getId()); | |||||
| jo.put("description","商户"); | jo.put("description","商户"); | ||||
| receivers.add(jo); | receivers.add(jo); | ||||
| } | } | ||||
| @@ -356,7 +361,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| result.updateTenantInfo(sharingOrder); | result.updateTenantInfo(sharingOrder); | ||||
| result.setMerchantId(Long.valueOf(o.getString("merchantId"))); | result.setMerchantId(Long.valueOf(o.getString("merchantId"))); | ||||
| result.setSharingOrderId(sharingOrder.getId()); | result.setSharingOrderId(sharingOrder.getId()); | ||||
| result.setSharingReceiverId(Long.valueOf(o.getString("description"))); | |||||
| result.setSharingReceiverId(Long.valueOf(o.getString("receiverId"))); | |||||
| result.setPayAmount(o.getInteger("amount")); | result.setPayAmount(o.getInteger("amount")); | ||||
| result.setDescription(o.getString("description")); | result.setDescription(o.getString("description")); | ||||
| result.setCreateTime(currentDate); | result.setCreateTime(currentDate); | ||||