|
|
|
@@ -290,11 +290,11 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ |
|
|
|
sharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()); |
|
|
|
if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode())) |
|
|
|
return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_UNKNOWN); |
|
|
|
// if(sharingOrderDto.getRateAmount() != null) { |
|
|
|
// // 分账完结 |
|
|
|
// sharingOrderDto.setShareAmount(sharingOrderDto.getPayAmount()+sharingOrderDto.getRateAmount()); |
|
|
|
// } |
|
|
|
sharingOrderDto.setShareAmount(sharingOrderDto.getPayAmount()); |
|
|
|
if(sharingOrderDto.getRateAmount() != null) { |
|
|
|
// 分账完结 |
|
|
|
sharingOrderDto.setShareAmount(sharingOrderDto.getShareAmount()+sharingOrderDto.getRateAmount()); |
|
|
|
} |
|
|
|
// sharingOrderDto.setShareAmount(sharingOrderDto.getPayAmount()); |
|
|
|
return finishSharingOrder(sharingOrderDto,payWay,share); |
|
|
|
} |
|
|
|
//计算分账账户合法性 |
|
|
|
|