From 325ab34c491c06428ef20759a56eec0c83e88f63 Mon Sep 17 00:00:00 2001 From: Burce Date: Wed, 21 Aug 2019 16:25:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B3=A8=E5=88=B8->=E6=9C=89?= =?UTF-8?q?=E6=95=88=E6=9C=9F=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxCouponSendController.java | 16 ++++++++-------- .../com/iformall/domain/po/WxCouponSend.java | 6 +++++- .../com/iformall/mapper/WxCouponSendMapper.java | 2 +- .../service/impl/WxCouponSendServiceImpl.java | 4 +--- .../main/resources/mapper/WxCouponSendMapper.xml | 15 +++++++++++++-- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java index c4363da37..df6b53d09 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -57,13 +57,13 @@ public class WxCouponSendController extends BaseController { if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); wxCouponSend.setTenantId(getTenantId()); Integer valid = EnumCouponSendStatus.VALID.getCode(); - if (Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), wxCouponSend.getSendType())) { - if (Objects.nonNull(wxCouponSend.getStatus())) { - valid = wxCouponSend.getStatus(); - } else { - wxCouponSend.setStatus(null); - } - } +// if (Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), wxCouponSend.getSendType())) { +// if (Objects.nonNull(wxCouponSend.getStatus())) { +// valid = wxCouponSend.getStatus(); +// } else { +// wxCouponSend.setStatus(null); +// } +// } wxCouponSend.setStatus(valid); wxCouponSend.setSortColumns(BaseEntity.SortField.CreateDate_DESC); PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); @@ -143,7 +143,7 @@ public class WxCouponSendController extends BaseController { @ApiImplicitParam(name = "sendType", value = "注券类型(会员生日券时必传)", dataType = "int", paramType = "query") }) @SystemControllerLog(description = "注券-删除") - public ResultData delete(Long id,Integer sendType) { + public ResultData delete(Long id) { logger.debug("[" + getIpAddr() + "] WxCouponSendController::delete"); WxCouponSend wxCouponSend = wxCouponSendService.getById(id); if (wxCouponSend == null) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java index c3f1e8b2f..db1964939 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -59,7 +59,7 @@ public class WxCouponSend extends BaseEntity { private Integer sendType; @io.swagger.annotations.ApiModelProperty(value="发券条件",name="condition") private String conditions; - @io.swagger.annotations.ApiModelProperty(value="全部时不传 0:有效 1:无效",name="status") + @io.swagger.annotations.ApiModelProperty(value="0:有效 1:无效",name="status") private Integer status; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") @@ -74,4 +74,8 @@ public class WxCouponSend extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "1是0否", name = "是否发送短信1是0否") private Integer sendSms; + @io.swagger.annotations.ApiModelProperty(value = "0未过期1已过期,全部时不传", name = "expired" ) + @Transient + private Integer expired; + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java index 4f3cca2a9..aaff7dba7 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java @@ -8,7 +8,7 @@ import com.iformall.domain.vo.WxCouponSendVo; public interface WxCouponSendMapper extends CommonMapper { List findListVo(WxCouponSend wxCouponSend); - List findListVoFilterName(WxCouponSend wxCouponSend); + List findListVoByNameAndDate(WxCouponSend wxCouponSend); void updateStatusByCouponId(WxCouponSend wxCouponSend); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index dc2ee7115..b7ebfe6d0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -7,7 +7,6 @@ import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; -import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.msg.AppUniformMsg; import com.iformall.domain.po.msg.MpAppMsg; @@ -26,7 +25,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -71,7 +69,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { PageInfo pageInfo; //设置商户购买券数 if (Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), record.getSendType())) { - pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findListVoFilterName(record)); + pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findListVoByNameAndDate(record)); for (WxCouponSendVo cs : pageInfo.getList()) { JSONObject jo = JSONObject.parseObject(cs.getConditions()); int inventory = jo.getInteger(WxCouponSend.KEY_MERCHANT_LNVENTORY); diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 9749afc6f..ba52c30cb 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -98,14 +98,25 @@ - select tt.* from (select from wx_coupon_send cs left join wx_coupon c on c.id = cs.coupon_id ) as tt + where 1=1 - where tt.conditions like concat('%', #{merchantName},'%') + and tt.conditions like concat('%', #{merchantName},'%') + + + and + + + and now() ]]> + + + +