tuisong xiugai

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/publish/CinemaPublish.java

@@ -61,8 +61,8 @@ public class CinemaPublish implements ProductPublish {
         Map<String, String> collect = byPath.stream().collect(Collectors.toMap(it -> JSONUtil.parseObj(it).get("name").toString(), it -> JSONUtil.parseObj(it).get("cityId").toString()));
 //
 
-        RegionModel region = productTriggerTask.getRegion();
-        String name = region.getName();
+        Object updateName = productTriggerTask.getScheduledTask().getParameter().get("updateName");
+        String name = String.valueOf(updateName);
         String s = collect.get(name);
         if (ObjectUtil.isEmpty(s)) {
             throw new RuntimeException("地区信息不匹配");

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/publish/ComingMoviePublish.java

@@ -61,8 +61,8 @@ public class ComingMoviePublish implements ProductPublish {
         Map<String, String> collect = byPath.stream().collect(Collectors.toMap(it -> JSONUtil.parseObj(it).get("name").toString(), it -> JSONUtil.parseObj(it).get("cityId").toString()));
 //
 
-        RegionModel region = productTriggerTask.getRegion();
-        String name = region.getName();
+        Object updateName = productTriggerTask.getScheduledTask().getParameter().get("updateName");
+        String name = String.valueOf(updateName);
         String s = collect.get(name);
         if (ObjectUtil.isEmpty(s)) {
             throw new RuntimeException("地区信息不匹配");

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/publish/HotelPublish.java

@@ -63,8 +63,8 @@ public class HotelPublish implements ProductPublish {
     public void trigger(ProductPushService updateService, ProductTriggerTaskModel productTriggerTask) {
 
 
-        RegionModel region = productTriggerTask.getRegion();
-        String name = region.getName();
+        Object updateName = productTriggerTask.getScheduledTask().getParameter().get("updateName");
+        String name = String.valueOf(updateName);
         QueryNewRequest queryNewRequest = new QueryNewRequest();
         queryNewRequest.setKeywords(name);
         QueryNewResponse queryNewResponse = domesticHotelApi.queryNew(queryNewRequest);

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/publish/KfcPublish.java

@@ -57,8 +57,8 @@ public class KfcPublish implements ProductPublish {
         CityListResponse cityListResponse = kfcApi.cityList();
         Map<String, String> collect = cityListResponse.getData().stream().collect(Collectors.toMap(it -> it.getName(), it -> it.getCityId()));
 
-        RegionModel region = productTriggerTask.getRegion();
-        String name = region.getName();
+        Object updateName = productTriggerTask.getScheduledTask().getParameter().get("updateName");
+        String name = String.valueOf(updateName);
         String s = collect.get(name);
         if (ObjectUtil.isEmpty(s)) {
             throw new RuntimeException("地区信息不匹配");

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/publish/MoviePublish.java

@@ -61,8 +61,8 @@ public class MoviePublish implements ProductPublish {
         Map<String, String> collect = byPath.stream().collect(Collectors.toMap(it -> JSONUtil.parseObj(it).get("name").toString(), it -> JSONUtil.parseObj(it).get("cityId").toString()));
 //
 
-        RegionModel region = productTriggerTask.getRegion();
-        String name = region.getName();
+        Object updateName = productTriggerTask.getScheduledTask().getParameter().get("updateName");
+        String name = String.valueOf(updateName);
         String s = collect.get(name);
         if (ObjectUtil.isEmpty(s)) {
             throw new RuntimeException("地区信息不匹配");

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/publish/PetrolStationPublish.java

@@ -61,8 +61,8 @@ public class PetrolStationPublish implements ProductPublish {
     public void trigger(ProductPushService updateService, ProductTriggerTaskModel productTriggerTask) {
 
 
-        RegionModel region = productTriggerTask.getRegion();
-        String name = region.getName();
+        Object updateName = productTriggerTask.getScheduledTask().getParameter().get("updateName");
+        String name = String.valueOf(updateName);
 
         xiaoJuStoreDao.findByCityNameContains(name).forEach(it -> {
 

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/publish/TicketPublish.java

@@ -53,8 +53,8 @@ public class TicketPublish implements ProductPublish {
     public void trigger(ProductPushService updateService, ProductTriggerTaskModel productTriggerTask) {
 
 
-        RegionModel region = productTriggerTask.getRegion();
-        String name = region.getName();
+        Object updateName = productTriggerTask.getScheduledTask().getParameter().get("updateName");
+        String name = String.valueOf(updateName);
 
         int page = 1;
         while (true) {

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/KfcServiceImpl.java

@@ -19,8 +19,6 @@ import com.zswl.cloud.springBatch.client.model.ypp.kfc.response.CityListResponse
 import com.zswl.cloud.springBatch.client.model.ypp.kfc.response.CreateOrdereResponse;
 import com.zswl.cloud.springBatch.client.model.ypp.kfc.response.ShopResponse;
 import com.zswl.cloud.springBatch.client.model.ypp.kfc.response.ShopsResponse;
-import com.zswl.cloud.springBatch.client.model.ypp.movie.response.CreateOrder2Response;
-import com.zswl.cloud.springBatch.client.model.ypp.movie.response.OrderDetailResponse;
 import com.zswl.cloud.springBtach.server.core.api.ypp.KfcApi;
 import com.zswl.cloud.springBtach.server.core.api.ypp.request.KfcGoodsDetailRequest;
 import com.zswl.cloud.springBtach.server.core.api.ypp.request.KfcShopDetailRequest;
@@ -106,7 +104,7 @@ public class KfcServiceImpl {
         createOrder2Model.setUserId(authHelper.getCurrentUser().getUserId());
         createOrder2Model.setShopId(shopId);
         JSONObject shopInfo = new JSONObject();
-        shopInfo.set("shopName", kfcGoodsDetailRequest.getShopName());
+        shopInfo.set("shopName", shop.getData().getShopName());
         shopInfo.set("ot", kfcGoodsDetailRequest.getOt());
         shopInfo.set("address", shop.getData().getAddress());
         createOrder2Model.setShopInfo(shopInfo);