From 847c999af68d8e47a877684fd652db262e26e818 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 19 Dec 2018 18:58:36 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E6=9B=B4=E6=94=B9]:=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E5=8F=91=E5=88=B8=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponSendConfigController.java | 10 ++++++---- .../com/iformall/domain/po/WxCouponSendConfig.java | 2 +- .../com/iformall/mapper/WxCouponSendConfigMapper.java | 2 +- .../service/impl/WxCouponSendConfigServiceImpl.java | 8 ++++---- .../main/resources/mapper/WxCouponSendConfigMapper.xml | 8 ++------ 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendConfigController.java index 7826234f2..8ecc0825b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendConfigController.java @@ -24,10 +24,10 @@ public class WxCouponSendConfigController extends BaseController { private WxCouponSendConfigService wxCouponSendConfigService; @ApiOperation("获取开关") - @GetMapping("getCouponSendConfig") - public ResultData getCouponSendConfig(@RequestAttribute WxCouponSendConfig wxCouponSendConfig) { + @GetMapping("get") + public ResultData getCouponSendConfig(@ModelAttribute WxCouponSendConfig wxCouponSendConfig) { logger.debug("[" + getIpAddr() + "] WxMallConfigController::getCouponSendConfig"); - if (wxCouponSendConfig == null || wxCouponSendConfig.getSendType() != null) + if (wxCouponSendConfig == null || wxCouponSendConfig.getSendType() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); wxCouponSendConfig.setTenantId(getTenantId()); @@ -39,12 +39,14 @@ public class WxCouponSendConfigController extends BaseController { } - @PostMapping("updateCouponSendConfig") + @PostMapping("update") @ApiOperation("修改开关") public ResultData updateCouponSendConfig(@RequestBody WxCouponSendConfig wxCouponSendConfig) { logger.debug("[" + getIpAddr() + "] WxMallConfigController::updateStopCarConpon"); if (wxCouponSendConfig == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + if (wxCouponSendConfig.getId() == null) + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); if (wxCouponSendConfig.getSendType() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); if (wxCouponSendConfig.getValue() == null) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java index ebd56c7d8..d7c8a5a21 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponSendConfig.java @@ -7,7 +7,7 @@ import java.util.List; import javax.persistence.Id; import java.io.Serializable; -@Table(name = "wx_mall_config") +@Table(name = "wx_coupon_send_config") public class WxCouponSendConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendConfigMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendConfigMapper.java index 157799c2e..e930091a7 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendConfigMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendConfigMapper.java @@ -6,7 +6,7 @@ import com.iformall.domain.po.WxCouponSendConfig; public interface WxCouponSendConfigMapper extends CommonMapper { - List findList(WxCouponSendConfig wxMallConfig); + List findList(WxCouponSendConfig wxCouponSendConfig); 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 018c9a67b..f83ab824c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendConfigServiceImpl.java @@ -9,25 +9,25 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; + @Service public class WxCouponSendConfigServiceImpl implements WxCouponSendConfigService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - WxCouponSendConfigMapper wxMallConfigMapper; + WxCouponSendConfigMapper wxCouponSendConfigMapper; @Override public PageInfo listAsPage(WxCouponSendConfig record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMallConfigMapper.findList(record)); + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponSendConfigMapper.findList(record)); } @Override public void update(WxCouponSendConfig record) { - wxMallConfigMapper.updateByPrimaryKeySelective(record); + wxCouponSendConfigMapper.updateByPrimaryKeySelective(record); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendConfigMapper.xml index e02458e72..960e88421 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendConfigMapper.xml @@ -28,7 +28,7 @@ - + and `send_type` = #{sendType} @@ -65,10 +65,6 @@ select from wx_coupon_send_config - - - - - +