From 67221a3d874ebf721445fe10f7ad011ea589b029 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 22 Mar 2023 14:00:18 +0800 Subject: [PATCH] //card --- .../src/main/java/com/iformall/domain/vo/WxCardVo.java | 3 +++ .../main/java/com/iformall/domain/vo/WxCouponPasswordVo.java | 2 ++ .../java/com/iformall/service/impl/WxCardInfoServiceImpl.java | 3 ++- .../com/iformall/service/impl/WxCouponPasswordServiceImpl.java | 1 + mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java index f6d57c660..b01dd022a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java @@ -37,6 +37,9 @@ public class WxCardVo extends WxCardInfo { @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") private String remark; + @io.swagger.annotations.ApiModelProperty(value="是否可以充值",name="isRecharge") + private Integer isRecharge; + public String getPriceStr() { return new BigDecimal(price == null ? 0 : price).divide(new BigDecimal(100)).toPlainString(); } 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 c9a45a477..b768578ab 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java @@ -27,6 +27,8 @@ public class WxCouponPasswordVo extends TenantEntity { protected Long id; @Excel(name = "卡名称", width = 20, orderNum = "2", prefix = "") protected String couponTitile; + @io.swagger.annotations.ApiModelProperty(value="是否可以充值",name="isRecharge") + private Integer isRecharge; @Excel(name = "卡密", width = 20, orderNum = "3", prefix = "") @io.swagger.annotations.ApiModelProperty(value = "卡密", name = "couponPassword") private String couponPassword; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java index 7d5e618ac..39c624e6a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java @@ -188,7 +188,8 @@ public class WxCardInfoServiceImpl implements WxCardInfoService { co.setSalePrice(coupon.getSalePrice()); co.setPrice(coupon.getPrice()); co.setSubsidyType(coupon.getSubsidyType()); - co.setSubsidyNum(coupon.getSubsidyNum()); + co.setSubsidyNum(coupon.getSubsidyNum()); + co.setIsRecharge(coupon.getIsRecharge()); } //couponOrder WxCouponOrder couponOrder = couponOrderMap.get(coo.getId()); 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 40468a067..990cad516 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -161,6 +161,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { WxCoupon coupon = couponMap.get(coo.getCouponId()); if (null != coupon) { co.setCouponTitile(coupon.getTitle()); + co.setIsRecharge(coupon.getIsRecharge()); } } co.setCouponPassword(coo.getPassword()); diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index efed0b8eb..8ea2bbcc2 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -485,7 +485,7 @@ select from wx_coupon c - +