From 9a94d9addd9285c3bfa3a7014ac2f87a1c815f7f Mon Sep 17 00:00:00 2001 From: liyj <1617420630@qq.com> Date: Tue, 8 Jul 2025 18:17:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=9D=E8=BF=85=E5=90=8C=E6=AD=A5=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../small/client/controller/WebController.java | 1 - .../main/java/com/small/client/dao/BaseDao.java | 8 ++------ .../java/com/small/client/dao/SxDataDao.java | 5 +++-- .../com/small/client/dto/ActiveShopInfo.java | 3 +++ .../client/service/imp/SxDataServiceImp.java | 17 ++++++++++++++++- 5 files changed, 24 insertions(+), 10 deletions(-) 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 97160ea6..c49a082b 100644 --- a/client/src/main/java/com/small/client/controller/WebController.java +++ b/client/src/main/java/com/small/client/controller/WebController.java @@ -31,7 +31,6 @@ public class WebController { public void synBrand(){ log.info("synBrand"); // sxDataService.getAppSign(); - sxDataService.SyncBranchList(new DataBaseInfo(),sxDataService.getCommentModel()); } diff --git a/client/src/main/java/com/small/client/dao/BaseDao.java b/client/src/main/java/com/small/client/dao/BaseDao.java index 47ce2050..d4d6c26e 100644 --- a/client/src/main/java/com/small/client/dao/BaseDao.java +++ b/client/src/main/java/com/small/client/dao/BaseDao.java @@ -415,9 +415,7 @@ public class BaseDao { " from \n" + " ( \n" + " select \n" + - " ROW_NUMBER() OVER(partition by b.start_date, \n" + - " b.end_date, \n" + - " b.special_type,b.discount \n" + + " ROW_NUMBER() OVER(partition by b.other3 " + " ORDER BY \n" + " b.start_date) as rowId, \n" + " b.* \n" + @@ -453,9 +451,7 @@ public class BaseDao { "from\n" + " (\n" + " select\n" + - " ROW_NUMBER() OVER(partition by b.start_date,\n" + - " b.end_date,\n" + - " b.special_type\n" + + " ROW_NUMBER() OVER(partition by b.other3 " + " ORDER BY\n" + " b.start_date) as rowId,\n" + " b.*\n" + 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 43139827..b1bced36 100644 --- a/client/src/main/java/com/small/client/dao/SxDataDao.java +++ b/client/src/main/java/com/small/client/dao/SxDataDao.java @@ -567,7 +567,7 @@ public class SxDataDao extends BaseDao{ activeDto.setActivityTypeId(3); activeDto.setActiveMaxDesList(activeMaxDesList); } - activeDto.setFlowNo(rs.getString("flow_no")); + activeDto.setFlowNo(rs.getString("other3")); activeDto.setActivityReleasetime(rs.getDate("oper_date")); activeDto.setActivityStarttime(rs.getDate("start_date")); activeDto.setActivityEndtime(rs.getDate("end_date")); @@ -657,9 +657,10 @@ public class SxDataDao extends BaseDao{ activeShopInfo.setActivityName("满"+total1+"减"+max1+",满"+total2+"减"+max2); activeShopInfo.setActivityTypeId(3); } + activeShopInfo.setActivityItemMinQuantity(rs.getBigDecimal("sale_qty")); activeShopInfo.setActivityStarttime(rs.getDate("start_date")); activeShopInfo.setActivityEndtime(rs.getDate("end_date")); - activeShopInfo.setFlowNo(rs.getString("flow_no")); + activeShopInfo.setFlowNo(rs.getString("other3")); if(DateUtil.compare(activeShopInfo.getActivityEndtime(),DateUtil.date())>0){ activeShopInfo.setActivityState(1);//正常进行中 }else { diff --git a/client/src/main/java/com/small/client/dto/ActiveShopInfo.java b/client/src/main/java/com/small/client/dto/ActiveShopInfo.java index 001ed0a9..11fb90c0 100644 --- a/client/src/main/java/com/small/client/dto/ActiveShopInfo.java +++ b/client/src/main/java/com/small/client/dto/ActiveShopInfo.java @@ -44,4 +44,7 @@ public class ActiveShopInfo { @ApiModelProperty(value = "活动id") private String flowNo; + + @ApiModelProperty(value = "购买下限") + private BigDecimal activityItemMinQuantity; } 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 84617e24..efef9dee 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 @@ -85,10 +85,12 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService // 总页数 int pages = CommonUtil.getPagesCount(total, SxDataDao.PAGESIZE); List allSxSyncCategories= sxDataDao.findTBdItemClsList(dataBaseInfo); + List clsBrandDtoList=sxDataDao.getclsMapBrand(dataBaseInfo); + Map clsBrandMap=getClsMapBrand(clsBrandDtoList); int syncCount =0; for (int i = 1; i <=pages; i++) { List sxSyncCategories= sxDataDao.findTBdItemClsListPage(dataBaseInfo,i,SxDataDao.PAGESIZE); - List sxCategoryModelList= ConVToSxCategoryModel(sxSyncCategories,allSxSyncCategories); + List sxCategoryModelList= ConVToSxCategoryModel(sxSyncCategories,allSxSyncCategories,clsBrandMap); JSONArray jsonArray =null; String jsonString=""; try { @@ -778,8 +780,21 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService syncCount+=activeDtos.size(); } log.info("成功同步活动商品数据："+syncCount); + HttpUtils.postData(restTemplate,remoteIp+HttpUtils.URL_SYNC_REFRESH + +"?appKey="+commentModel.getAppKey() + +"&sign="+commentModel.getAppId(), new JSONArray()); } + private Map getClsMapBrand(List clsBrandDtos){ + Map map=new HashMap(); + if(!clsBrandDtos.isEmpty()){ + clsBrandDtos.forEach(clsBrandDto->{ + map.put(clsBrandDto.getItemClsname(),clsBrandDto.getCodeName()); + }); + } + return map; + } + }