渠道配置

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/YppService.java

@@ -17,6 +17,7 @@ import com.zhongshu.payment.client.type.TransferType;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.shop.client.vo.life.AccountDetailVo;
 import com.zswl.cloud.shop.client.vo.life.SharePlatformVo;
+import com.zswl.cloud.shop.client.vo.life.ShopInfoSimpleVo;
 import com.zswl.cloud.springBatch.client.model.ypp.movie.request.CreateOrder2Request;
 import com.zswl.cloud.springBatch.client.model.ypp.movie.response.CreateOrder2Response;
 import com.zswl.cloud.springBatch.client.model.ypp.movie.response.OrderDetailResponse;
@@ -65,8 +66,13 @@ public class YppService {
         }
         String orderNo = snowflake.nextIdStr();
         AccountDetailVo accountDetailVo = shopSetting.getContent();
+        List<ShopInfoSimpleVo> shops = accountDetailVo.getShops();
+        if (shops.isEmpty()){
+            return ResultContent.build(ResultState.Fail, "有票票店铺未创建");
+        }
         // 分账信息
-        String shopId = accountDetailVo.getAccountId();
+//        String shopId = accountDetailVo.getAccountId();
+        String shopId = shops.get(0).getShopId();
         String authAccount = accountDetailVo.getAuthAccount();
         SharePlatformVo sharePlatformVo = accountDetailVo.getSharePlatformVo();
 

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/DfyHotelServiceImpl.java

@@ -16,6 +16,7 @@ import com.zhongshu.payment.client.type.TransferType;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.shop.client.vo.life.AccountDetailVo;
 import com.zswl.cloud.shop.client.vo.life.SharePlatformVo;
+import com.zswl.cloud.shop.client.vo.life.ShopInfoSimpleVo;
 import com.zswl.cloud.springBatch.client.model.dfy.Hotel.request.*;
 import com.zswl.cloud.springBatch.client.model.dfy.Hotel.response.*;
 import com.zswl.cloud.springBatch.client.model.dfy.Ticket.response.CreateOrderNewResponse;
@@ -99,6 +100,10 @@ public class DfyHotelServiceImpl implements DfyHotelService {
             return ResultContent.build(ResultState.Fail, "酒店商户信息未配置");
         }
         AccountDetailVo accountDetailVo = shopSetting.getContent();
+        List<ShopInfoSimpleVo> shops = shopSetting.getContent().getShops();
+        if (shops.isEmpty()){
+            return ResultContent.build(ResultState.Fail, "酒店店铺未创建");
+        }
 
 
         String orderNo = snowflake.nextIdStr();
@@ -133,7 +138,8 @@ public class DfyHotelServiceImpl implements DfyHotelService {
         orderDetailRequest.setOrderId(addOrderResponse.getData().getOrderId());
         OrderDetailResponse orderDetailResponse = domesticHotelApi.orderDetail(orderDetailRequest);
 
-        String shopId = accountDetailVo.getAccountId();
+//        String shopId = accountDetailVo.getAccountId();
+        String shopId = shops.get(0).getShopId();
         String authAccount = accountDetailVo.getAuthAccount();
         SharePlatformVo sharePlatformVo = accountDetailVo.getSharePlatformVo();
 

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/KfcServiceImpl.java

@@ -14,6 +14,7 @@ import com.zhongshu.payment.client.type.TransferType;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.shop.client.vo.life.AccountDetailVo;
 import com.zswl.cloud.shop.client.vo.life.SharePlatformVo;
+import com.zswl.cloud.shop.client.vo.life.ShopInfoSimpleVo;
 import com.zswl.cloud.springBatch.client.model.ypp.kfc.request.CreateOrdereRquest;
 import com.zswl.cloud.springBatch.client.model.ypp.kfc.response.CityListResponse;
 import com.zswl.cloud.springBatch.client.model.ypp.kfc.response.CreateOrdereResponse;
@@ -87,8 +88,13 @@ public class KfcServiceImpl {
             return ResultContent.build(ResultState.Fail, "有票票信息未配置");
         }
         AccountDetailVo accountDetailVo = shopSetting.getContent();
-
-        String shopId = accountDetailVo.getAccountId();
+        List<ShopInfoSimpleVo> shops = accountDetailVo.getShops();
+        if (shops.isEmpty()){
+            return ResultContent.build(ResultState.Fail, "有票票店铺未创建");
+        }
+        // 分账信息
+//        String shopId = accountDetailVo.getAccountId();
+        String shopId = shops.get(0).getShopId();
         String authAccount = accountDetailVo.getAuthAccount();
         SharePlatformVo sharePlatformVo = accountDetailVo.getSharePlatformVo();
 

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/Video2ServiceImpl.java

@@ -15,6 +15,7 @@ import com.zswl.cloud.shop.client.service.CouponInfoLogService;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.shop.client.vo.life.AccountDetailVo;
 import com.zswl.cloud.shop.client.vo.life.SharePlatformVo;
+import com.zswl.cloud.shop.client.vo.life.ShopInfoSimpleVo;
 import com.zswl.cloud.springBatch.client.model.video2.RechargeRequest;
 import com.zswl.cloud.springBatch.client.service.Video2Service;
 import com.zswl.cloud.springBtach.server.core.api.video2.Video2Api;
@@ -81,6 +82,10 @@ public class Video2ServiceImpl implements Video2Service {
         if (!shopSetting.getState().equals(com.zswl.cloud.shop.client.ret.ResultState.Success)) {
             return ResultContent.build(ResultState.Fail, "视频会员信息未配置");
         }
+        List<ShopInfoSimpleVo> shops = shopSetting.getContent().getShops();
+        if (shops.isEmpty()){
+            return ResultContent.build(ResultState.Fail, "酒店店铺未创建");
+        }
         AccountDetailVo accountDetailVo = shopSetting.getContent();
 
 
@@ -88,7 +93,8 @@ public class Video2ServiceImpl implements Video2Service {
 
 // 平台订单
 
-        String shopId = accountDetailVo.getAccountId();
+        ShopInfoSimpleVo shopInfoSimpleVo = shops.get(0);
+        String shopId = shopInfoSimpleVo.getShopId();
         String authAccount = accountDetailVo.getAuthAccount();
         SharePlatformVo sharePlatformVo = accountDetailVo.getSharePlatformVo();
 
@@ -98,7 +104,7 @@ public class Video2ServiceImpl implements Video2Service {
         createOrder2Model.setUserId(authHelper.getCurrentUser().getUserId());
         createOrder2Model.setShopId(shopId);
         JSONObject shopInfo = JSONUtil.parseObj(shopSetting);
-        shopInfo.set("shopName", "会员充值");
+        shopInfo.set("shopName", shopInfoSimpleVo.getShopName());
         createOrder2Model.setShopInfo(shopInfo);
         createOrder2Model.setTotalAmount(totalPrice);
         createOrder2Model.setDiscountAmount(BigDecimal.ZERO);