Sfoglia il codice sorgente

[储值卡][修改]:储值卡支付填写cUserId

release_toaliyun_real
Stormeye Wu 7 anni fa
parent
commit
52ab2b88cf
3 ha cambiato i file con 11 aggiunte e 8 eliminazioni
  1. +6
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/service/WxOrderService.java
  3. +2
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 6
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java Vedi File

@@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.domain.vo.WxCardSpendVo;
import com.iformall.enums.EnumMerchantStatus;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.*; import com.iformall.service.*;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -106,10 +107,14 @@ public class WxCardPayController extends BaseController {
WxCUser user = getUser(); WxCUser user = getUser();


WxMerchant merchant = wxMerchantService.getById(merchantId); WxMerchant merchant = wxMerchantService.getById(merchantId);
if (merchant.getStatus() == EnumMerchantStatus.NOT_VALID.getCode()) {
logger.error("商户已禁用, merchantId: " + merchant.getId());
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID);
}


WxOrder order = null; WxOrder order = null;
try { try {
order = wxOrderService.saveCardPayOrder(merchant, totalFeeStr, payment);
order = wxOrderService.saveCardPayOrder(merchant, user, totalFeeStr, payment);
} catch (MallinkException e) { } catch (MallinkException e) {
logger.error("saveCardPayOrder 1" + e.getMessage()); logger.error("saveCardPayOrder 1" + e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage());


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/WxOrderService.java Vedi File

@@ -51,10 +51,12 @@ public interface WxOrderService {
/** /**
* 商户码-储值卡支付 * 商户码-储值卡支付
* @param merchant * @param merchant
* @param cUser
* @param totalFeeStr * @param totalFeeStr
* @param payment
* @return 订单id * @return 订单id
*/ */
WxOrder saveCardPayOrder(WxMerchant merchant, String totalFeeStr, Integer payment);
WxOrder saveCardPayOrder(WxMerchant merchant, WxCUser cUser, String totalFeeStr, Integer payment);


/** /**
* 免费券订单接口 * 免费券订单接口


+ 2
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Vedi File

@@ -452,12 +452,7 @@ public class WxOrderServiceImpl implements WxOrderService {


@Override @Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public WxOrder saveCardPayOrder(WxMerchant merchant, String totalFeeStr, Integer payment) {
if (merchant.getStatus() == EnumMerchantStatus.NOT_VALID.getCode()) {
logger.error("商户已禁用, merchantId: " + merchant.getId());
throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_VALID);
}

public WxOrder saveCardPayOrder(WxMerchant merchant, WxCUser cUser, String totalFeeStr, Integer payment) {
Date curr = new Date(); Date curr = new Date();


final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
@@ -473,6 +468,7 @@ public class WxOrderServiceImpl implements WxOrderService {
record.setOrderNumber(orderNumber); record.setOrderNumber(orderNumber);
record.setType(EnumOrderType.PREPAIDCARD.getCode()); record.setType(EnumOrderType.PREPAIDCARD.getCode());
record.setProductId(merchant.getId()); record.setProductId(merchant.getId());
record.setcUserId(cUser.getId());
record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode());
record.setPayment(payment); record.setPayment(payment);
record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode());


Caricamento…
Annulla
Salva