fix

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/xiaoju/QueryApiStorePriceRequest.java

@@ -0,0 +1,16 @@
+package com.zswl.cloud.springBatch.client.model.xiaoju;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QueryApiStorePriceRequest {
+    private List<String> storeIds;
+    private String outUserId;
+
+}

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/service/XiaoJuService.java

@@ -2,8 +2,7 @@ package com.zswl.cloud.springBatch.client.service;
 
 import com.github.microservice.auth.client.content.ResultContent;
 import com.xiaoju.open.oil.interfaces.domain.StorePriceInfo;
-import com.xiaoju.open.oil.interfaces.request.QueryApiStorePriceRequest;
-import com.xiaoju.open.oil.interfaces.response.QueryApiStorePriceResponse;
+import com.zswl.cloud.springBatch.client.model.xiaoju.QueryApiStorePriceRequest;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/XiaoJuController.java

@@ -9,10 +9,10 @@ import com.xiaoju.open.oil.interfaces.domain.AllowancePromotionInfo;
 import com.xiaoju.open.oil.interfaces.domain.GenPromotionInfo;
 import com.xiaoju.open.oil.interfaces.domain.StorePriceInfo;
 import com.xiaoju.open.oil.interfaces.request.QueryApiOrderListRequest;
-import com.xiaoju.open.oil.interfaces.request.QueryApiStorePriceRequest;
 import com.xiaoju.open.oil.interfaces.request.QueryGetPromotionRequest;
 import com.xiaoju.open.oil.interfaces.response.*;
 import com.zswl.cloud.springBatch.client.model.request.*;
+import com.zswl.cloud.springBatch.client.model.xiaoju.QueryApiStorePriceRequest;
 import com.zswl.cloud.springBtach.server.core.domain.XiaoJuStore;
 import com.zswl.cloud.springBtach.server.core.service.impl.XiaoJuServiceImpl;
 import io.swagger.annotations.ApiOperation;

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

@@ -16,6 +16,7 @@ import com.xiaoju.open.oil.core.QueryClientFactory;
 import com.xiaoju.open.oil.core.executor.ResponseDTO;
 import com.xiaoju.open.oil.interfaces.domain.*;
 import com.xiaoju.open.oil.interfaces.request.*;
+import com.zswl.cloud.springBatch.client.model.xiaoju.QueryApiStorePriceRequest;
 import com.xiaoju.open.oil.interfaces.request.miniprogram.MiniCancelOrderStatusRequest;
 import com.xiaoju.open.oil.interfaces.response.*;
 import com.xiaoju.open.oil.security.secret.SecurityService;
@@ -162,20 +163,20 @@ public class XiaoJuServiceImpl implements XiaoJuService {
             Integer orderStatus = notificationOrderInfoRequest.getOrderStatus();
             switch (orderStatus) {
                 case 1:
-                    entries.set("waitPayment",notificationOrderInfoRequest);
+                    entries.set("waitPayment", notificationOrderInfoRequest);
                     updateGoodsModel.setGoodsState(OrderType.WAIT_PAYMENT);
                     break;
                 case 2:
-                    entries.set("notifyOrderInfo",notificationOrderInfoRequest);
+                    entries.set("notifyOrderInfo", notificationOrderInfoRequest);
                     updateGoodsModel.setGoodsState(OrderType.USED);
                     updateOrder2Model.setOrderType(OrderType.HAVE_PAID);
                     break;
                 case 6:
-                    entries.set("refund",notificationOrderInfoRequest);
+                    entries.set("refund", notificationOrderInfoRequest);
                     updateGoodsModel.setGoodsState(OrderType.REFUNDED);
                     break;
                 case 9:
-                    entries.set("close",notificationOrderInfoRequest);
+                    entries.set("close", notificationOrderInfoRequest);
                     updateGoodsModel.setGoodsState(OrderType.CLOSE);
                     updateOrder2Model.setOrderType(OrderType.CLOSE);
                     break;
@@ -278,7 +279,10 @@ public class XiaoJuServiceImpl implements XiaoJuService {
     }
 
     public ResultContent<List<StorePriceInfo>> queryStorePrice(QueryApiStorePriceRequest queryApiStorePriceRequest) {
-        queryApiStorePriceRequest.setOpenChannel(1);
+        com.xiaoju.open.oil.interfaces.request.QueryApiStorePriceRequest queryApiStorePriceRequest1 = new com.xiaoju.open.oil.interfaces.request.QueryApiStorePriceRequest();
+        queryApiStorePriceRequest1.setOutUserId(queryApiStorePriceRequest.getOutUserId());
+        queryApiStorePriceRequest1.setStoreIds(queryApiStorePriceRequest.getStoreIds());
+        queryApiStorePriceRequest1.setOpenChannel(1);
 
 
         QueryClient queryClient = QueryClientFactory.create(oilConfig);
@@ -287,7 +291,7 @@ public class XiaoJuServiceImpl implements XiaoJuService {
         apiLog.setRequest(JSONUtil.toJsonStr(queryApiStorePriceRequest));
         apiLog.setSystem("xiaoju");
         try {
-            List<QueryApiStorePriceResponse> list1 = queryClient.api().queryStorePrice(queryApiStorePriceRequest);
+            List<QueryApiStorePriceResponse> list1 = queryClient.api().queryStorePrice(queryApiStorePriceRequest1);
             apiLog.setResponse(JSONUtil.toJsonStr(list1));
             apiLogDao.save(apiLog);
             return ResultContent.buildContent(list1);
@@ -307,9 +311,9 @@ public class XiaoJuServiceImpl implements XiaoJuService {
             XiaoJuStore byStoreId = xiaoJuStoreDao.findByStoreId(storePriceInfo.getStoreId());
             JSONObject entries = JSONUtil.parseObj(byStoreId);
             List<ItemPriceInfo> itemInfoList = storePriceInfo.getItemInfoList();
-            entries.put("itemInfoList",itemInfoList);
+            entries.put("itemInfoList", itemInfoList);
 
-            stringStringHashMap.put(storePriceInfo.getStoreId(),JSONUtil.toJsonStr(entries));
+            stringStringHashMap.put(storePriceInfo.getStoreId(), JSONUtil.toJsonStr(entries));
 
         }
 
@@ -472,7 +476,7 @@ public class XiaoJuServiceImpl implements XiaoJuService {
             createOrder2Model.setChannel(xiaoJuQueryNewOrderModel.getChannel());
 
             ResultContent<CreatOrderResultModel> creat = orderService2.creat(createOrder2Model);
-            if (!creat.getState().equals(ResultState.Success)){
+            if (!creat.getState().equals(ResultState.Success)) {
                 throw new RuntimeException("创建订单失败");
             }
             log.info("创建订单结果：{}", JSONUtil.toJsonStr(creat.getContent()));
@@ -480,8 +484,6 @@ public class XiaoJuServiceImpl implements XiaoJuService {
             /*************************************************************************/
 
 
-
-
             UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
             updateGoodsModel.setExtend(JSONUtil.toJsonStr(queryNewOrderResponse));
             updateOrder(queryNewOrderResponse.getOutOrderId(), updateGoodsModel);