| @@ -37,6 +37,9 @@ public class WxCardVo extends WxCardInfo { | |||||
| @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") | @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") | ||||
| private String remark; | private String remark; | ||||
| @io.swagger.annotations.ApiModelProperty(value="是否可以充值",name="isRecharge") | |||||
| private Integer isRecharge; | |||||
| public String getPriceStr() { | public String getPriceStr() { | ||||
| return new BigDecimal(price == null ? 0 : price).divide(new BigDecimal(100)).toPlainString(); | return new BigDecimal(price == null ? 0 : price).divide(new BigDecimal(100)).toPlainString(); | ||||
| } | } | ||||
| @@ -27,6 +27,8 @@ public class WxCouponPasswordVo extends TenantEntity { | |||||
| protected Long id; | protected Long id; | ||||
| @Excel(name = "卡名称", width = 20, orderNum = "2", prefix = "") | @Excel(name = "卡名称", width = 20, orderNum = "2", prefix = "") | ||||
| protected String couponTitile; | protected String couponTitile; | ||||
| @io.swagger.annotations.ApiModelProperty(value="是否可以充值",name="isRecharge") | |||||
| private Integer isRecharge; | |||||
| @Excel(name = "卡密", width = 20, orderNum = "3", prefix = "") | @Excel(name = "卡密", width = 20, orderNum = "3", prefix = "") | ||||
| @io.swagger.annotations.ApiModelProperty(value = "卡密", name = "couponPassword") | @io.swagger.annotations.ApiModelProperty(value = "卡密", name = "couponPassword") | ||||
| private String couponPassword; | private String couponPassword; | ||||
| @@ -188,7 +188,8 @@ public class WxCardInfoServiceImpl implements WxCardInfoService { | |||||
| co.setSalePrice(coupon.getSalePrice()); | co.setSalePrice(coupon.getSalePrice()); | ||||
| co.setPrice(coupon.getPrice()); | co.setPrice(coupon.getPrice()); | ||||
| co.setSubsidyType(coupon.getSubsidyType()); | co.setSubsidyType(coupon.getSubsidyType()); | ||||
| co.setSubsidyNum(coupon.getSubsidyNum()); | |||||
| co.setSubsidyNum(coupon.getSubsidyNum()); | |||||
| co.setIsRecharge(coupon.getIsRecharge()); | |||||
| } | } | ||||
| //couponOrder | //couponOrder | ||||
| WxCouponOrder couponOrder = couponOrderMap.get(coo.getId()); | WxCouponOrder couponOrder = couponOrderMap.get(coo.getId()); | ||||
| @@ -161,6 +161,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { | |||||
| WxCoupon coupon = couponMap.get(coo.getCouponId()); | WxCoupon coupon = couponMap.get(coo.getCouponId()); | ||||
| if (null != coupon) { | if (null != coupon) { | ||||
| co.setCouponTitile(coupon.getTitle()); | co.setCouponTitile(coupon.getTitle()); | ||||
| co.setIsRecharge(coupon.getIsRecharge()); | |||||
| } | } | ||||
| } | } | ||||
| co.setCouponPassword(coo.getPassword()); | co.setCouponPassword(coo.getPassword()); | ||||
| @@ -485,7 +485,7 @@ | |||||
| select | select | ||||
| <include refid="allColumns"/> | <include refid="allColumns"/> | ||||
| from wx_coupon c | from wx_coupon c | ||||
| <include refid="dynamicWhereConditions"/> | |||||
| <include refid="dynamicWhereConditions"/> | |||||
| </select> | </select> | ||||
| <update id="updateStockAndValidDate" parameterType="com.iformall.domain.po.WxCoupon"> | <update id="updateStockAndValidDate" parameterType="com.iformall.domain.po.WxCoupon"> | ||||