diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index ac5f99909..9e38c917d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -284,6 +284,9 @@ public class WxCardPayController extends BaseController { if(cardInfo.getAmount() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "充值金额为空"); } + if(cardInfo.getAmount() <= 0){ + return new ResultData(ErrorCode.CARD_IS_NOT_RECHARGE.getCode(), "充值金额需大于0"); + } if(Constant.UNDEFINED.equals(cardInfo.getTransactionId())){ cardInfo.setTransactionId(null); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java index f9c65ad85..c37fac2e4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java @@ -485,7 +485,7 @@ public class WxCardInfoServiceImpl implements WxCardInfoService { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - record.setOwnerId(cardInfo.getOwnerUserId()); + record.setOwnerId(wxCardInfo.getOwnerUserId()); record.setMerchantId(0l);//充值订单无商户 record.setPayFrom(EnumCardSpendFrom.recharge.getCode()); record.setDeductionAmount(cardInfo.getAmount());