Sfoglia il codice sorgente

[卡券保存出错][修改]

release_toaliyun_real
Stormeye Wu 7 anni fa
parent
commit
897ecba40b
2 ha cambiato i file con 23 aggiunte e 12 eliminazioni
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  2. +19
    -12
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java

+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java Vedi File

@@ -92,6 +92,10 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
logger.error("card's coupon not found: " + cardInfo.getCouponId());
return new ResultData(ErrorCode.CARD_IS_NOT_FOUND);
}
if (coupon.getSubsidyNum() == null) {
logger.error("card's coupon not found: " + cardInfo.getCouponId());
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "券补贴额未填写");
}

// 3. get pay account
WxPayAccount payAccount = null;


+ 19
- 12
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Vedi File

@@ -101,20 +101,27 @@ public class WxCouponServiceImpl implements WxCouponService {
record.setValidDays(null);
}
}
if(record.getSubsidyType().equals(EnumCouponSubsidyType.WECHAT_COUPON.getCode())) {
// 微信 立减
if(record.getSubsidyNum() > record.getSalePrice()) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "补贴额大于售价");
if(record.getType().equals(EnumCouponType.COUPON_MULTIMCH.getCode()) ||
record.getType().equals(EnumCouponType.CARD_MULTIMCH.getCode())) {
Integer subsidyType = record.getSubsidyType();
if(subsidyType == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "请填写补贴类型");
}
} else if(record.getSubsidyType().equals(EnumCouponSubsidyType.OFFLINE_SUBSIDY.getCode())) {
// 线下补贴
int subsidy_num = record.getPrice() - record.getSalePrice();
if(record.getSubsidyNum() > subsidy_num) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "补贴额大于面额与售价的差值");
}
} else if(record.getSubsidyType().equals(EnumCouponSubsidyType.WECHAT_MCHPAY.getCode())) {
// TODO 微信转账到银行卡
if(subsidyType.equals(EnumCouponSubsidyType.WECHAT_COUPON.getCode())) {
// 微信 立减
if(record.getSubsidyNum() > record.getSalePrice()) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "补贴额大于售价");
}
} else if(subsidyType.equals(EnumCouponSubsidyType.OFFLINE_SUBSIDY.getCode())) {
// 线下补贴
int subsidy_num = record.getPrice() - record.getSalePrice();
if(record.getSubsidyNum() > subsidy_num) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "补贴额大于面额与售价的差值");
}
} else if(subsidyType.equals(EnumCouponSubsidyType.WECHAT_MCHPAY.getCode())) {
// TODO 微信转账到银行卡

}
}

final IdWorker idWorker = IdWorker.get();


Caricamento…
Annulla
Salva