Przeglądaj źródła

//push

release_toaliyun_real
xhxu 3 lat temu
rodzic
commit
90ab097b39
3 zmienionych plików z 11 dodań i 4 usunięć
  1. +9
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java

+ 9
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxCardInfoController.java Wyświetl plik

@@ -79,18 +79,25 @@ public class WxCardInfoController extends BaseController {
if (null == password) { if (null == password) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "未查询到卡:"+cardIdStr); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "未查询到卡:"+cardIdStr);
} }
boolean isPassword = false;
if(StringUtils.isNotBlank(password.getPayPassword())){
isPassword = true;
}

cardInfo = wxCardInfoService.getByCouponPasswordId(couponPasswordId, password); cardInfo = wxCardInfoService.getByCouponPasswordId(couponPasswordId, password);
if (null != cardInfo) { if (null != cardInfo) {
map.put("cardId", cardInfo.getId()); map.put("cardId", cardInfo.getId());
map.put("amount", cardInfo.getAmount()); map.put("amount", cardInfo.getAmount());
map.put("remainAmount", cardInfo.getRemainingAmount()); map.put("remainAmount", cardInfo.getRemainingAmount());
map.put("cardType", cardInfo.getType());
map.put("cardType", cardInfo.getType());
map.put("isPassword",isPassword);
}else { }else {
//第一次刷卡的时候没有cardInfo //第一次刷卡的时候没有cardInfo
map.put("cardId", couponPasswordId); map.put("cardId", couponPasswordId);
map.put("amount", password.getPrice()); map.put("amount", password.getPrice());
map.put("remainAmount", password.getPrice()); map.put("remainAmount", password.getPrice());
map.put("cardType", EnumCardInfoType.CARD.getCode());
map.put("cardType", EnumCardInfoType.CARD.getCode());
map.put("isPassword",isPassword);
} }
} }
return new ResultData(map); return new ResultData(map);


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxCardPriceTemplate.java Wyświetl plik

@@ -14,7 +14,7 @@ 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


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java Wyświetl plik

@@ -304,7 +304,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService {
newOne.setCouponId(couponId); newOne.setCouponId(couponId);
newOne.setCouponShort(couponShortStr); newOne.setCouponShort(couponShortStr);
newOne.setPassword(pwList.get(i)); newOne.setPassword(pwList.get(i));
newOne.setPassword(AppUtils.getSortPwd());
newOne.setPayPassword(AppUtils.getSortPwd());
newOne.setStatus(EnumCouponPasswordStatus.INIT.getCode()); newOne.setStatus(EnumCouponPasswordStatus.INIT.getCode());
newOne.setCreateDate(curDate); newOne.setCreateDate(curDate);
newOne.setUpdateDate(curDate); newOne.setUpdateDate(curDate);


Ładowanie…
Anuluj
Zapisz