xhxu 3 лет назад
Родитель
Сommit
67221a3d87
5 измененных файлов: 9 добавлений и 2 удалений
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java
  3. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 3
- 0
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();
}


+ 2
- 0
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;


+ 2
- 1
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());


+ 1
- 0
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());


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Просмотреть файл

@@ -485,7 +485,7 @@
select
<include refid="allColumns"/>
from wx_coupon c
<include refid="dynamicWhereConditions"/>
<include refid="dynamicWhereConditions"/>
</select>

<update id="updateStockAndValidDate" parameterType="com.iformall.domain.po.WxCoupon">


Загрузка…
Отмена
Сохранить