| @@ -127,6 +127,8 @@ public class WxCouponPasswordController extends BaseController { | |||||
| } | } | ||||
| if (cardInfo.getOwnerUserId().equals(Constant.defaultCUserId)) { | if (cardInfo.getOwnerUserId().equals(Constant.defaultCUserId)) { | ||||
| isDefaultUser = true; | isDefaultUser = true; | ||||
| }else { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "当前卡已经绑定激活,不能进行此操作"); | |||||
| } | } | ||||
| } | } | ||||
| @@ -14,11 +14,11 @@ public class WxCardPriceTemplate implements Serializable { | |||||
| private static final long serialVersionUID = -2321650008236516884L; | private static final long serialVersionUID = -2321650008236516884L; | ||||
| @NotNull | @NotNull | ||||
| @Excel(name="卡ID",width = 20,orderNum = "1") | |||||
| @Excel(name="*卡ID",width = 20,orderNum = "1") | |||||
| @io.swagger.annotations.ApiModelProperty(value="ID",name="couponPasswordId") | @io.swagger.annotations.ApiModelProperty(value="ID",name="couponPasswordId") | ||||
| private String couponPasswordId; | private String couponPasswordId; | ||||
| @NotNull | @NotNull | ||||
| @Excel(name="面额(元)",width = 20,orderNum = "2") | |||||
| @Excel(name="*面额(元)",width = 20,orderNum = "2") | |||||
| @io.swagger.annotations.ApiModelProperty(value="面额(元)",name="price") | @io.swagger.annotations.ApiModelProperty(value="面额(元)",name="price") | ||||
| private String price; | private String price; | ||||
| } | } | ||||
| @@ -330,10 +330,20 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { | |||||
| public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { | public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { | ||||
| List<WxCardPriceTemplate> list = new ArrayList<>(); | List<WxCardPriceTemplate> list = new ArrayList<>(); | ||||
| WxCardPriceTemplate u1 = new WxCardPriceTemplate(); | 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(u1); | ||||
| list.add(u2); | |||||
| list.add(u3); | |||||
| excelService.exportExcel(list, null, "卡设置面额模板", WxCardPriceTemplate.class, "卡设置面额模板.xlsx", response, true); | excelService.exportExcel(list, null, "卡设置面额模板", WxCardPriceTemplate.class, "卡设置面额模板.xlsx", response, true); | ||||
| } | } | ||||
| @@ -1503,16 +1503,17 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| cardInfo.updateTenantInfo(order); | cardInfo.updateTenantInfo(order); | ||||
| cardInfo.setCouponId(order.getProductId()); | cardInfo.setCouponId(order.getProductId()); | ||||
| cardInfo.setAmount(coupon.getPrice()); | cardInfo.setAmount(coupon.getPrice()); | ||||
| cardInfo.setRemainingAmount(coupon.getPrice()); | |||||
| cardInfo.setSaleAmount(coupon.getSalePrice()); | cardInfo.setSaleAmount(coupon.getSalePrice()); | ||||
| if (null != couponPassWord) { | if (null != couponPassWord) { | ||||
| cardInfo.setCouponPasswordId(couponPassWord.getId()); | cardInfo.setCouponPasswordId(couponPassWord.getId()); | ||||
| cardInfo.setCouponPassword(couponPassWord.getPassword()); | cardInfo.setCouponPassword(couponPassWord.getPassword()); | ||||
| //后置卡券可能没有面额 | //后置卡券可能没有面额 | ||||
| cardInfo.setAmount(couponPassWord.getPrice()); | cardInfo.setAmount(couponPassWord.getPrice()); | ||||
| cardInfo.setRemainingAmount(couponPassWord.getPrice()); | |||||
| } | } | ||||
| cardInfo.setCUserId(user.getId()); | cardInfo.setCUserId(user.getId()); | ||||
| cardInfo.setOwnerUserId(user.getId()); | cardInfo.setOwnerUserId(user.getId()); | ||||
| cardInfo.setRemainingAmount(coupon.getPrice()); | |||||
| if (!coupon.checkIsFree()) { | if (!coupon.checkIsFree()) { | ||||
| //判断该transctionId是否已经存在,如果存在,则不添加 | //判断该transctionId是否已经存在,如果存在,则不添加 | ||||
| WxCardInfo cardInfoq = new WxCardInfo(); | WxCardInfo cardInfoq = new WxCardInfo(); | ||||