From 45469be52dada7c16fdd3881b9b9f6b745a86d8e Mon Sep 17 00:00:00 2001 From: liyj <1617420630@qq.com> Date: Wed, 26 Nov 2025 11:19:58 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=95=86?= =?UTF-8?q?=E5=93=81=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=8C2?= =?UTF-8?q?=E3=80=81=E5=AE=A2=E6=88=B7=E7=AB=AF=E6=96=B0=E5=A2=9E=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B79.7=E5=92=8C=E5=95=86=E4=BA=9110=E5=88=86?= =?UTF-8?q?=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/Schedule/DynamicTaskScheduler.java | 55 +++-- .../com/small/client/Utils/FileUtils.java | 19 +- .../java/com/small/client/dao/BaseDao.java | 16 +- .../java/com/small/client/dao/SxDataDao.java | 188 +++++++++++++++++- .../com/small/client/dto/DataBaseInfo.java | 13 ++ .../java/com/small/client/dto/RmSaleflow.java | 22 +- .../com/small/client/dto/StoreDbConfig.java | 9 + .../com/small/client/dto/SxGoosModel.java | 3 + .../java/com/small/client/dto/TRmPayflow.java | 9 +- .../service/SxDataAbst/SxDataAbstService.java | 1 + .../small/client/service/SxDataService.java | 6 + .../client/service/imp/SxDataServiceImp.java | 45 +++-- 12 files changed, 321 insertions(+), 65 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 40ef8277..9cec2163 100644 --- a/client/src/main/java/com/small/client/Schedule/DynamicTaskScheduler.java +++ b/client/src/main/java/com/small/client/Schedule/DynamicTaskScheduler.java @@ -34,16 +34,21 @@ public class DynamicTaskScheduler { this.sxDataService = sxDataService; } - @PostConstruct + @PostConstruct public void initTasks() { - //初始化 start - CommentModel commentModel =sxDataService.getCommentModel(); - DataBaseInfo enabledTask = sxDataService.getDataBaseInfo(commentModel); - executeTask(enabledTask.getDataBaseName(),commentModel); - //初始化 end - refreshTasks(); - // 每5分钟检查一次数据库更新 - taskScheduler.scheduleAtFixedRate(this::refreshTasks, Duration.ofHours(1)); + try { + //初始化 start + CommentModel commentModel =sxDataService.getCommentModel(); + DataBaseInfo enabledTask = sxDataService.getDataBaseInfo(commentModel); + executeTask(enabledTask.getDataBaseName(),commentModel); + //初始化 end + refreshTasks(); + // 每5分钟检查一次数据库更新 + taskScheduler.scheduleAtFixedRate(this::refreshTasks, Duration.ofHours(1)); + }catch (Exception e){ + log.info("系统异常：{}",e.getMessage()); + } + } public void refreshTasks() { @@ -104,12 +109,13 @@ public class DynamicTaskScheduler { refreshTime=DateUtil.formatDateTime(dataBaseInfo.getRefreshTime()); commentModel.setSyncTime(refreshTime); } - sxDataService.syncStoreData(dataBaseInfo,commentModel); + sxDataService.syncStoreData(dataBaseInfo,commentModel);//同步网上售卖流水 + if(StringUtils.isNotEmpty(refreshTime)){//有刷新时间，证明不是全量，需要判断是否有新商品，有新商品才同步品牌和分类 - if(sxDataService.isNewShop(dataBaseInfo,refreshTime)){ - sxDataService.SyncBranchList(dataBaseInfo,commentModel); - sxDataService.SyncCategory(dataBaseInfo,commentModel); - } + if(sxDataService.isNewShop(dataBaseInfo,refreshTime)){ + sxDataService.SyncBranchList(dataBaseInfo,commentModel); + sxDataService.SyncCategory(dataBaseInfo,commentModel); + } }else { log.info("首次同步，无刷新时间"); sxDataService.SyncBranchList(dataBaseInfo,commentModel); @@ -129,15 +135,22 @@ public class DynamicTaskScheduler { if(ObjectUtil.isNotEmpty(dataBaseInfo.getRefreshTime())){ commentModel.setSyncTime(refreshTime); } - sxDataService.SyncVipList(dataBaseInfo,commentModel); - boolean isNewActives=sxDataService.syncAtive(dataBaseInfo,commentModel); - if(isNewActives){ - log.info("---有新增的活动，同步活动商品开始--"); - sxDataService.syncAtiveShops(dataBaseInfo,commentModel); - }else { - log.info("---无新增的活动，无需同步活动商品--"); + if("1".equals(dataBaseInfo.getIsSyncMember())){//同步会员 + sxDataService.SyncVipList(dataBaseInfo,commentModel); } + //同步活动数据，判断是否同步活动数据，有新活动，且有活动数据才同步活动 + if("1".equals(dataBaseInfo.getIsSyncActive())){ + boolean isNewActives=sxDataService.syncAtive(dataBaseInfo,commentModel); + if(isNewActives){ + log.info("---有新增的活动，同步活动商品开始--"); + sxDataService.syncAtiveShops(dataBaseInfo,commentModel); + }else { + log.info("---无新增的活动，无需同步活动商品--"); + } + } + + sxDataService.refreshTime(commentModel); isRuning=false; } diff --git a/client/src/main/java/com/small/client/Utils/FileUtils.java b/client/src/main/java/com/small/client/Utils/FileUtils.java index b865a8da..839f05ae 100644 --- a/client/src/main/java/com/small/client/Utils/FileUtils.java +++ b/client/src/main/java/com/small/client/Utils/FileUtils.java @@ -36,7 +36,7 @@ public class FileUtils { public static final String okEnd = "ok";//后缀 public static final String txtEnd = "txt";//后缀 - public static String fileFormat = "%s_%s.%s";//good_1 + public static String fileFormat = "%s_%s_%s.%s";//good_1 public static String getSyncTypeFlag(String syncType){ Calendar calendar=Calendar.getInstance(); @@ -96,12 +96,21 @@ public class FileUtils { * @param filePath */ public void writeFile(String filePath,String fileName,String content){ + FileWriter writer =null; try { - FileWriter writer = new FileWriter(filePath+pathSeparator+fileName); + writer = new FileWriter(filePath+pathSeparator+fileName,false); writer.write(content); + writer.flush(); writer.close(); log.info("文件写入成功！"); } catch (IOException e) { + if(writer!=null){ + try { + writer.close(); + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } log.info("文件写入失败：{}", e.getMessage()); } } @@ -112,7 +121,7 @@ public class FileUtils { * @param page * @return */ - public String getFileName(String syncType ,Integer page,String endFix){ + public String getFileName(String syncType ,Integer page,String endFix,String fileEndFix){ String result=""; switch (syncType){ case "1": @@ -130,7 +139,7 @@ public class FileUtils { default: break; } - return String.format(fileFormat, result,page,endFix); + return String.format(fileFormat, result,page,fileEndFix,endFix); } /** @@ -170,7 +179,7 @@ public class FileUtils { FileUtils fileUtils= new FileUtils(); File file=fileUtils.createFile("1",1); System.out.printf("--"+file.getAbsoluteFile()); - fileUtils.writeFile(file.getAbsolutePath(),fileUtils.getFileName("1",2,txtEnd),"456"); + fileUtils.writeFile(file.getAbsolutePath(),fileUtils.getFileName("1",2,txtEnd,"operate"),"456"); } } 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 f73f2dcd..cb8492db 100644 --- a/client/src/main/java/com/small/client/dao/BaseDao.java +++ b/client/src/main/java/com/small/client/dao/BaseDao.java @@ -284,7 +284,7 @@ public class BaseDao { // " ls.oper_date " + "FROM ( " + " SELECT " + - " ROW_NUMBER() OVER(ORDER BY item_clsno) AS rowId, " + + " ROW_NUMBER() OVER(ORDER BY item_clsno,item_no) AS rowId, " + " * " + " FROM t_bd_item_info shop %s" + ") b " + @@ -355,21 +355,21 @@ public class BaseDao { " tib.oper_date," + " ROW_NUMBER() OVER(PARTITION BY tib.item_no ORDER BY tib.oper_date DESC) AS rn " + " FROM t_im_branch_stock tib " + - ") " + - "SELECT " + - "ROW_NUMBER() OVER (ORDER BY b.rowId) AS rowId, "+//-- 这里重新生成从1开始连续的行号 + "), " + + "PagedData As( SELECT " + + "ROW_NUMBER() OVER (ORDER BY b.rowId) AS rowIdA, "+//-- 这里重新生成从1开始连续的行号 " b.*, " + " ls.stock_qty, " + " ls.oper_date " + "FROM ( " + " SELECT " + - " ROW_NUMBER() OVER(ORDER BY item_clsno) AS rowId ," + + " ROW_NUMBER() OVER(ORDER BY item_clsno,item_no) AS rowId ," + " * " + " FROM t_bd_item_info shop %s" + ") b " + - "LEFT JOIN LatestStock ls ON b.item_no = ls.item_no AND ls.rn = 1 " + - " where b.rowId BETWEEN %s AND %s %s"; - sql=String.format(sql,where,start,end,stockOperateWhere); + "LEFT JOIN LatestStock ls ON b.item_no = ls.item_no AND ls.rn = 1 %s) " + + "SELECT * FROM PagedData where rowIdA BETWEEN %s AND %s "; + sql=String.format(sql,where,stockOperateWhere,start,end); log.info(sql); ResultDto resultDto=new ResultDto(); ResultSet rs=null; 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 6d004280..2e7fb11e 100644 --- a/client/src/main/java/com/small/client/dao/SxDataDao.java +++ b/client/src/main/java/com/small/client/dao/SxDataDao.java @@ -206,7 +206,7 @@ public class SxDataDao extends BaseDao{ public List findBditemInfoListPage(DataBaseInfo dataBaseInfo,int pageNo,int pageSize){ String stockOperateWhere=""; if(StringUtils.isNotEmpty(dataBaseInfo.getStockOperateWhere())){ - stockOperateWhere=" and "+dataBaseInfo.getStockOperateWhere(); + stockOperateWhere=" where "+dataBaseInfo.getStockOperateWhere(); } ResultDto resultDto=baseFindGoodsListJoinPage(dataBaseInfo.getIp(),dataBaseInfo.getUserName(),dataBaseInfo.getPassword(),dataBaseInfo.getDbPort(),dataBaseInfo.getDataBaseName() ,pageNo,pageSize,dataBaseInfo.getWhere()==null?DEFALTWHERE:dataBaseInfo.getWhere(),stockOperateWhere); @@ -230,6 +230,7 @@ public class SxDataDao extends BaseDao{ }else { sxSyncGoods.setGross_margin(new BigDecimal("0"));//毛利率 } + sxSyncGoods.setId(rs.getLong("rowIdA")); sxSyncGoods.setItem_no(rs.getString("item_no"));//货号 sxSyncGoods.setItem_subname(rs.getString("item_name"));//商品名称 sxSyncGoods.setItem_subno(rs.getString("item_subno"));//商品条码 @@ -509,6 +510,7 @@ public class SxDataDao extends BaseDao{ ") " + " UPDATE TopStock " + " SET stock_qty = stock_qty+(?),oper_date=?;"; + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); try (PreparedStatement ps = conn.prepareStatement(sql)) { int batchSize = 100; // 每批处理1000条 @@ -552,7 +554,13 @@ public class SxDataDao extends BaseDao{ int[] remainingCounts = ps.executeBatch(); //todo 新增流水 - updateStoreSaleFlow(conn,rmSaleflowList,tRmPayflowList); + if(dataBaseInfo.getClientVersion().equals(DataBaseInfo.SHANG_YUN)){ + updateStoreSaleFlow(conn,rmSaleflowList,tRmPayflowList); + } + if (dataBaseInfo.getClientVersion().equals(DataBaseInfo.SHANG_RUI)){ + updateStoreSaleFlowShangRui(conn,rmSaleflowList,tRmPayflowList); + } + List consumIds=productQuantityConsumptionDtoList .stream() @@ -605,6 +613,11 @@ public class SxDataDao extends BaseDao{ rmSaleflow.setSaleMoney(productQuantityConsumptionDto.getSaleAmount()); // rmSaleflow.setSourcePrice(unitPrice); rmSaleflow.setFlownoRand(productQuantityConsumptionDto.getOrderId());//随机子单号 设置网上订单号 + if(null!=productQuantityConsumptionDto.getSaleTime()){ + rmSaleflow.setOperDate(new Timestamp(productQuantityConsumptionDto.getSaleTime())); + }else { + rmSaleflow.setOperDate(new Timestamp(System.currentTimeMillis())); + } return rmSaleflow; } @@ -627,7 +640,7 @@ public class SxDataDao extends BaseDao{ //判断取值 start rmSaleflow.setSellWay("B"); - rmSaleflow.setRetQnty(rmSaleflow.getSaleQnty()); + rmSaleflow.setRetQnty(BigDecimal.ZERO); if(rmSaleflow.getSaleQnty().compareTo(BigDecimal.ZERO)<0){ rmSaleflow.setSellWay("A"); BigDecimal saleQnty=rmSaleflow.getSaleQnty();//销售数量 @@ -646,7 +659,6 @@ public class SxDataDao extends BaseDao{ if(itemInfo!=null){ rmSaleflow.setInPrice(itemInfo.getPrice()); rmSaleflow.setSourcePrice(itemInfo.getSalePrice()); - rmSaleflow.setOperDate(new Timestamp(System.currentTimeMillis())); } rmSaleflow.setBranchNo(branchNo); @@ -665,6 +677,8 @@ public class SxDataDao extends BaseDao{ rmSaleflow.setPrefAmt(BigDecimal.ZERO); rmSaleflow.setComFlag("0"); rmSaleflow.setRemoteFlag("0"); + rmSaleflow.setPaysum_flag("0"); + rmSaleflow.setKz_flag("1"); //统一默认值 end return rmSaleflow; } @@ -691,7 +705,7 @@ public class SxDataDao extends BaseDao{ rmPayflow.setCoinNo("RMB");// rmPayflow.setCoinRate(new BigDecimal("1"));//利率 rmPayflow.setPayAmount(rmSaleflow.getSaleMoney()); - rmPayflow.setOperDate(new Timestamp(System.currentTimeMillis())); + rmPayflow.setOperDate(rmSaleflow.getOperDate()); rmPayflow.setOperId(rmSaleflow.getOperId()); rmPayflow.setCounterNo(rmSaleflow.getCounterNo()); rmPayflow.setSaleMan(rmSaleflow.getSaleMan()); @@ -784,7 +798,7 @@ public class SxDataDao extends BaseDao{ } /** - * 批量新增销售流水 + * 批量新增销售流水 商云10 * @param conn * @param rmSaleflowList */ @@ -802,8 +816,8 @@ public class SxDataDao extends BaseDao{ "sale_qnty, sale_money, sell_way, oper_id, sale_man, counter_no, " + "oper_date, remote_flag, shift_no, com_flag, spec_flag, pref_amt, " + "in_price, n_stan, chr_stan, posid, uptime, flowno_rand, ret_qnty, " + - "flowno_type, spec_sheet_no, cic_sheet_no, share_cardid, item_no_Fresh" + - ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + "flowno_type, spec_sheet_no, cic_sheet_no" + + ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; String sql2 = "INSERT INTO t_rm_payflow (" + "flow_id, flow_no, sale_amount, branch_no, pay_way, sell_way, " + "card_no, vip_no, coin_no, coin_rate, pay_amount, oper_date, " + @@ -857,8 +871,8 @@ public class SxDataDao extends BaseDao{ ps.setString(26, rmSaleflow.getFlownoType()); ps.setString(27, rmSaleflow.getSpecSheetNo()); ps.setString(28, "");//CicSheetNo - ps.setString(29, rmSaleflow.getShareCardid()); - ps.setString(30, rmSaleflow.getItemNoFresh()); +// ps.setString(29, rmSaleflow.getShareCardid()); +// ps.setString(30, rmSaleflow.getItemNoFresh()); ps.addBatch(); // 添加至批处理 //rmSaleflow end------------- @@ -937,6 +951,160 @@ public class SxDataDao extends BaseDao{ // } } + /** + * 批量新增销售流水 商瑞9.7 + * @param conn + * @param rmSaleflowList + */ + public void updateStoreSaleFlowShangRui(Connection conn,List rmSaleflowList,List payflowList){ + if(CollectionUtil.isEmpty(rmSaleflowList)){ + log.info("销售流水记录为空"); + return; + } +// Connection conn =getConnection(dataBaseInfo.getIp(),dataBaseInfo.getUserName(), +// dataBaseInfo.getPassword(), dataBaseInfo.getDbPort(),dataBaseInfo.getDataBaseName()); + //try { + //conn.setAutoCommit(false); // 关闭自动提交，开启事务 + String sql = "INSERT INTO t_rm_saleflow (" + + "flow_id, flow_no, branch_no, item_no, source_price, sale_price, " + + "sale_qnty, sale_money, sell_way, oper_id, sale_man, counter_no, " + + "oper_date, remote_flag, shift_no, com_flag, spec_flag, pref_amt, " + + "in_price, n_stan, chr_stan, posid, uptime, " + + "paysum_flag, spec_sheet_no,kz_flag, update_date" + + ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)"; + String sql2 = "INSERT INTO t_rm_payflow (" + + "flow_id, flow_no, sale_amount, branch_no, pay_way, sell_way, " + + "card_no, vip_no, coin_no, coin_rate, pay_amount, oper_date, " + + "oper_id, counter_no, sale_man, memo,remote_flag, " + + "exchange_flag, shift_no, com_flag, uptime, " + + "kz_no" + + ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + try { + PreparedStatement ps = conn.prepareStatement(sql);//销售流水 + PreparedStatement ps2 = conn.prepareStatement(sql2);//资金流水 + int batchSize = 10; // 每批处理10条 + int count = 0; + for (int i=0;i'"+dataBaseInfo.getPriceOperatime()+"' " + " )"; + fileEndFix="price"; } dataBaseInfo.setWhere(where); // 记录总数 @@ -401,11 +405,11 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService } catch (JsonProcessingException e) { throw new RuntimeException(e); } - String code= writeToFileAndUploud(i,jsonString,commentModel,DicEnum.MUAL_1.getCode()); + String code= writeToFileAndUploud(i,jsonString,commentModel,DicEnum.MUAL_1.getCode(),fileEndFix); if (!HttpUtils.SUCCESSCODE.equals(code)) { continue; } - folders.add(String.valueOf(i)); + folders.add(i+"_"+fileEndFix); syncCount+=sxSyncGoods.size(); } //通知服务器上传cos @@ -435,15 +439,15 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService * @param commentModel * @return */ - private String writeToFileAndUploud(Integer page,String content,CommentModel commentModel,String syncType){ + private String writeToFileAndUploud(Integer page,String content,CommentModel commentModel,String syncType,String fileEndFix){ FileUtils fileUtils= new FileUtils(); File file=fileUtils.createFile(syncType,page); - String fileName=fileUtils.getFileName(syncType,page,FileUtils.txtEnd); + String fileName=fileUtils.getFileName(syncType,page,FileUtils.txtEnd,fileEndFix); String filePath=file.getAbsolutePath(); fileUtils.writeFile(filePath,fileName,content); String sign=CommonUtil.generateOpenSign(content,commentModel.getAppKey(),commentModel.getAppId()); commentModel.setSign(sign); - return webClientService.uploudSxData(filePath+FileUtils.pathSeparator+fileName,commentModel,page.toString(),syncType); + return webClientService.uploudSxData(filePath+FileUtils.pathSeparator+fileName,commentModel,page+"_"+fileEndFix,syncType); } /** @@ -766,6 +770,9 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService dataBaseInfo.setIsTowSync(storeDbConfig.getIsTowSync()); dataBaseInfo.setShopGapTime(storeDbConfig.getShopGapTime()); dataBaseInfo.setSaleAccount(storeDbConfig.getSaleAccount()); + dataBaseInfo.setIsSyncActive(storeDbConfig.getIsSyncActive()); + dataBaseInfo.setIsSyncMember(storeDbConfig.getIsSyncMember()); + dataBaseInfo.setClientVersion(storeDbConfig.getClientVersion()); return dataBaseInfo; } return new DataBaseInfo(); @@ -786,7 +793,8 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService +"?appKey="+commentModel.getAppKey() +"&sign="+commentModel.getAppId(),JSONObject.class); // String jsonStr="[{\"consumeId\":\"1986611923814223873\",\"orderId\":\"DD_20251107_1\",\"productNumber\":\"31011\",\"unitPrice\":10.90,\"quantity\":1.500,\"saleAmount\":16.35,\"status\":0,\"storeId\":78,\"createTime\":\"2025-11-07 01:49:26\",\"updateTime\":\"2025-11-07 01:49:26\"},{\"consumeId\":\"1986611923814223872\",\"orderId\":\"DD_20251107_2\",\"productNumber\":\"6909409023853\",\"unitPrice\":1.00,\"quantity\":1.000,\"saleAmount\":1.00,\"status\":0,\"storeId\":78,\"createTime\":\"2025-11-07 01:49:26\",\"updateTime\":\"2025-11-07 01:49:26\"},{\"consumeId\":\"1986611923814223874\",\"orderId\":\"DD_20251107_1\",\"productNumber\":\"6909409023853\",\"unitPrice\":1.00,\"quantity\":2.000,\"saleAmount\":2.00,\"status\":0,\"storeId\":78,\"createTime\":\"2025-11-07 01:49:26\",\"updateTime\":\"2025-11-07 01:49:26\"}]"; - + //String jsonObjectStr="{\"error_code\":0,\"error_msg\":\"success\",\"result\":[{\"consumeId\":\"1993254597656690689\",\"orderId\":\"DD_20251125_2\",\"productNumber\":\"10035\",\"unitPrice\":16.00,\"quantity\":-0.500,\"saleAmount\":8.00,\"status\":0,\"storeId\":78,\"createTime\":\"2025-11-25 09:45:03\",\"updateTime\":\"2025-11-25 09:45:03\",\"saleTime\":1764063651000},{\"consumeId\":\"1993254597656690688\",\"orderId\":\"DD_20251125_2\",\"productNumber\":\"6922896008127\",\"unitPrice\":8.80,\"quantity\":-1.000,\"saleAmount\":8.80,\"status\":0,\"storeId\":78,\"createTime\":\"2025-11-25 09:45:03\",\"updateTime\":\"2025-11-25 09:45:03\",\"saleTime\":1764063651000}]}"; + // JSONObject jsonObject=JSONUtil.parseObj(jsonObjectStr); if(null!=jsonObject.get("result")){ // Map map=(Map)jsonObject.get("result"); String jsonStr= jsonObject.getStr("result"); @@ -807,7 +815,6 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService productQuantityConsumptionDtoList.forEach(productQuantityConsumptionDto -> { productQuantityConsumptionDtoMap.put(productQuantityConsumptionDto.getOrderId()+"-"+productQuantityConsumptionDto.getProductNumber(),productQuantityConsumptionDto); }); - sxDataDao.updateStoreData(dataBaseInfo,map,productQuantityConsumptionDtoMap,productQuantityConsumptionDtoList,commentModel); }else { log.info("无线上流水同步"); @@ -867,9 +874,9 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService dataBaseInfo.setWhere(where); total = sxDataDao.getTotalSpecShop(dataBaseInfo); if(total==0){ - HttpUtils.postData(restTemplate,remoteIp+HttpUtils.URL_SYNC_REFRESH - +"?appKey="+commentModel.getAppKey() - +"&sign="+commentModel.getAppId(), new JSONArray()); +// HttpUtils.postData(restTemplate,remoteIp+HttpUtils.URL_SYNC_REFRESH +// +"?appKey="+commentModel.getAppKey() +// +"&sign="+commentModel.getAppId(), new JSONArray()); log.info("暂无活动商品同步"); return; } @@ -897,9 +904,9 @@ 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()); +// HttpUtils.postData(restTemplate,remoteIp+HttpUtils.URL_SYNC_REFRESH +// +"?appKey="+commentModel.getAppKey() +// +"&sign="+commentModel.getAppId(), new JSONArray()); } @@ -913,4 +920,12 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService return map; } + + @Override + public void refreshTime(CommentModel commentModel) { + HttpUtils.postData(restTemplate,remoteIp+HttpUtils.URL_SYNC_REFRESH + +"?appKey="+commentModel.getAppKey() + +"&sign="+commentModel.getAppId(), new JSONArray()); + } + }