Browse Source

//tt status

release_toaliyun_real
xhxu 3 years ago
parent
commit
2e481dbdc3
2 changed files with 5 additions and 5 deletions
  1. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/OrderSnapshotMapper.xml

+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java View File

@@ -198,10 +198,10 @@ public class WxCouponController extends BaseController {
if (CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))) {
return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。");
}
query.setStatus(EnumCouponChannelStatus.STATUS_BEFORE.getCode());
if (CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))) {
return new ResultData(ResultData.ERROR, "有活动正在预审核.");
}
// query.setStatus(EnumCouponChannelStatus.STATUS_BEFORE.getCode());
// if (CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))) {
// return new ResultData(ResultData.ERROR, "有活动正在预审核.");
// }
}
WxCoupon coupon = wxCouponService.getById(wxCoupon.getId(),wxCoupon.getTenantId());


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

@@ -66,7 +66,7 @@
`remark`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`,
`press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`,
`conditions`,content_type,source_type,password_support,gift_list,merchant_list,
,product_type,category_id,product_attrs,sku_attrs
product_type,category_id,product_attrs,sku_attrs
</sql>

<sql id="dynamicWhereConditions">


Loading…
Cancel
Save