直播订单 存商户号

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStorePaymentScrmServiceImpl.java

@@ -1188,7 +1188,7 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
         // 创建记录 TODO 根据type创建支付
         FsStorePaymentScrm storePayment = new FsStorePaymentScrm();
         if (payOrderParam.getBusinessType().getPrefix().equals("live")) {
-            LiveOrderPayment liveOrderPayment = createLiveStorePayment(payConfig, user, payOrderParam);
+            LiveOrderPayment liveOrderPayment = createLiveStorePayment(payConfig, user, payOrderParam,merchantAppConfig.getMerchantId());
             BeanUtils.copyProperties(liveOrderPayment, storePayment);
         } else {
             storePayment = createStorePaymentScrm(payConfig, user, payOrderParam,merchantAppConfig.getMerchantId());
@@ -1206,7 +1206,7 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
      * @param payOrderParam
      * @return
      */
-    private LiveOrderPayment createLiveStorePayment(FsPayConfig payConfig, FsUserScrm user, PayOrderParam payOrderParam) {
+    private LiveOrderPayment createLiveStorePayment(FsPayConfig payConfig, FsUserScrm user, PayOrderParam payOrderParam,String merchantId) {
         String payCode = OrderCodeUtils.getOrderSn();
         if (StringUtils.isEmpty(payCode)) {
             throw new CustomException("订单生成失败，请重试");
@@ -1228,6 +1228,7 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
         storePayment.setStoreId(payOrderParam.getStoreId());
         storePayment.setUserId(user.getUserId());
         storePayment.setBusinessId(payOrderParam.getOrderId().toString());
+        storePayment.setMerConfigId(Long.valueOf(merchantId));
         // 设置openId（如果是微信支付）
         if (isWechatPayment(payOrderParam.getPaymentMethod())) {
             storePayment.setOpenId(getOpenIdForPaymentMethod(user, payOrderParam.getPaymentMethod(), payConfig));