From 807be8f1110bf45471cbe93f020e5d320a1c8199 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 3 Mar 2023 18:20:12 +0800 Subject: [PATCH] fix card --- .../market/WxCouponPasswordController.java | 24 +++++++++++++++++++ .../db/migration/V2023030300001__card.sql | 10 ++++++++ .../controller/WxCardPayController.java | 11 +++------ .../WxCouponPasswordController.java | 3 +++ .../iformall/domain/po/WxCouponPassword.java | 2 ++ .../domain/vo/WxCouponPasswordVo.java | 3 +++ .../mapper/WxCouponPasswordMapper.java | 2 ++ .../service/WxCouponPasswordService.java | 2 ++ .../service/impl/WxCardInfoServiceImpl.java | 4 ++-- .../impl/WxCouponPasswordServiceImpl.java | 6 +++++ .../service/impl/WxCouponServiceImpl.java | 2 ++ .../mapper/WxCouponPasswordMapper.xml | 8 ++++++- 12 files changed, 66 insertions(+), 11 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023030300001__card.sql 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 c2755fb01..05404462d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java @@ -2,14 +2,19 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; +import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponPassword; import com.iformall.domain.vo.WxCouponPasswordCountInfoVO; import com.iformall.domain.vo.WxCouponPasswordVo; import com.iformall.enums.EnumCouponPasswordStatus; +import com.iformall.enums.EnumCouponSubsidyType; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxCouponPasswordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -112,6 +117,25 @@ public class WxCouponPasswordController extends BaseController { } return new ResultData(); } + + @TenantIgnore + @ApiOperation("后置设置金额") + @PostMapping("setPrice") + public ResultData setPrice(@RequestBody WxCouponPassword wxCouponPassword) { + wxCouponPassword.updateTenantInfo(getTenantInfo()); + WxCouponPassword couponPassword = wxCouponPasswordService.getById(wxCouponPassword.getId()); + if (null == couponPassword ) { + return new ResultData(ResultData.ERROR, "卡密未查询到。"+wxCouponPassword.getId()); + } + if (couponPassword.getIsStop().intValue() == EnumYesOrNo.YES.getCode().intValue() ) { + return new ResultData(ResultData.ERROR, "已停用,不能设置。"); + } + if (couponPassword.getPrice() > 0 ) { + return new ResultData(ResultData.ERROR, "已设置面额,不能再次设置面额。"); + } + wxCouponPasswordService.setPrice(couponPassword); + return new ResultData(); + } } diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023030300001__card.sql b/mallinkAdmin/src/main/resources/db/migration/V2023030300001__card.sql new file mode 100644 index 000000000..0a2966558 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023030300001__card.sql @@ -0,0 +1,10 @@ +alter table wx_coupon_password add column price int(11) not null default 0 comment '面额'; + +update wx_coupon_password cp , wx_coupon_89 c on cp.coupon_id = c.id set cp.price = c.price where cp.price = 0 and c.price > 0 ; + + + + + + + diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 667d66164..8df42349b 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -90,10 +90,6 @@ public class WxCardPayController extends BaseController { WxMerchantBUser user = getLoginBUser(); wxCardSpendVo.updateTenantInfo(user); wxCardSpendVo.setMerchantId(user.getMerchantId()); -// List sources = new ArrayList(); -// sources.add(EnumMerchantSubsidySource.CARD.getCode()); -// wxCardSpendVo.setSources(sources); -// wxCardSpendVo.setCardSpendListShow(1); wxCardSpendVo.setSortColumns(BaseEntity.SortField.CreateDate_DESC); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); @@ -108,10 +104,6 @@ public class WxCardPayController extends BaseController { WxMerchantBUser user = getLoginBUser(); wxCardSpend.updateTenantInfo(user); wxCardSpend.setMerchantId(user.getMerchantId()); -// List sources = new ArrayList(); -// sources.add(EnumMerchantSubsidySource.CARD.getCode()); -// wxCardSpend.setSources(sources); -// wxCardSpend.setCardSpendListShow(1); final Map mapList = wxCardSpendService.sumCardSpend(wxCardSpend); return new ResultData(mapList); } @@ -194,6 +186,9 @@ public class WxCardPayController extends BaseController { if (EnumYesOrNo.YES.getCode().intValue() == couponPassword.getIsStop().intValue()) { return new ResultData(ErrorCode.CARD_IS_NOT_FOUND.getCode(),"卡已被禁用."); } + if (couponPassword.getPrice().intValue() <= 0 ) { + return new ResultData(ErrorCode.CARD_IS_NOT_FOUND.getCode(),"卡密面额未设置."); + } WxCoupon coupon = wxCouponService.getById(couponPassword.getCouponId(),couponPassword.getTenantId()); if (coupon == null) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java index 2c5197bf1..0acc09f36 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -80,6 +80,9 @@ public class WxCouponPasswordController extends BaseController { if (couponPassword.getIsStop().intValue() == EnumYesOrNo.YES.getCode().intValue()) { return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"卡密已经停用"); } + if (couponPassword.getPrice() <= 0) { + return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF.getCode(),"卡密面值未设置,请联系管理员."); + } WxCUserBasicInfo member = userService.getById(memberId,getFinalTenantId()); if(member == null) { throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "会员用户未找到" + memberId); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java index 9ec4d5432..d861d82a6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java @@ -20,6 +20,8 @@ public class WxCouponPassword extends TenantEntity { protected Long id; @TableField(exist = false) private String idLike; + @io.swagger.annotations.ApiModelProperty(value="面额",name="price") + private Integer price; @io.swagger.annotations.ApiModelProperty(value="卡券ID",name="couponId") private Long couponId; @io.swagger.annotations.ApiModelProperty(value="卡券短ID",name="couponShort") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java index 9623eab0e..bed469f21 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java @@ -28,6 +28,9 @@ public class WxCouponPasswordVo extends TenantEntity { @Excel(name = "卡密", width = 20, orderNum = "2", prefix = "`") @io.swagger.annotations.ApiModelProperty(value = "卡密", name = "couponPassword") private String couponPassword; + @Excel(name = "卡密面额", width = 20, orderNum = "2", prefix = "`") + @io.swagger.annotations.ApiModelProperty(value = "卡密面额", name = "couponPasswordPrice") + private Integer couponPasswordPrice; @Excel(name = "创建时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "3") @io.swagger.annotations.ApiModelProperty(value = "", name = "createDate") private Date createDate; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java index db4b0f8ea..90f3c29bc 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java @@ -29,5 +29,7 @@ public interface WxCouponPasswordMapper extends CommonMapper + @@ -19,7 +20,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_short`,`password`,`status`,`sended_phone`,`card_id`,`create_date`,`update_date`,`expire_date`,`present_id`,`is_stop` + `id`,`tenant_id`,`parent_tenant_id`,`price`,`coupon_id`,`coupon_short`,`password`,`status`,`sended_phone`,`card_id`,`create_date`,`update_date`,`expire_date`,`present_id`,`is_stop` @@ -213,5 +214,10 @@ update wx_coupon_password set is_stop = #{isStop} , update_date = now() where id = #{id} and tenant_id = #{tenantId} + + + update wx_coupon_password set price = #{price} , update_date = now() + where coupon_id = #{couponId} and tenant_id = #{tenantId} and price = 0 +