|
|
|
@@ -647,8 +647,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
cvo.setPickStartDate(coupon.getPickStartDate()); |
|
|
|
cvo.setPickEndDate(coupon.getPickEndDate()); |
|
|
|
cvo.setAutoRefund(coupon.getAutoRefund()); |
|
|
|
cvo.setMerchantVoList(wxMerchantService.newFindWithShopByCouponId(cvo,coupon.getId())); |
|
|
|
} |
|
|
|
cvo.setMerchantVoList(wxMerchantService.newFindByCouponId(cvo,cvo.getCouponId())); |
|
|
|
return cvo; |
|
|
|
} catch (IllegalAccessException | InvocationTargetException e) { |
|
|
|
logger.error("getCouponOrderCVo error.",e); |
|
|
|
@@ -785,6 +785,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
cvo.setValidStartDate(coupon.getValidStartDate()); |
|
|
|
cvo.setValidEndDate(coupon.getValidEndDate()); |
|
|
|
cvo.setAutoRefund(coupon.getAutoRefund()); |
|
|
|
cvo.setMerchantVoList(wxMerchantService.newFindByCouponId(cvo,coupon.getId())); |
|
|
|
} |
|
|
|
WxCouponCar couponCar= couponCarMap.get(cvo.getCouponId()); |
|
|
|
if (null != couponCar) { |
|
|
|
|