Browse Source

分账信息调整

gongfuzhu 6 months ago
parent
commit
86eab3c448

+ 7 - 4
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/OrderController.java

@@ -17,6 +17,7 @@ import com.zhongshu.payment.client.model.payment.CreateResponseModel;
 import com.zhongshu.payment.client.type.JobFlowMap;
 import com.zhongshu.payment.client.type.TransferOwner;
 import com.zhongshu.payment.client.type.TransferType;
+import com.zswl.cloud.shop.client.dto.life.ShopInfoExtDto;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.shop.client.vo.life.GoodsInfoVo;
 import com.zswl.cloud.shop.client.vo.life.ShopDetailVo;
@@ -67,18 +68,20 @@ public class OrderController {
         createOrder2Model.setDiscountList(orderParamModel.getDiscountId());
 
         // 店铺详情
-        com.zswl.cloud.shop.client.ret.ResultContent<ShopDetailVo> detail1 = shopService.detail2(createOrder2Model.getShopId(),createOrder2Model.getCode());
+        com.zswl.cloud.shop.client.ret.ResultContent<ShopDetailVo> detail1 = shopService.detail2(createOrder2Model.getShopId(), createOrder2Model.getCode());
         log.info("店铺详情:{}", JSONUtil.toJsonStr(detail1));
         ShopDetailVo shopDetailVo = detail1.getContent();
         createOrder2Model.setShopInfo(JSONUtil.parseObj(shopDetailVo));
-        if (ObjectUtil.isEmpty(shopDetailVo.getAuthAccount())) {
+        List<ShopInfoExtDto> shopInfos = shopDetailVo.getShopInfos();
+        if (shopInfos.isEmpty()) {
             return ResultContent.build(com.github.microservice.auth.client.content.ResultState.Fail, "分账账户未设置");
         }
-        createOrder2Model.setAccesserUserId(shopDetailVo.getAuthAccount());
+
+        createOrder2Model.setAccesserUserId(shopDetailVo.getShopInfos().get(0).getAuthAccount());
 
         for (String goodsId : orderParamModel.getGoodsList()) {
 
-            com.zswl.cloud.shop.client.ret.ResultContent resultContent = shopService.goodsInfo(orderParamModel.getShopId(), goodsId, userId,orderParamModel.getCode());
+            com.zswl.cloud.shop.client.ret.ResultContent resultContent = shopService.goodsInfo(orderParamModel.getShopId(), goodsId, userId, orderParamModel.getCode());
 
             log.info("获取订单详情{}", JSONUtil.toJsonStr(resultContent));