From 7db9f9258d5b3b13b4ea23c95ecd5775a0fa4866 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 15 May 2020 16:57:11 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=AF=86=E5=BB=B6=E6=9C=9F][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]:=E6=94=AF=E6=8C=81=E5=8D=A1=E5=AF=86?= =?UTF-8?q?=E5=BB=B6=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxCouponPasswordController.java | 28 ++++++++++++++++--- .../java/com/iformall/common/ErrorCode.java | 1 + .../mapper/WxCouponPasswordMapper.java | 2 ++ .../service/WxCouponPasswordService.java | 2 ++ .../impl/WxCouponPasswordServiceImpl.java | 5 ++++ .../mapper/WxCouponPasswordMapper.xml | 6 ++++ 6 files changed, 40 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java index 849c859e1..98fdf1c3e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java @@ -2,6 +2,7 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.base.BaseEntity; @@ -15,10 +16,7 @@ import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @author gongbiao @@ -59,5 +57,27 @@ public class WxCouponPasswordController extends BaseController { return new ResultData(page); } + @ApiOperation(value = "卡密延期", notes = "{\"couponId\":\"string\", \"expireDate\":\"string\"}") + @PostMapping("/postpone") + @SystemControllerLog(description = "卡密延期") + public ResultData postpone(@RequestBody WxCouponPassword wxCouponPassword) { + logger.debug("[" + getIpAddr() + "] WxCouponPasswordController::postpone"); + if (wxCouponPassword.getCouponId() == null) { + logger.error("couponId不能为空: "); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + WxCouponPassword couponPassword = new WxCouponPassword(); + couponPassword.updateTenantInfo(getTenantInfo()); + couponPassword.setCouponId(wxCouponPassword.getCouponId()); + couponPassword.setExpireDate(wxCouponPassword.getExpireDate()); + try { + wxCouponPasswordService.postpone(couponPassword); + } catch (Exception e) { + logger.error(e.getMessage()); + return new ResultData(ErrorCode.COUPON_PASSWORD_POSTPONE_ERR); + } + return new ResultData(); + } + } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 0e9ff5897..2f3cbcef0 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -237,6 +237,7 @@ public enum ErrorCode{ COUPON_PASSWORD_NOT_FOUND(9501, "兑换码未找到"), COUPON_PASSWORD_HAD_USED(9502, "兑换码已使用"), COUPON_PASSWORD_IS_CANCELED(9503, "兑换码已作废"), + COUPON_PASSWORD_POSTPONE_ERR(9504, "卡密延期异常"), /** * 微信 diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java index 8088ecaa4..973bc37d6 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java @@ -21,4 +21,6 @@ public interface WxCouponPasswordMapper extends CommonMapper tempList); + void updatePostpone(WxCouponPassword wxCouponPassword); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java index 5f8006d66..6e99efbb3 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java @@ -70,4 +70,6 @@ public interface WxCouponPasswordService { PageInfo findCouponList(WxCouponPassword wxCouponPassword, Integer pageNum, Integer pageSize); List findList(WxCouponPassword wxCouponPassword); + + void postpone(WxCouponPassword wxCouponPassword); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java index 6c02b00b0..44aeebedb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -167,6 +167,11 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { return wxCouponPasswordMapper.findList(wxCouponPassword); } + @Override + public void postpone(WxCouponPassword wxCouponPassword) { + + } + /* public static void main(String[] args) { WxCouponPasswordServiceImpl ll = new WxCouponPasswordServiceImpl(); diff --git a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml index 6468f0672..390c35f9d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml @@ -159,4 +159,10 @@ + + update wx_coupon_password + set expire_date=#{expireDate} + where tenant_id=#{tenantId} and coupon_id=#{couponId} and status=1 + +