From 2e481dbdc379ceec5372fe26d7dc3bfb5e9e9347 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 22 Jun 2022 14:35:21 +0800 Subject: [PATCH] //tt status --- .../iformall/controller/market/WxCouponController.java | 8 ++++---- .../src/main/resources/mapper/OrderSnapshotMapper.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 3670b4001..b6741f5f2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -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()); diff --git a/mallinkService/src/main/resources/mapper/OrderSnapshotMapper.xml b/mallinkService/src/main/resources/mapper/OrderSnapshotMapper.xml index 05680722c..89fe83c0c 100644 --- a/mallinkService/src/main/resources/mapper/OrderSnapshotMapper.xml +++ b/mallinkService/src/main/resources/mapper/OrderSnapshotMapper.xml @@ -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