| @@ -220,19 +220,19 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| updSharingOrder.updateTenantInfo(sharingOrder); | updSharingOrder.updateTenantInfo(sharingOrder); | ||||
| updSharingOrder.setId(sharingOrder.getId()); | updSharingOrder.setId(sharingOrder.getId()); | ||||
| updSharingOrder.setOutSettleNo(sharingOrder.getOutSettleNo()); | updSharingOrder.setOutSettleNo(sharingOrder.getOutSettleNo()); | ||||
| if (!shareResult.isSuccess()) { | |||||
| updSharingOrder.setUpdateTime(currentDate); | |||||
| if(shareResult.isSuccess()){ | |||||
| updSharingOrder.setSharingOrderNo(shareResult.getShareOrderNo()); | |||||
| updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); | |||||
| updSharingOrder.setErrorMsg(""); | |||||
| }else{ | |||||
| updSharingOrder.setSharingStatus(shareResult.getCode()); | updSharingOrder.setSharingStatus(shareResult.getCode()); | ||||
| updSharingOrder.setErrorMsg(shareResult.getMsg()); | updSharingOrder.setErrorMsg(shareResult.getMsg()); | ||||
| updSharingOrder.setUpdateTime(currentDate); | |||||
| wxProfitSharingOrderMapper.updateById(updSharingOrder); | |||||
| return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),updSharingOrder.getErrorMsg()); | |||||
| } | } | ||||
| updSharingOrder.setPointDeduction(JSON.toJSONString(wxComposeChildOrderShare)); | updSharingOrder.setPointDeduction(JSON.toJSONString(wxComposeChildOrderShare)); | ||||
| updSharingOrder.setReceivers(JSON.toJSONString(receivers)); | updSharingOrder.setReceivers(JSON.toJSONString(receivers)); | ||||
| updSharingOrder.setSharingOrderNo(shareResult.getShareOrderNo()); | |||||
| updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); | |||||
| updSharingOrder.setErrorMsg(""); | |||||
| updSharingOrder.setUpdateTime(currentDate); | |||||
| wxProfitSharingOrderMapper.updateById(updSharingOrder); | wxProfitSharingOrderMapper.updateById(updSharingOrder); | ||||
| if(EnumPayMchType.DIRECT.getCode().equals(payOrder.getMchType()) || EnumPayShare.NO.getCode().equals(payOrder.getShare())){ | if(EnumPayMchType.DIRECT.getCode().equals(payOrder.getMchType()) || EnumPayShare.NO.getCode().equals(payOrder.getShare())){ | ||||