From 51849f02d2b884f07b59c1338994d877c152d798 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 25 Apr 2024 21:03:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E4=B8=9A=E7=AD=B9=E5=A4=87=E9=98=B6?= =?UTF-8?q?=E6=AE=B52.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dao/ShopStageInfoDAO.java | 5 ++- .../store/mapper/ShopStageInfoMapper.java | 2 +- .../resources/mapper/ShopStageInfoMapper.xml | 6 --- .../service/impl/FirstOrderServiceImp.java | 14 +++---- .../webc/MiniOpenPreparationController.java | 8 ++-- .../com/cool/store/job/XxlJobHandler.java | 40 ++++++++++++------- 6 files changed, 40 insertions(+), 35 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index 3cf4d934c..08b84d38b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -146,7 +146,8 @@ public class ShopStageInfoDAO { ShopSubStageStatusEnum shopSubStageStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21; return shopStageInfoMapper.getRentContractToDoPage(userId, shopSubStageStatus.getShopSubStageEnum().getShopSubStage(), shopSubStageStatus.getShopSubStageStatus()); } - public List getShopIdListByStageStatus(List shopIdList){ - return shopStageInfoMapper.getShopIdListByStageStatus(shopIdList); + public Page getShopIdListByStageStatus( Integer pageNum, Integer pageSize){ + PageHelper.startPage(pageNum, pageSize); + return shopStageInfoMapper.getShopIdListByStageStatus(); } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java index eadd30419..68ef29631 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java @@ -91,5 +91,5 @@ public interface ShopStageInfoMapper extends Mapper { * @Date: 2024/4/25 * @description:获取处于订货金阶段的shopid */ - List getShopIdListByStageStatus(@Param("shopIdList")List shopIdList); + Page getShopIdListByStageStatus(); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml index 967db7160..7a159198f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml @@ -137,12 +137,6 @@ select shop_id from xfsg_shop_stage_info where shop_stage = 2 and shop_sub_stage = 150 and shop_sub_stage_status= 1505 and is_terminated = 0 - - and shop_id in - - #{shopId} - - \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java index cd7b29885..a122e781d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java @@ -75,18 +75,18 @@ public class FirstOrderServiceImp implements FirstOrderService { order.setUpdateTime(new Date()); order.setUpdateUserId(userId); } - Integer flag = firstOrderDAO.insertFirstOrder(order); + Integer num = firstOrderDAO.insertFirstOrder(order); //云立方同步 - if (flag > 0) { + if (num > 0) { try { ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); String shopCode = shopInfo.getShopCode(); - String data = coolStoreStartFlowService.getFirstOrder(shopCode).getData().toString(); - log.info("saveOrder,data:{}", data); - if (data == null) { + Boolean flag = coolStoreStartFlowService.getFirstOrder(shopCode); + log.info("saveOrder,flag:{}", flag); + if (flag == null) { throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); } - if (data.equals("true")) { + if (flag) { //更改子阶段状态 shopStageInfoDAO.updateShopStageAndAuditInfo(order.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151, null); @@ -96,7 +96,7 @@ public class FirstOrderServiceImp implements FirstOrderService { log.error("获取鲜丰订货金异常", e); } } - return flag; + return num; } @Override diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpenPreparationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpenPreparationController.java index 350eb6ef3..6a82eb3e5 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpenPreparationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniOpenPreparationController.java @@ -85,12 +85,12 @@ public class MiniOpenPreparationController { equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus())) { ShopInfoDO shopInfo = shopService.getShopInfo(shopId); String shopCode = shopInfo.getShopCode(); - String data = coolStoreStartFlowService.getFirstOrder(shopCode).getData().toString(); - log.info("saveOrder,data:{}", data); - if (data == null) { + Boolean flag = coolStoreStartFlowService.getFirstOrder(shopCode); + log.info("saveOrder,flag:{}", flag); + if (flag == null) { throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); } - if (data.equals("true")) { + if (flag) { //更改子阶段状态 shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151, null); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java index 53287b214..d53b5b31c 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java @@ -13,6 +13,7 @@ import com.cool.store.mapper.TrainingExperienceMapper; import com.cool.store.mq.util.HttpRestTemplateService; import com.cool.store.service.PreparationService; import com.cool.store.utils.poi.constant.Constants; +import com.github.pagehelper.Page; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; @@ -24,6 +25,7 @@ import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; @Slf4j @@ -94,19 +96,22 @@ public class XxlJobHandler { */ @XxlJob("updateFirstOrder") public void updateFirstOrder() { - log.info("----查询更新订货金----"); - List shopIdListByStage = shopInfoDAO.queryShopIdListByStage(); - if (CollectionUtils.isEmpty(shopIdListByStage)) { - log.info("------今日没有待更新数据------"); - return; - } - List shopIdListByStageStatus = shopStageInfoDAO.getShopIdListByStageStatus(shopIdListByStage); - List openPlanShopInfoDTOS = shopInfoDAO.queryShopCodeListByid(shopIdListByStageStatus); - Map map = openPlanShopInfoDTOS.stream(). - collect(Collectors.toMap(OpenPlanShopInfoDTO::getShopId, OpenPlanShopInfoDTO::getShopCode)); - for (Long shopId : map.keySet()){ - String shopCode = map.get(shopId); - try { + boolean hasNext =true; + int PageNum = 1; + int PageSize = 50; + while(hasNext){ + log.info("----查询更新订货金----"); + Page shopIdListByStageStatus = shopStageInfoDAO.getShopIdListByStageStatus(PageNum,PageSize); + if (CollectionUtils.isEmpty(shopIdListByStageStatus)) { + log.info("------今日没有待更新数据------"); + return; + } + List openPlanShopInfoDTOS = shopInfoDAO.queryShopCodeListByid(shopIdListByStageStatus); + Map map = openPlanShopInfoDTOS.stream(). + collect(Collectors.toMap(OpenPlanShopInfoDTO::getShopId, OpenPlanShopInfoDTO::getShopCode)); + for (Long shopId : map.keySet()){ + String shopCode = map.get(shopId); + try { String url = xfsgUrl + Constants.FIRST_ORDER + "?storeCode=" + shopCode; JSONObject jsonObject = httpRestTemplateService.getForObject(url, JSONObject.class, new HashMap<>()); log.info("updateFirstOrder url:{},jsonObject:{}",url,jsonObject); @@ -117,11 +122,16 @@ public class XxlJobHandler { if (string.equals("true")) { shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151, null); preparationService.whetherToOpenForAcceptance(shopId); + } + }catch (Exception e) { + log.error("获取鲜丰订货金异常",e); } - }catch (Exception e) { - log.error("获取鲜丰订货金异常",e); } + hasNext = shopIdListByStageStatus.size() >= PageSize; + PageNum++; + } + } }