|
|
|
@@ -206,21 +206,22 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ |
|
|
|
|
|
|
|
PayShareResult shareResult = payServiceFactory.getPayShareAdapterService(dto.getPayWay()).haveReciversShare(appInfo, payAccount, frecord, |
|
|
|
sharingOrder.getTransactionId(), JSONArray.parseArray(JSON.toJSONString(receivers)), EnumProfitSharingOrderType.getEnum(sharingOrder.getType())); |
|
|
|
WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder(); |
|
|
|
updSharingOrder.updateTenantInfo(sharingOrder); |
|
|
|
updSharingOrder.setId(sharingOrder.getId()); |
|
|
|
updSharingOrder.setOutSettleNo(frecord.getOutSettleNo()); |
|
|
|
if (!shareResult.isSuccess()) { |
|
|
|
sharingOrder.setOutSettleNo(frecord.getOutSettleNo()); |
|
|
|
sharingOrder.setSharingStatus(shareResult.getCode()); |
|
|
|
sharingOrder.setErrorMsg("REDO:"+shareResult.getMsg()); |
|
|
|
sharingOrder.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(sharingOrder); |
|
|
|
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),sharingOrder.getErrorMsg()); |
|
|
|
updSharingOrder.setSharingStatus(shareResult.getCode()); |
|
|
|
updSharingOrder.setErrorMsg("REDO:"+shareResult.getMsg()); |
|
|
|
updSharingOrder.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(updSharingOrder); |
|
|
|
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),updSharingOrder.getErrorMsg()); |
|
|
|
} |
|
|
|
|
|
|
|
sharingOrder.setOutSettleNo(frecord.getOutSettleNo()); |
|
|
|
sharingOrder.setSharingOrderNo(shareResult.getShareOrderNo()); |
|
|
|
sharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); |
|
|
|
sharingOrder.setErrorMsg("REDO:重试分账成功"); |
|
|
|
sharingOrder.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(sharingOrder); |
|
|
|
updSharingOrder.setSharingOrderNo(shareResult.getShareOrderNo()); |
|
|
|
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); |
|
|
|
updSharingOrder.setErrorMsg("REDO:重试分账成功"); |
|
|
|
updSharingOrder.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(updSharingOrder); |
|
|
|
for (WxProfitSharingResult result:resultList) { |
|
|
|
wxProfitSharingResultMapper.insert(result); |
|
|
|
} |
|
|
|
@@ -237,18 +238,23 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ |
|
|
|
WxPayAccount payAccount = wxPayAccountMapper.selectById(appInfo.getPayId()); |
|
|
|
|
|
|
|
PayShareResult shareResult = payServiceFactory.getPayShareAdapterService(dto.getPayWay()).noReciverShare(appInfo,payAccount,sharingOrder,sharingOrder.getTransactionId(),sharingOrder.getPayAmount()); |
|
|
|
|
|
|
|
WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder(); |
|
|
|
updSharingOrder.updateTenantInfo(sharingOrder); |
|
|
|
updSharingOrder.setId(sharingOrder.getId()); |
|
|
|
updSharingOrder.setOutSettleNo(sharingOrder.getOutSettleNo()); |
|
|
|
if (!shareResult.isSuccess()) { |
|
|
|
sharingOrder.setSharingStatus(shareResult.getCode()); |
|
|
|
sharingOrder.setErrorMsg("REDO:"+shareResult.getMsg()); |
|
|
|
sharingOrder.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(sharingOrder); |
|
|
|
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),sharingOrder.getErrorMsg()); |
|
|
|
updSharingOrder.setSharingStatus(shareResult.getCode()); |
|
|
|
updSharingOrder.setErrorMsg("REDO:"+shareResult.getMsg()); |
|
|
|
updSharingOrder.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(updSharingOrder); |
|
|
|
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),updSharingOrder.getErrorMsg()); |
|
|
|
} |
|
|
|
sharingOrder.setSharingOrderNo(shareResult.getShareOrderNo()); |
|
|
|
sharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); |
|
|
|
sharingOrder.setErrorMsg("REDO:重试分账成功"); |
|
|
|
sharingOrder.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(sharingOrder); |
|
|
|
updSharingOrder.setSharingOrderNo(shareResult.getShareOrderNo()); |
|
|
|
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); |
|
|
|
updSharingOrder.setErrorMsg("REDO:重试分账成功"); |
|
|
|
updSharingOrder.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(updSharingOrder); |
|
|
|
return new ResultData(shareResult.getData()); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -275,17 +281,21 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ |
|
|
|
|
|
|
|
PayShareResult shareResult = payShareAdapterService.haveReciversShare(appInfo, payAccount, record, |
|
|
|
sharingOrderDto.getTransactionId(), jsonArray, shareType); |
|
|
|
WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder(); |
|
|
|
updSharingOrder.updateTenantInfo(record); |
|
|
|
updSharingOrder.setId(record.getId()); |
|
|
|
updSharingOrder.setOutSettleNo(record.getOutSettleNo()); |
|
|
|
if (!shareResult.isSuccess()) { |
|
|
|
record.setSharingStatus(shareResult.getCode()); |
|
|
|
record.setErrorMsg(shareResult.getMsg()); |
|
|
|
record.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(record); |
|
|
|
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),record.getErrorMsg()); |
|
|
|
updSharingOrder.setSharingStatus(shareResult.getCode()); |
|
|
|
updSharingOrder.setErrorMsg(shareResult.getMsg()); |
|
|
|
updSharingOrder.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(updSharingOrder); |
|
|
|
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),updSharingOrder.getErrorMsg()); |
|
|
|
} |
|
|
|
record.setSharingOrderNo(shareResult.getShareOrderNo()); |
|
|
|
record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); |
|
|
|
record.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(record); |
|
|
|
updSharingOrder.setSharingOrderNo(shareResult.getShareOrderNo()); |
|
|
|
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); |
|
|
|
updSharingOrder.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(updSharingOrder); |
|
|
|
|
|
|
|
final IdWorker idworker = IdWorker.get(); |
|
|
|
try { |
|
|
|
@@ -459,18 +469,22 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ |
|
|
|
|
|
|
|
//分账提交 |
|
|
|
PayShareResult shareResult = payShareAdapterService.noReciverShare(appInfo,payAccount,record,sharingOrderDto.getTransactionId(),sharingOrderDto.getShareAmount()); |
|
|
|
WxProfitSharingOrder updSharingOrder = new WxProfitSharingOrder(); |
|
|
|
updSharingOrder.updateTenantInfo(record); |
|
|
|
updSharingOrder.setId(record.getId()); |
|
|
|
updSharingOrder.setOutSettleNo(record.getOutSettleNo()); |
|
|
|
if (!shareResult.isSuccess()) { |
|
|
|
record.setSharingStatus(shareResult.getCode()); |
|
|
|
record.setErrorMsg(shareResult.getMsg()); |
|
|
|
record.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(record); |
|
|
|
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),record.getErrorMsg()); |
|
|
|
updSharingOrder.setSharingStatus(shareResult.getCode()); |
|
|
|
updSharingOrder.setErrorMsg(shareResult.getMsg()); |
|
|
|
updSharingOrder.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(updSharingOrder); |
|
|
|
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),updSharingOrder.getErrorMsg()); |
|
|
|
} |
|
|
|
|
|
|
|
record.setSharingOrderNo(shareResult.getShareOrderNo()); |
|
|
|
record.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); |
|
|
|
record.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(record); |
|
|
|
updSharingOrder.setSharingOrderNo(shareResult.getShareOrderNo()); |
|
|
|
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_ACCEPTED.getCode()); |
|
|
|
updSharingOrder.setUpdateTime(new Date()); |
|
|
|
wxProfitSharingOrderMapper.updateById(updSharingOrder); |
|
|
|
return new ResultData(shareResult.getData()); |
|
|
|
} |
|
|
|
|
|
|
|
|