|
|
|
@@ -111,6 +111,7 @@ public class WxCouponController extends BaseController { |
|
|
|
if (wxCouponCVo == null) { |
|
|
|
return new ResultData(ErrorCode.COUPON_IS_EMPTY); |
|
|
|
} |
|
|
|
wxCouponCVo.setSalePrice(couponCVo.getSalePrice()); |
|
|
|
wxCouponCVo.setRemainInventory(couponCVo.getRemainInventory()); |
|
|
|
wxCouponCVo.setStatus(couponCVo.getStatus()); |
|
|
|
} |
|
|
|
@@ -213,9 +214,18 @@ public class WxCouponController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
WxCouponCVo couponCVo = new WxCouponCVo(); |
|
|
|
if(cc.getChannelPrice() != null){ |
|
|
|
couponCVo.setSalePrice(cc.getChannelPrice()); |
|
|
|
}else{ |
|
|
|
couponCVo.setSalePrice(c.getSalePrice()); |
|
|
|
} |
|
|
|
if(cc.getChannelStock() != null){ |
|
|
|
couponCVo.setRemainInventory(cc.getChannelStock()); |
|
|
|
}else{ |
|
|
|
couponCVo.setRemainInventory(c.getRemainInventory()); |
|
|
|
} |
|
|
|
couponCVo.setId(cc.getId()); |
|
|
|
couponCVo.setCouponId(cc.getCouponId()); |
|
|
|
couponCVo.setRemainInventory(c.getRemainInventory()); |
|
|
|
couponCVo.setStatus(c.getStatus()); |
|
|
|
return couponCVo; |
|
|
|
} |
|
|
|
@@ -260,6 +270,12 @@ public class WxCouponController extends BaseController { |
|
|
|
if(wxcv == null){ |
|
|
|
return null; |
|
|
|
} |
|
|
|
if(cc.getChannelPrice() != null){ |
|
|
|
wxcv.setSalePrice(cc.getChannelPrice()); |
|
|
|
} |
|
|
|
if(cc.getChannelStock() != null){ |
|
|
|
wxcv.setRemainInventory(cc.getChannelStock()); |
|
|
|
} |
|
|
|
wxcv.setId(cc.getId()); |
|
|
|
wxcv.setCouponId(cc.getCouponId()); |
|
|
|
wxcv.setTargetAd(cc.getTargetAd()); |
|
|
|
|