Browse Source

商户注券->查找有效、无效、过期、未过期

release_toaliyun_real
Burce 6 years ago
parent
commit
06fe77e4b0
3 changed files with 7 additions and 4 deletions
  1. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java
  2. +5
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml

+ 1
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java View File

@@ -57,7 +57,7 @@ public class WxCouponSendController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxCouponSendController::list");
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();
@@ -65,7 +65,6 @@ public class WxCouponSendController extends BaseController {
// wxCouponSend.setStatus(null);
// }
// }
wxCouponSend.setStatus(valid);
PageInfo<WxCouponSendVo> page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize);
return new ResultData(page);
}


+ 5
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java View File

@@ -72,7 +72,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
* 前端排序:时间、商户总库存、商户已发数、商户剩余
*/
if (Objects.equals(EnumCouponSendSendType.MERCHANT.getCode(), record.getSendType())) {
String sortStr = null;
String sortStr = null;
if (Objects.equals(record.getSortColumn(), WxCouponSend.SORT_MERCHANT_LNVENTORY) ||
Objects.equals(record.getSortColumn(), WxCouponSend.SORT_MERCHANT_SEND) ||
Objects.equals(record.getSortColumn(), WxCouponSend.SORT_REMAIN)) {
@@ -94,6 +94,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
cs.setExpired(expired);
}
} else {
record.setStatus(EnumCouponSendStatus.VALID.getCode());
record.setSortColumns(BaseEntity.SortField.CreateDate_DESC);
pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendMapper.findListVo(record));
for (WxCouponSendVo cs:pageInfo.getList())
@@ -181,6 +182,9 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class})
public void updateInvalid(WxCouponSend record) {
if (Objects.equals(record.getStatus(), EnumCouponSendStatus.INVALID.getCode())) {
return;
}
record.setStatus(EnumCouponSendStatus.INVALID.getCode());
record.setUpdateDate(new Date());
if (Objects.equals(record.getSendType(), EnumCouponSendSendType.MERCHANT.getCode())) {


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml View File

@@ -113,7 +113,7 @@
<include refid="allColumns"/>
from wx_coupon_send cs left join wx_coupon c on c.id = cs.coupon_id
<include refid="dynamicWhereConditions"/>) as tt
where tt.status = 0
where 1=1
and ((tt.valid_type=1
<choose>
<when test="expired == 0">


Loading…
Cancel
Save