|
|
|
@@ -47,9 +47,15 @@ public class WxCouponSendController extends BaseController { |
|
|
|
} |
|
|
|
wxCouponSend.setTenantId(getTenantId()); |
|
|
|
wxCouponSend.setStatus(0); |
|
|
|
<<<<<<< HEAD |
|
|
|
List<WxCouponSend> wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend, 1, 1).getList(); |
|
|
|
if (wxCouponSendList != null && !wxCouponSendList.isEmpty()) { |
|
|
|
return new ResultData(Result.ERROR, "已经添加过该券"); |
|
|
|
======= |
|
|
|
List<WxCouponSend> wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend,1,1).getList(); |
|
|
|
if(wxCouponSendList!=null&&wxCouponSendList.size()>0){ |
|
|
|
return new ResultData(Result.ERROR,"已经添加过该券"); |
|
|
|
>>>>>>> 5607026... [小程序投放][修改] 返回错误列表 |
|
|
|
} |
|
|
|
WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId()); |
|
|
|
if (wxCoupon.getStatus() != 0 || wxCoupon.getSendType() != 2) { |
|
|
|
|