diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java index fe1c52874..6806cf2f6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java @@ -201,6 +201,7 @@ public class WxOrderCouponVo extends TenantEntity { this.setDetail(c.getDetail()); this.setRemark(c.getRemark()); this.setGiftList(c.getGiftList()); + this.setGiftCouponList(c.getGiftCouponList()); this.setSupportTransfer(c.getSupportTransfer()); this.setSubsidyNum(c.getSubsidyNum()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 55437d41b..e4dbbcea4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2242,6 +2242,15 @@ public class WxOrderServiceImpl implements WxOrderService { couponQ.setId(order.getProductId()); WxCoupon coupon = wxCouponMapper.findSimpleDetail(couponQ); if (null != coupon ) { + if(EnumCouponType.COUPON_GIFT.getCode().equals(coupon.getType())){ + WxCoupon couponGQ = new WxCoupon(); + couponGQ.updateTenantInfo(tenantEntity); + List longs = JSON.parseArray(coupon.getGiftList(), Long.class); + if(longs != null && longs.size() > 0){ + couponGQ.setIds(longs); + coupon.setGiftCouponList(wxCouponMapper.findList(couponGQ)); + } + } vo.initByCoupon(coupon, true); } WxCouponOrder couponOrderQ = new WxCouponOrder(); @@ -2252,6 +2261,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; @@ -3078,7 +3088,7 @@ public class WxOrderServiceImpl implements WxOrderService { recordQ.updateTenantInfo(border); recordQ.setComposeOrderId(wxBatchOrder.getId()); List listOfCUser = wxOrderMapper.findListOfCUser(recordQ); - List wxOrderCouponVos = toOrderCouponVoList(border, listOfCUser, true); + List wxOrderCouponVos = toWxOrderCouponVoList(border, listOfCUser); wxBatchOrder.setOrders(wxOrderCouponVos); } return wxBatchOrder;