Merge branch 'dev-1.6-shouqianba' into container-test

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtSqbGoodsServiceImpl.java

 package com.liquidnet.service.goblin.service.impl.manage;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.liquidnet.common.third.sqb.biz.SqbBiz;
 import com.liquidnet.common.third.sqb.param.request.CommonRequest;
 import com.liquidnet.common.third.sqb.param.request.MallListQueryRequest;
@@ -18,7 +19,9 @@ import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsSqbAddParam;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinMgtCategorySpecVo;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.entity.GoblinSqbGoodsExt;
+import com.liquidnet.service.goblin.entity.GoblinSqbMallInfo;
 import com.liquidnet.service.goblin.mapper.GoblinSqbGoodsExtMapper;
+import com.liquidnet.service.goblin.mapper.GoblinSqbMallInfoMapper;
 import com.liquidnet.service.goblin.service.manage.IGoblinStoreMgtSqbGoodsService;
 import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
@@ -51,19 +54,26 @@ public class GoblinStoreMgtSqbGoodsServiceImpl implements IGoblinStoreMgtSqbGood
     GoblinSqbGoodsExtMapper goblinSqbGoodsExtMapper;
     @Autowired
     private SqbBiz goblinShouQianBaService;
+    @Autowired
+    private GoblinSqbMallInfoMapper goblinSqbMallInfoMapper;
 
 
     @Override
     public ResponseDto<List<GoblinSqbPerfGoodsVo>> getProductList() {
         try {
             List<GoblinSqbPerfGoodsVo> result = new ArrayList<>();
-            List<MallListQueryData> mallList = fetchAllMalls();
+
+            // 从mysql查询配置的店铺信息（收钱吧只有一个环境，所以通过数据库配置来获取店铺）
+            List<GoblinSqbMallInfo> mallList = goblinSqbMallInfoMapper.selectList(new QueryWrapper<GoblinSqbMallInfo>()
+                    .lambda()
+                    .eq(GoblinSqbMallInfo::getStatus, 1));
+//            List<MallListQueryData> mallList = fetchAllMalls();
             if (CollectionUtils.isEmpty(mallList)) {
                 return ResponseDto.success(new ArrayList<>());
             }
 
             // 获取本地已同步的商品 SPU 映射，用于标记同步状态
-            List<String> mallSns = mallList.stream().map(MallListQueryData::getMallSn).distinct()
+            List<String> mallSns = mallList.stream().map(GoblinSqbMallInfo::getMallSn).distinct()
                     .collect(Collectors.toList());
             List<GoblinSqbGoodsExt> syncedGoods = goblinSqbGoodsExtMapper.selectList(
                     new LambdaQueryWrapper<GoblinSqbGoodsExt>()
@@ -73,7 +83,7 @@ public class GoblinStoreMgtSqbGoodsServiceImpl implements IGoblinStoreMgtSqbGood
                     .map(g -> g.getMallSn() + ":" + g.getSqbSpuId())
                     .collect(Collectors.toSet());
 
-            for (MallListQueryData mall : mallList) {
+            for (GoblinSqbMallInfo mall : mallList) {
                 List<MallProductsQueryData> products = fetchAllProducts(mall);
                 if (!CollectionUtils.isEmpty(products)) {
                     for (MallProductsQueryData product : products) {
@@ -91,7 +101,7 @@ public class GoblinStoreMgtSqbGoodsServiceImpl implements IGoblinStoreMgtSqbGood
             return ResponseDto.failure("查询收钱吧商品失败: " + e.getMessage());
         }
     }
-    private static GoblinSqbPerfGoodsVo getGoblinSqbPerfGoodsVo(MallListQueryData mall, MallProductsQueryData product) {
+    private static GoblinSqbPerfGoodsVo getGoblinSqbPerfGoodsVo(GoblinSqbMallInfo mall, MallProductsQueryData product) {
         GoblinSqbPerfGoodsVo goblinSqbPerfGoodsVo = new GoblinSqbPerfGoodsVo();
         goblinSqbPerfGoodsVo.setMallSn(mall.getMallSn());
         goblinSqbPerfGoodsVo.setMallName(mall.getMallName());
@@ -144,7 +154,7 @@ public class GoblinStoreMgtSqbGoodsServiceImpl implements IGoblinStoreMgtSqbGood
     /**
      * 循环获取某个商城下的所有商品列表（支持搜索和游标分页）
      */
-    private List<MallProductsQueryData> fetchAllProducts(MallListQueryData mall) {
+    private List<MallProductsQueryData> fetchAllProducts(GoblinSqbMallInfo mall) {
         MallProductsQueryRequest productRequest = new MallProductsQueryRequest();
         productRequest.setAppid(goblinShouQianBaService.getSqbConfig().getAppId());
         productRequest.setSeller(buildSeller());