| @@ -1300,9 +1300,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL); | throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL); | ||||
| } | } | ||||
| merchantId = bUser.getMerchantId(); | merchantId = bUser.getMerchantId(); | ||||
| //TODO 111111111查询核销商户的收款账户有没有配置 | |||||
| //couponOrder.getm | |||||
| } | } | ||||
| if(merchantId != null){ | if(merchantId != null){ | ||||
| @@ -63,7 +63,7 @@ public class SingleOrderAdapterService extends BaseBatchOrderAdapterService { | |||||
| public WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId) { | public WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId) { | ||||
| WxComposeOrder corder = super.getComposeOrder(mainOrderId, tenantId, EnumComposeOrder.SINGLE); | WxComposeOrder corder = super.getComposeOrder(mainOrderId, tenantId, EnumComposeOrder.SINGLE); | ||||
| List<WxOrder> orders = super.getChildOrders(corder, tenantId, EnumComposeOrder.SINGLE); | List<WxOrder> orders = super.getChildOrders(corder, tenantId, EnumComposeOrder.SINGLE); | ||||
| if (null != orders && orders.size() > 0 ) { | |||||
| if (null != orders && orders.size() == 0 ) { | |||||
| corder.setSingleOrder(orders.get(0)); | corder.setSingleOrder(orders.get(0)); | ||||
| } | } | ||||
| return corder; | return corder; | ||||
| @@ -44,7 +44,12 @@ public class CouponPackageOrderAdapterService extends BaseBatchOrderAdapterServi | |||||
| @Override | @Override | ||||
| public WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId) { | public WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId) { | ||||
| return super.getComposeOrder(mainOrderId, tenantId, EnumComposeOrder.PACKAGECOUPON); | |||||
| WxComposeOrder corder = super.getComposeOrder(mainOrderId, tenantId, EnumComposeOrder.PACKAGECOUPON); | |||||
| List<WxOrder> orders = super.getChildOrders(corder, tenantId, EnumComposeOrder.PACKAGECOUPON); | |||||
| if (null != orders && orders.size() == 1 ) { | |||||
| corder.setSingleOrder(orders.get(0)); | |||||
| } | |||||
| return corder; | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -50,7 +50,7 @@ public class MulityNumberOneOrderBatchOrderAdapterService extends BaseBatchOrder | |||||
| WxComposeOrder composeOrder = super.getComposeOrder(mainOrderId, tenantId, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH); | WxComposeOrder composeOrder = super.getComposeOrder(mainOrderId, tenantId, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH); | ||||
| List<WxOrder> orders = super.getChildOrders(composeOrder, tenantId, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH); | List<WxOrder> orders = super.getChildOrders(composeOrder, tenantId, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH); | ||||
| //todo 目前只有单订单 | //todo 目前只有单订单 | ||||
| if (null != orders && orders.size() > 0 ) { | |||||
| if (null != orders && orders.size() == 1 ) { | |||||
| composeOrder.setSingleOrder(orders.get(0)); | composeOrder.setSingleOrder(orders.get(0)); | ||||
| } | } | ||||
| return composeOrder; | return composeOrder; | ||||