|
|
@@ -105,7 +105,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ |
|
|
String before3dayStr = DateUtils.getTimeBefore(2, new Date()); |
|
|
String before3dayStr = DateUtils.getTimeBefore(2, new Date()); |
|
|
Date before3day = DateUtils.stringToDate(before3dayStr); |
|
|
Date before3day = DateUtils.stringToDate(before3dayStr); |
|
|
if(before3day.before(record.getCreateTime())){ |
|
|
if(before3day.before(record.getCreateTime())){ |
|
|
return new PayShareResult(false, EnumProfitSharingOrderStatus.PROFIT_SHARING_READY.getCode(),"未满足结算周期..", null,null); |
|
|
|
|
|
|
|
|
return new PayShareResult(false, EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode(),"未满足结算周期..", null,null); |
|
|
} |
|
|
} |
|
|
try { |
|
|
try { |
|
|
TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount); |
|
|
TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount); |
|
|
@@ -297,6 +297,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ |
|
|
updSharingOrder.setId(sharingOrder.getId()); |
|
|
updSharingOrder.setId(sharingOrder.getId()); |
|
|
updSharingOrder.updateTenantInfo(payOrder); |
|
|
updSharingOrder.updateTenantInfo(payOrder); |
|
|
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode()); |
|
|
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode()); |
|
|
|
|
|
updSharingOrder.setErrorMsg("待分账重试"); |
|
|
updSharingOrder.setUpdateTime(new Date()); |
|
|
updSharingOrder.setUpdateTime(new Date()); |
|
|
wxProfitSharingOrderMapper.updateById(updSharingOrder); |
|
|
wxProfitSharingOrderMapper.updateById(updSharingOrder); |
|
|
return new ResultData(); |
|
|
return new ResultData(); |
|
|
@@ -342,6 +343,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ |
|
|
updSharingOrder.setId(sharingOrder.getId()); |
|
|
updSharingOrder.setId(sharingOrder.getId()); |
|
|
updSharingOrder.updateTenantInfo(payOrder); |
|
|
updSharingOrder.updateTenantInfo(payOrder); |
|
|
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode()); |
|
|
updSharingOrder.setSharingStatus(EnumProfitSharingOrderStatus.PROFIT_SHARING_APPLY_FAILED.getCode()); |
|
|
|
|
|
updSharingOrder.setErrorMsg("待分账重试"); |
|
|
updSharingOrder.setReceivers(receivers.toJSONString()); |
|
|
updSharingOrder.setReceivers(receivers.toJSONString()); |
|
|
updSharingOrder.setUpdateTime(new Date()); |
|
|
updSharingOrder.setUpdateTime(new Date()); |
|
|
wxProfitSharingOrderMapper.updateById(updSharingOrder); |
|
|
wxProfitSharingOrderMapper.updateById(updSharingOrder); |
|
|
|