| @@ -236,7 +236,6 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| 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("receiverId",receiver.getId()); | ||||
| jo.put("description","系统1"); | |||||
| receivers.add(jo); | receivers.add(jo); | ||||
| } | } | ||||
| } | } | ||||
| @@ -259,7 +258,6 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| 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("receiverId",receiver.getId()); | ||||
| jo.put("description","系统2"); | |||||
| receivers.add(jo); | receivers.add(jo); | ||||
| } | } | ||||
| } | } | ||||
| @@ -284,7 +282,6 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| 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("receiverId",receiver.getId()); | ||||
| jo.put("description","服务台"); | |||||
| receivers.add(jo); | receivers.add(jo); | ||||
| } | } | ||||
| } | } | ||||
| @@ -306,7 +303,6 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| 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("receiverId",receiver.getId()); | ||||
| jo.put("description","商户"); | |||||
| receivers.add(jo); | receivers.add(jo); | ||||
| } | } | ||||
| @@ -348,7 +344,6 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| 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("receiverId",receiver.getId()); | ||||
| jo.put("description","商户"); | |||||
| receivers.add(jo); | receivers.add(jo); | ||||
| } | } | ||||
| try{ | try{ | ||||
| @@ -363,7 +358,6 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| result.setSharingOrderId(sharingOrder.getId()); | result.setSharingOrderId(sharingOrder.getId()); | ||||
| result.setSharingReceiverId(Long.valueOf(o.getString("receiverId"))); | result.setSharingReceiverId(Long.valueOf(o.getString("receiverId"))); | ||||
| result.setPayAmount(o.getInteger("amount")); | result.setPayAmount(o.getInteger("amount")); | ||||
| result.setDescription(o.getString("description")); | |||||
| result.setCreateTime(currentDate); | result.setCreateTime(currentDate); | ||||
| result.setUpdateTime(currentDate); | result.setUpdateTime(currentDate); | ||||
| result.setSharingStatus(EnumProfitSharingResultStatus.PROFIT_SHARING_RESULT_PENDING.getCode()); | result.setSharingStatus(EnumProfitSharingResultStatus.PROFIT_SHARING_RESULT_PENDING.getCode()); | ||||