From 41221866dd2734081c6a79760f4de2f9acce24fd Mon Sep 17 00:00:00 2001 From: Burce Date: Tue, 27 Aug 2019 12:45:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=8A=95=E6=94=BE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponSendConfigController.java | 8 +++++++- .../main/java/com/iformall/domain/po/WxCouponSend.java | 1 + .../service/impl/WxCouponSendConfigServiceImpl.java | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java index 001d88799..fd0b16605 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java @@ -7,6 +7,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponSendConfig; import com.iformall.enums.EnumCouponSendSendType; +import com.iformall.enums.EnumValidStatus; import com.iformall.service.WxCouponSendConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -38,8 +39,13 @@ public class WxCouponSendConfigController extends BaseController { PageInfo page = wxCouponSendConfigService.listAsPage(wxCouponSendConfig, 1, 1); if (page.getSize() > 0) { return new ResultData(page.getList().get(0)); + } else { + //配置不存在,添加默认配置(停用) + wxCouponSendConfig.setRemark(EnumCouponSendSendType.getEnum(wxCouponSendConfig.getSendType()).getMessage() + "开关"); + wxCouponSendConfig.setValue(1); + wxCouponSendConfigService.saveOrUpdate(wxCouponSendConfig); + return new ResultData(wxCouponSendConfig); } - return new ResultData(); } 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 90654a8f3..a05388604 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSend.java @@ -41,6 +41,7 @@ public class WxCouponSend extends BaseEntity { /** * 商户购券数 */ + @Transient protected Integer merchantLnventory; /**发卷所属商户名**/ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendConfigServiceImpl.java index ba434c8c1..0df169311 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendConfigServiceImpl.java @@ -11,6 +11,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; + @Service public class WxCouponSendConfigServiceImpl implements WxCouponSendConfigService { @@ -36,8 +38,10 @@ public class WxCouponSendConfigServiceImpl implements WxCouponSendConfigService //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); + record.setCreateTime(new Date()); wxCouponSendConfigMapper.insertSelective(record); } else { + record.setUpdateTime(new Date()); wxCouponSendConfigMapper.updateByPrimaryKeySelective(record); } }