From bb709ab69df0b7200ab120cf591fb587efd70020 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Fri, 18 Jul 2025 16:15:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=9D=E8=BF=85=E6=9F=A5=E8=AF=A2=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E6=B7=98=E6=B1=B0=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../small/client/Schedule/DynamicTaskScheduler.java   |  1 +
 .../com/small/client/controller/WebController.java    | 11 ++++++++++-
 .../src/main/java/com/small/client/dao/SxDataDao.java |  2 +-
 .../small/client/service/imp/SxDataServiceImp.java    |  3 ++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/client/src/main/java/com/small/client/Schedule/DynamicTaskScheduler.java b/client/src/main/java/com/small/client/Schedule/DynamicTaskScheduler.java
index a5a5c0ab..a927fa98 100644
--- a/client/src/main/java/com/small/client/Schedule/DynamicTaskScheduler.java
+++ b/client/src/main/java/com/small/client/Schedule/DynamicTaskScheduler.java
@@ -98,6 +98,7 @@ public class DynamicTaskScheduler {
         sxDataService.SyncCategory(dataBaseInfo,commentModel);
         sxDataService.SyncGoods(dataBaseInfo,commentModel);//todo 暂时同步全部的商品如果后期修改，需要增加服务器的字段
         sxDataService.SyncVipList(dataBaseInfo,commentModel);
+        sxDataService.syncAtiveShops(dataBaseInfo,commentModel);
         isRuning=false;
     }
 
diff --git a/client/src/main/java/com/small/client/controller/WebController.java b/client/src/main/java/com/small/client/controller/WebController.java
index c49a082b..bcb6f051 100644
--- a/client/src/main/java/com/small/client/controller/WebController.java
+++ b/client/src/main/java/com/small/client/controller/WebController.java
@@ -38,7 +38,16 @@ public class WebController {
     public void syncCategory(){
         log.info("syncCategory");
         //sxDataService.getAppSign();
-        sxDataService.SyncCategory(new DataBaseInfo(),sxDataService.getCommentModel());
+        CommentModel commentModel= sxDataService.getCommentModel();
+        DataBaseInfo dataBaseInfo=sxDataService.getDataBaseInfo(commentModel);
+        if(dataBaseInfo==null){
+            log.error("syncGoods dataBaseInfo is null");
+            return;
+        }
+        if(ObjectUtil.isNotEmpty(dataBaseInfo.getRefreshTime())){
+            commentModel.setSyncTime(DateUtil.formatDateTime(dataBaseInfo.getRefreshTime()));
+        }
+        sxDataService.SyncCategory(dataBaseInfo,sxDataService.getCommentModel());
     }
 
     @RequestMapping("/syncGoods")
diff --git a/client/src/main/java/com/small/client/dao/SxDataDao.java b/client/src/main/java/com/small/client/dao/SxDataDao.java
index b1bced36..65ab27b4 100644
--- a/client/src/main/java/com/small/client/dao/SxDataDao.java
+++ b/client/src/main/java/com/small/client/dao/SxDataDao.java
@@ -24,7 +24,7 @@ import java.util.*;
 public class SxDataDao extends BaseDao{
 
     private final static String T_BD_ITEM_CLS="t_bd_item_cls";//商品分类
-    private final static String T_BD_ITEM_INFO="t_bd_item_info";//商品表
+    private final static String T_BD_ITEM_INFO="t_bd_item_info b";//商品表
     private final static String T_RM_VIP_INFO="t_rm_vip_info";//会员表
 
     private final static String ITEM_CLSNO="item_clsno";//商品分类排序字段
diff --git a/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java b/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java
index efef9dee..da867c12 100644
--- a/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java
+++ b/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java
@@ -295,7 +295,8 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService
      * @param commentModel
      */
     private void syncAllGoods(DataBaseInfo dataBaseInfo, CommentModel commentModel){
-        String where="where 1=1";
+        //String where="where 1=1";
+        String where="where b.status='1'";
         Integer total =0;
         String parentId=getAndCacheTree(dataBaseInfo,dataBaseInfo.getCategoryName());//加载缓存用的
         if(DicEnum.SYNCTYPE_02.getCode().equals(dataBaseInfo.getSyncType())){