Browse Source

分账bug

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
26058daeca
2 changed files with 12 additions and 15 deletions
  1. +0
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  2. +12
    -12
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java

+ 0
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java View File

@@ -193,9 +193,6 @@ public class WxPayOrderController extends BaseController {
//拼团的订单,如果查询到是拼团待付款的,则重新查询是否已经真的支付,其他的直接返回订单信息
if (wxPayOrderService.isOrderGroupCoupon(payOrder, wxCoupon)) {
if(order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE_REFUND.getCode())) {
return new ResultData(Result.SUCCESS, "拼团失败:人员已满,将稍后退款。");
}
if (!order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode())) {
return new ResultData(Result.SUCCESS, "支付状态更新成功", order);
}


+ 12
- 12
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java View File

@@ -233,21 +233,21 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
psReceiverQ.setSharingType(payServiceFactory.getPayShareAdapterService(payWay).getProfitSharingType());
psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode());
List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ);
if (psReceiverList.size() < 0 || psReceiverList.size() > 50) {
if (psReceiverList.size() <= 0 || psReceiverList.size() > 50) {
return new ResultData(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID);
}

if (psReceiverList.size() == 0) { //没有分账账户,直接结束分账
if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()))
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());
}
return finishSharingOrder(sharingOrderDto,payWay);
}
// if (psReceiverList.size() == 0) { //没有分账账户,直接结束分账
// if (sharingOrderDto.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()))
// 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());
// }
// return finishSharingOrder(sharingOrderDto,payWay);
// }
//计算分账账户合法性
if (psReceiverList.size() > 1 &&
psReceiverList.stream().filter(r->(r.getParameter() == null)).count() > 0) {


Loading…
Cancel
Save