Procházet zdrojové kódy

[小程序投放][修改] 返回错误列表

release_toaliyun_real
masterspirit před 7 roky
committed by Stormeye.Wu
rodič
revize
b64970aa66
2 změnil soubory, kde provedl 6 přidání a 4 odebrání
  1. +6
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java
  2. +0
    -4
      mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml

+ 6
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxCouponSendController.java Zobrazit soubor

@@ -47,9 +47,15 @@ public class WxCouponSendController extends BaseController {
} }
wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setTenantId(getTenantId());
wxCouponSend.setStatus(0); wxCouponSend.setStatus(0);
<<<<<<< HEAD
List<WxCouponSend> wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend, 1, 1).getList(); List<WxCouponSend> wxCouponSendList = wxCouponSendService.listAsPage(wxCouponSend, 1, 1).getList();
if (wxCouponSendList != null && !wxCouponSendList.isEmpty()) { if (wxCouponSendList != null && !wxCouponSendList.isEmpty()) {
return new ResultData(Result.ERROR, "已经添加过该券"); 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()); WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId());
if (wxCoupon.getStatus() != 0 || wxCoupon.getSendType() != 2) { if (wxCoupon.getStatus() != 0 || wxCoupon.getSendType() != 2) {


+ 0
- 4
mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml Zobrazit soubor

@@ -72,10 +72,6 @@
and `send_end_time` = #{sendEndTime} and `send_end_time` = #{sendEndTime}


</if> </if>
<if test=" null != status and status==0">
and `send_end_time` &gt;= NOW()
and `send_start_time` &lt;= NOW()
</if>


<if test=" null != createDate "> <if test=" null != createDate ">
and `create_date` = #{createDate} and `create_date` = #{createDate}


Načítá se…
Zrušit
Uložit