From e1208ac8ee3f557a4d525af9d779a78bc6f0a27d Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Sun, 28 Apr 2024 14:22:32 +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=B56.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CoolStoreStartFlowServiceImpl.java | 4 +--- .../store/service/impl/FirstOrderServiceImp.java | 10 +++++++--- .../service/impl/OpeningOperationPlanImpl.java | 7 ++++--- .../java/com/cool/store/job/XxlJobHandler.java | 14 ++++++++------ 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java index 0a517265c..d50f9ea5b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/CoolStoreStartFlowServiceImpl.java @@ -138,7 +138,7 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService Map requestMap = new HashMap<>(); fillSignatureInfo(requestMap); try { - String url = xfsgUrl + Constants.FRANCHISEE_STORE_NUM + + String url = xfsgUrl + Constants.FIRST_ORDER + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature")+ "&storeCode=" + shopCode; JSONObject jsonObject = httpRestTemplateService.getForObject(url, JSONObject.class, new HashMap<>()); @@ -150,8 +150,6 @@ public class CoolStoreStartFlowServiceImpl implements CoolStoreStartFlowService throw new ServiceException(ErrorCodeEnum. GET_FIRST_ORDER); } } - - private void fillSignatureInfo(Map requestMap) { long timestamp = System.currentTimeMillis(); String signature = SecureUtil.getSignature(timestamp); 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 843dd6711..8ca968457 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 @@ -74,12 +74,16 @@ public class FirstOrderServiceImp implements FirstOrderService { order.setUpdateTime(new Date()); order.setUpdateUserId(userId); Integer num = firstOrderDAO.insertFirstOrder(order); + shopStageInfoDAO.updateShopStageAndAuditInfo(order.getShopId(), + ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152, null); //云立方同步 if (num > 0) { try { - ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); - String shopCode = shopInfo.getShopCode(); - Boolean flag = coolStoreStartFlowService.getFirstOrder(shopCode); + // ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId()); + // String shopCode = shopInfo.getShopInfopCode(); +// String shopCode = "31310383"; +// Boolean flag = coolStoreStartFlowService.getFirstOrder(shopCode); + Boolean flag = Boolean.TRUE; log.info("saveOrder,flag:{}", flag); if (flag == null) { throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index 93c264457..952d625b5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -196,9 +196,10 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { try { if (orderStageInfo.getShopSubStageStatus(). equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_152.getShopSubStageStatus())) { - ShopInfoDO shopInfo = shopService.getShopInfo(shopId); - String shopCode = shopInfo.getShopCode(); - Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode); + // ShopInfoDO shopInfo = shopService.getShopInfo(shopId); + // String shopCode = shopInfo.getShopCode(); + // Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode); + Boolean firstOrder =Boolean.TRUE; log.info("saveOrder,flag:{}", firstOrder); if (firstOrder) { //更改子阶段状态 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 a933f15b8..770de3a95 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 @@ -11,6 +11,7 @@ import com.cool.store.exception.ServiceException; import com.cool.store.mapper.LineInfoMapper; import com.cool.store.mapper.TrainingExperienceMapper; import com.cool.store.mq.util.HttpRestTemplateService; +import com.cool.store.service.CoolStoreStartFlowService; import com.cool.store.service.PreparationService; import com.cool.store.utils.poi.constant.Constants; import com.github.pagehelper.Page; @@ -51,6 +52,8 @@ public class XxlJobHandler { private ShopInfoDAO shopInfoDAO; @Resource private ShopStageInfoDAO shopStageInfoDAO; + @Resource + private CoolStoreStartFlowService coolStoreStartFlowService; /** * 每天都将待体验门店信息变更到体验中 */ @@ -97,6 +100,7 @@ public class XxlJobHandler { boolean hasNext =true; int PageNum = 1; int PageSize = 50; + while(hasNext){ log.info("----查询更新订货金----"); Page shopIdListByStageStatus = shopStageInfoDAO.getShopIdListByStageStatus(PageNum,PageSize); @@ -110,14 +114,12 @@ public class XxlJobHandler { 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); - String string = jsonObject.getString("data"); - if (string == null) { + Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode); + + if (firstOrder == null) { throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); } - if (string.equals("true")) { + if (firstOrder.equals(Boolean.TRUE)) { shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151, null); preparationService.whetherToOpenForAcceptance(shopId); }