|
|
|
@@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.vo.WxCardSpendVo; |
|
|
|
import com.iformall.enums.EnumMerchantStatus; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.*; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
@@ -106,10 +107,14 @@ public class WxCardPayController extends BaseController { |
|
|
|
WxCUser user = getUser(); |
|
|
|
|
|
|
|
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; |
|
|
|
try { |
|
|
|
order = wxOrderService.saveCardPayOrder(merchant, totalFeeStr, payment); |
|
|
|
order = wxOrderService.saveCardPayOrder(merchant, user, totalFeeStr, payment); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("saveCardPayOrder 1" + e.getMessage()); |
|
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
|
|