Browse Source

//card

release_toaliyun_real
xhxu 3 years ago
parent
commit
6e0235e688
2 changed files with 4 additions and 1 deletions
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java

+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java View File

@@ -284,6 +284,9 @@ public class WxCardPayController extends BaseController {
if(cardInfo.getAmount() == null){ if(cardInfo.getAmount() == null){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "充值金额为空"); 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())){ if(Constant.UNDEFINED.equals(cardInfo.getTransactionId())){
cardInfo.setTransactionId(null); cardInfo.setTransactionId(null);
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java View File

@@ -485,7 +485,7 @@ public class WxCardInfoServiceImpl implements WxCardInfoService {


final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId()); record.setId(idWorker.nextId());
record.setOwnerId(cardInfo.getOwnerUserId());
record.setOwnerId(wxCardInfo.getOwnerUserId());
record.setMerchantId(0l);//充值订单无商户 record.setMerchantId(0l);//充值订单无商户
record.setPayFrom(EnumCardSpendFrom.recharge.getCode()); record.setPayFrom(EnumCardSpendFrom.recharge.getCode());
record.setDeductionAmount(cardInfo.getAmount()); record.setDeductionAmount(cardInfo.getAmount());


Loading…
Cancel
Save