|
|
|
@@ -423,12 +423,16 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ |
|
|
|
WxProfitSharingOrder record = new WxProfitSharingOrder(); |
|
|
|
|
|
|
|
WxAppinfo appInfo; |
|
|
|
if (wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode())) { |
|
|
|
if (wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()) |
|
|
|
||wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode())){ |
|
|
|
WxPayOrder wxPayOrder = wxPayOrderMapper.selectByPrimaryKey(wxProfitSharingOrder.getOrderId()); |
|
|
|
appInfo = getAppinfo(wxPayOrder.getcUserId()); |
|
|
|
} else { |
|
|
|
} else if(wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode()) |
|
|
|
||wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI_FINISH.getCode())){ |
|
|
|
WxCardSpend wxCardSpend = wxCardSpendMapper.selectByPrimaryKey(wxProfitSharingOrder.getOrderId()); |
|
|
|
appInfo = getAppinfo(wxCardSpend.getOwnerId()); |
|
|
|
} else { |
|
|
|
return new ResultData(ErrorCode.PROFIT_SHARING_QUERY_UNKNOWN_TYPE); |
|
|
|
} |
|
|
|
WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); |
|
|
|
|
|
|
|
@@ -552,7 +556,9 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ |
|
|
|
public ResultData finishSharingOrder(WxSharingOrderDto sharingOrderDto) { |
|
|
|
final IdWorker idworker = IdWorker.get(); |
|
|
|
|
|
|
|
if (!sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_FINISH.getCode())){ |
|
|
|
if (!sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()) |
|
|
|
&& |
|
|
|
!sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI_FINISH.getCode())){ |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -564,7 +570,6 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ |
|
|
|
WxProfitSharingOrder record = new WxProfitSharingOrder(); |
|
|
|
//创建分账订单 |
|
|
|
Date currentDate = new Date(); |
|
|
|
record = new WxProfitSharingOrder(); |
|
|
|
record.setId(idworker.nextId()); |
|
|
|
record.setTenantId(sharingOrderDto.getTenantId()); |
|
|
|
record.setTransactionId(sharingOrderDto.getTransactionId()); |
|
|
|
|