diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java index 4df560f7c..0bc03401b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -127,6 +127,8 @@ public class WxCouponPasswordController extends BaseController { } if (cardInfo.getOwnerUserId().equals(Constant.defaultCUserId)) { isDefaultUser = true; + }else { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "当前卡已经绑定激活,不能进行此操作"); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java index f4c7bb282..28accfcaa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java @@ -14,11 +14,11 @@ public class WxCardPriceTemplate implements Serializable { private static final long serialVersionUID = -2321650008236516884L; @NotNull - @Excel(name="卡ID",width = 20,orderNum = "1") + @Excel(name="*卡ID",width = 20,orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="ID",name="couponPasswordId") private String couponPasswordId; @NotNull - @Excel(name="面额(元)",width = 20,orderNum = "2") + @Excel(name="*面额(元)",width = 20,orderNum = "2") @io.swagger.annotations.ApiModelProperty(value="面额(元)",name="price") private String price; } 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 f224a7c0f..2885a6826 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -330,10 +330,20 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { List list = new ArrayList<>(); WxCardPriceTemplate u1 = new WxCardPriceTemplate(); - u1.setCouponPasswordId("输入卡号ID"); - u1.setPrice("输入面额"); + u1.setCouponPasswordId("336482251798482944"); + u1.setPrice("500"); + + WxCardPriceTemplate u2 = new WxCardPriceTemplate(); + u2.setCouponPasswordId("336482251802677248"); + u2.setPrice("500.5"); + + WxCardPriceTemplate u3 = new WxCardPriceTemplate(); + u3.setCouponPasswordId("336482251802677249"); + u3.setPrice("500.53"); list.add(u1); + list.add(u2); + list.add(u3); excelService.exportExcel(list, null, "卡设置面额模板", WxCardPriceTemplate.class, "卡设置面额模板.xlsx", response, true); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index dff4f6140..6720f4140 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1503,16 +1503,17 @@ public class WxOrderServiceImpl implements WxOrderService { cardInfo.updateTenantInfo(order); cardInfo.setCouponId(order.getProductId()); cardInfo.setAmount(coupon.getPrice()); + cardInfo.setRemainingAmount(coupon.getPrice()); cardInfo.setSaleAmount(coupon.getSalePrice()); if (null != couponPassWord) { cardInfo.setCouponPasswordId(couponPassWord.getId()); cardInfo.setCouponPassword(couponPassWord.getPassword()); //后置卡券可能没有面额 cardInfo.setAmount(couponPassWord.getPrice()); + cardInfo.setRemainingAmount(couponPassWord.getPrice()); } cardInfo.setCUserId(user.getId()); cardInfo.setOwnerUserId(user.getId()); - cardInfo.setRemainingAmount(coupon.getPrice()); if (!coupon.checkIsFree()) { //判断该transctionId是否已经存在,如果存在,则不添加 WxCardInfo cardInfoq = new WxCardInfo();