From 8c3312df658088a0aef2b6d4af17888fc546885a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 13 May 2024 14:43:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/MessageEnum.java | 12 +++---- .../service/impl/PreparationServiceImpl.java | 2 ++ .../store/controller/webc/TestController.java | 33 +++++++++++++++++++ 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index cb09f148d..6baf2aafc 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -125,16 +125,16 @@ public enum MessageEnum { URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=trainerUser×tamp="+System.currentTimeMillis()+"&userDetailId="+ paramMap.get("userDetailId"), StandardCharsets.UTF_8.name()); case MESSAGE_24: return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" + - URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining×tamp="+System.currentTimeMillis(), StandardCharsets.UTF_8.name()); + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=threeAcceptance×tamp="+System.currentTimeMillis(), StandardCharsets.UTF_8.name()); case MESSAGE_25: return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" + - URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining×tamp="+System.currentTimeMillis(), StandardCharsets.UTF_8.name()); + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=threeAcceptance×tamp="+System.currentTimeMillis(), StandardCharsets.UTF_8.name()); case MESSAGE_26: - return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" + - URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining×tamp="+System.currentTimeMillis()+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); + return domainUrl + "/dd-noticemsg?appId=" + appId+"&corpId="+corpId+"&page=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=openPlan×tamp="+System.currentTimeMillis()+"&lineId="+ paramMap.get("lineId")+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); case MESSAGE_27: - return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" + - URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining×tamp="+System.currentTimeMillis()+"&shopId="+ paramMap.get("shopId"), StandardCharsets.UTF_8.name()); + return domainUrl + "/dd-noticemsg?appId=" + appId+"&corpId="+corpId+"&page=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=orderList×tamp="+System.currentTimeMillis()+"&lineId="+ paramMap.get("lineId"), StandardCharsets.UTF_8.name()); default: return ""; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index 0b62ac5bb..b170620cb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -205,6 +205,7 @@ public class PreparationServiceImpl implements PreparationService { Map messageMap = new HashMap<>(); messageMap.put("storeName",shopInfo.getShopName()); messageMap.put("shopId",shopId.toString()); + messageMap.put("lineId", shopInfo.getLineId().toString()); messageMap.put("partnerUsername",lineInfo.getUsername()); messageMap.put("partnerMobile",lineInfo.getMobile()); commonService.sendMessage(Arrays.asList(shopInfo.getSupervisorUserId()), MessageEnum.MESSAGE_26, messageMap); @@ -215,6 +216,7 @@ public class PreparationServiceImpl implements PreparationService { Map messageMap1 = new HashMap<>(); messageMap1.put("storeName",shopInfo.getShopName()); messageMap1.put("shopId",shopId.toString()); + messageMap1.put("lineId", shopInfo.getLineId().toString()); messageMap1.put("partnerUsername",lineInfo.getUsername()); messageMap1.put("partnerMobile",lineInfo.getMobile()); commonService.sendMessage(Arrays.asList(shopInfo.getSupervisorUserId()), MessageEnum.MESSAGE_27, messageMap1); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java index c8769c8d7..247b9228e 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/TestController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.dao.*; import com.cool.store.dto.OpenCityDTO; import com.cool.store.entity.*; +import com.cool.store.job.XxlJobHandler; import com.cool.store.mapper.HyOpenAreaInfoMapper; import com.cool.store.request.xfsgFirstOrderListRequest; import com.cool.store.response.ResponseResult; @@ -50,6 +51,8 @@ public class TestController { @Resource private RegionService regionService; + @Resource + private XxlJobHandler xxlJobHandler; @PostMapping("/getFirstOrders") public ResponseResult getFirstOrders(@RequestBody xfsgFirstOrderListRequest storeCodeList) { xfsgFirstOderListResponse firstOrderList = coolStoreStartFlowService.getFirstOrderList(storeCodeList); @@ -174,4 +177,34 @@ public class TestController { RegionPathNameVO regionPathNameVO = regionService.getAllRegionName(regionId); return ResponseResult.success(regionPathNameVO); } + @GetMapping("/updateFirstOrder") + public ResponseResult updateFirstOrder(){ + xxlJobHandler.updateFirstOrder(); + return ResponseResult.success(); + } + @GetMapping("updateEntryTime") + public ResponseResult updateEntryTime(){ + xxlJobHandler.updateEntryTime(); + return ResponseResult.success(); + } + @GetMapping("/fitmentAcceptanceHandler") + public ResponseResult fitmentAcceptanceHandler(){ + xxlJobHandler.fitmentAcceptanceHandler(); + return ResponseResult.success(); + } + @GetMapping("/threeAcceptanceBookingMessage") + public ResponseResult threeAcceptanceBookingMessage(){ + xxlJobHandler.threeAcceptanceBookingMessage(); + return ResponseResult.success(); + } + @GetMapping("/threeAcceptanceMessage") + public ResponseResult threeAcceptanceMessage(){ + xxlJobHandler.threeAcceptanceMessage(); + return ResponseResult.success(); + } + @GetMapping("/waitThreeAcceptanceMessage") + public ResponseResult waitThreeAcceptanceMessage(){ + xxlJobHandler.waitThreeAcceptanceMessage(); + return ResponseResult.success(); + } }