Browse Source

//礼包

release_toaliyun_real
xhxu 3 years ago
parent
commit
a83c30ece2
4 changed files with 8 additions and 6 deletions
  1. +0
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java
  3. +6
    -1
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java

+ 0
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -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){


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java View File

@@ -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<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));
}
return corder;


+ 6
- 1
mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java View File

@@ -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<WxOrder> orders = super.getChildOrders(corder, tenantId, EnumComposeOrder.PACKAGECOUPON);
if (null != orders && orders.size() == 1 ) {
corder.setSingleOrder(orders.get(0));
}
return corder;
}

@Override


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/order/impl/batch/MulityNumberOneOrderBatchOrderAdapterService.java View File

@@ -50,7 +50,7 @@ public class MulityNumberOneOrderBatchOrderAdapterService extends BaseBatchOrder
WxComposeOrder composeOrder = super.getComposeOrder(mainOrderId, tenantId, EnumComposeOrder.MULITY_NUMBER_ORDER_BATCH);
List<WxOrder> 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;


Loading…
Cancel
Save