|
|
|
@@ -2252,6 +2252,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
WxCouponOrder couponOrder = wxCouponOrderMapper.findDetailOfCUser(couponOrderList.get(0).getId(), tenantEntity.getTenantId()); |
|
|
|
vo.initByCouponOrder(couponOrder); |
|
|
|
} |
|
|
|
vo.setMerchantVoList(wxMerchantService.findMerchantListByProduct(tenantEntity, order.getProductId(), false)); |
|
|
|
voList.add(vo); |
|
|
|
} |
|
|
|
return voList; |
|
|
|
@@ -3090,7 +3091,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
recordQ.updateTenantInfo(border); |
|
|
|
recordQ.setComposeOrderId(wxBatchOrder.getId()); |
|
|
|
List<WxOrder> listOfCUser = wxOrderMapper.findListOfCUser(recordQ); |
|
|
|
List<WxOrderCouponVo> wxOrderCouponVos = toOrderCouponVoList(border, listOfCUser, true); |
|
|
|
List<WxOrderCouponVo> wxOrderCouponVos = toWxOrderCouponVoList(border, listOfCUser); |
|
|
|
wxBatchOrder.setOrders(wxOrderCouponVos); |
|
|
|
} |
|
|
|
return wxBatchOrder; |
|
|
|
|