diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index f8908a378..fd9d43ade 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1300,9 +1300,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL); } merchantId = bUser.getMerchantId(); - - //TODO 111111111查询核销商户的收款账户有没有配置 - //couponOrder.getm } if(merchantId != null){ diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java index 2b6038714..4d9d6988c 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java @@ -63,7 +63,7 @@ public class SingleOrderAdapterService extends BaseBatchOrderAdapterService { public WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId) { WxComposeOrder corder = super.getComposeOrder(mainOrderId, tenantId, EnumComposeOrder.SINGLE); List orders = super.getChildOrders(corder, tenantId, EnumComposeOrder.SINGLE); - if (null != orders && orders.size() > 0 ) { + if (null != orders && orders.size() == 0 ) { corder.setSingleOrder(orders.get(0)); } return corder; diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java index 14faaf2bf..bea5df03d 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java @@ -44,7 +44,12 @@ public class CouponPackageOrderAdapterService extends BaseBatchOrderAdapterServi @Override public WxComposeOrder getComposeOrder(Long mainOrderId, String tenantId) { - return super.getComposeOrder(mainOrderId, tenantId, EnumComposeOrder.PACKAGECOUPON); + WxComposeOrder corder = super.getComposeOrder(mainOrderId, tenantId, EnumComposeOrder.PACKAGECOUPON); + List orders = super.getChildOrders(corder, tenantId, EnumComposeOrder.PACKAGECOUPON); + if (null != orders && orders.size() == 1 ) { + corder.setSingleOrder(orders.get(0)); + } + return corder; } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java index 67bf49bd2..7c36f4f5a 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java @@ -50,7 +50,7 @@ public class MulityNumberOneOrderBatchOrderAdapterService extends BaseBatchOrder WxComposeOrder composeOrder = super.getComposeOrder(mainOrderId, tenantId, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH); List orders = super.getChildOrders(composeOrder, tenantId, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH); //todo 目前只有单订单 - if (null != orders && orders.size() > 0 ) { + if (null != orders && orders.size() == 1 ) { composeOrder.setSingleOrder(orders.get(0)); } return composeOrder;