From 52ab2b88cf4550229c594bb4514135af1302c68d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 5 Jan 2019 12:44:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=82=A8=E5=80=BC=E5=8D=A1=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=A1=AB=E5=86=99cUserId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCardPayController.java | 7 ++++++- .../main/java/com/iformall/service/WxOrderService.java | 4 +++- .../com/iformall/service/impl/WxOrderServiceImpl.java | 8 ++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index e122846c4..0ea1d9a73 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -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()); diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java index dae516d91..afea50e2c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java @@ -51,10 +51,12 @@ public interface WxOrderService { /** * 商户码-储值卡支付 * @param merchant + * @param cUser * @param totalFeeStr + * @param payment * @return 订单id */ - WxOrder saveCardPayOrder(WxMerchant merchant, String totalFeeStr, Integer payment); + WxOrder saveCardPayOrder(WxMerchant merchant, WxCUser cUser, String totalFeeStr, Integer payment); /** * 免费券订单接口 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index d658ec1ef..e7eb3411b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -452,12 +452,7 @@ public class WxOrderServiceImpl implements WxOrderService { @Override @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(); final IdWorker idWorker = IdWorker.get(); @@ -473,6 +468,7 @@ public class WxOrderServiceImpl implements WxOrderService { record.setOrderNumber(orderNumber); record.setType(EnumOrderType.PREPAIDCARD.getCode()); record.setProductId(merchant.getId()); + record.setcUserId(cUser.getId()); record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); record.setPayment(payment); record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode());