| | |
| | | // 结算信息 |
| | | PartnerTransactionsRequest.SettleInfo settleInfo = new PartnerTransactionsRequest.SettleInfo(); |
| | | // TODO 分账处理 |
| | | //if(orderFrom==2){ |
| | | if(orderFrom==2){ |
| | | settleInfo.setProfitSharing(true); |
| | | //}else{ |
| | | // settleInfo.setProfitSharing(false); |
| | | // } |
| | | }else{ |
| | | settleInfo.setProfitSharing(false); |
| | | } |
| | | settleInfo.setSubsidyAmount(BigDecimal.ZERO); |
| | | request.setSettleInfo(settleInfo); |
| | | |
| | |
| | | merVerifyOrderVo.setUserMobile(member.getMobile()); |
| | | merVerifyOrderVo.setCloseFlag(order.getCloseFlag()); |
| | | // TODO 活动才分账 |
| | | //if (order.getOrderFrom() == 2) { |
| | | if (order.getOrderFrom() == 2) { |
| | | // 活动才分账 |
| | | submitProfitSharing(orderId, order.getOrderNo(), order.getShopId(), order.getOrderMoney()); |
| | | //} |
| | | } |
| | | |
| | | //创建支付记录 |
| | | if(merVerifyOrderDto.getRelPayMoney().compareTo(BigDecimal.ZERO)>0){ |