.

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/dao/Impl/XiaoJuOrderDaoImpl.java

@@ -0,0 +1,8 @@
+package com.zswl.cloud.springBtach.server.core.dao.Impl;
+
+import com.zswl.cloud.springBtach.server.core.dao.extend.XiaoJuOrderDaoExtend;
+
+public class XiaoJuOrderDaoImpl implements XiaoJuOrderDaoExtend {
+
+
+}

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/dao/XiaoJuOrderDao.java

@@ -1,9 +1,10 @@
 package com.zswl.cloud.springBtach.server.core.dao;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
+import com.zswl.cloud.springBtach.server.core.dao.extend.XiaoJuOrderDaoExtend;
 import com.zswl.cloud.springBtach.server.core.domain.XiaoJuOrder;
 
-public interface XiaoJuOrderDao extends MongoDao<XiaoJuOrder> {
+public interface XiaoJuOrderDao extends MongoDao<XiaoJuOrder> , XiaoJuOrderDaoExtend {
 
     XiaoJuOrder findByOutOrderId(String outOrderId);
 }

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/dao/extend/XiaoJuOrderDaoExtend.java

@@ -0,0 +1,12 @@
+package com.zswl.cloud.springBtach.server.core.dao.extend;
+
+import com.zhongshu.payment.client.model.order.v2.UserSeachOrder2Model;
+import com.zswl.cloud.springBtach.server.core.domain.XiaoJuOrder;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+public interface XiaoJuOrderDaoExtend {
+
+
+//    Page<XiaoJuOrder> findUserOrder(UserSeachOrder2Model userSeachOrderModel, Pageable pageable);
+}

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

@@ -153,7 +153,7 @@ public class XiaoJuService {
 
             XiaoJuStore byStoreId = xiaoJuStoreDao.findByStoreId(storeId);
             List<StoreDetailItemInfo> itemInfoList = queryStoreDetailResponse.getItemInfoList();
-            if (ObjectUtil.isEmpty(byStoreId)){
+            if (ObjectUtil.isEmpty(byStoreId)) {
                 XiaoJuStore xiaoJuStore = new XiaoJuStore();
                 BeanUtils.copyProperties(queryStoreDetailResponse, xiaoJuStore);
                 xiaoJuStore.setLogo(queryStoreDetailResponse.getStoreLogo());
@@ -161,8 +161,6 @@ public class XiaoJuService {
                 xiaoJuStore.setPicList(queryStoreDetailResponse.getStorePicList());
 
 
-
-
                 List<ItemPriceInfoForCallback> itemInfoList1 = new ArrayList<>();
                 for (StoreDetailItemInfo storeDetailItemInfo : itemInfoList) {
                     ItemPriceInfoForCallback itemPriceInfoForCallback = new ItemPriceInfoForCallback();
@@ -172,7 +170,7 @@ public class XiaoJuService {
                 }
                 xiaoJuStore.setItemInfoList(itemInfoList1);
                 xiaoJuStoreDao.save(xiaoJuStore);
-            }else {
+            } else {
 
                 BeanUtils.copyProperties(queryStoreDetailResponse, byStoreId, "id", "updateTime");
                 byStoreId.setLocation(new double[]{queryStoreDetailResponse.getLon(), queryStoreDetailResponse.getLat()});
@@ -379,6 +377,34 @@ public class XiaoJuService {
     }
 
 
+
+    // 同步订单状态
+    public  void syncOrderStatus(SynOrderStatusRequest synOrderStatusRequest) {
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+
+        queryClient.api().syncOrderStatus(synOrderStatusRequest);
+
+    }
+
+
+    // 查询订单列表
+    public QueryApiOrderListResponse queryOrderList(QueryApiOrderListRequest queryApiOrderListRequest) {
+        String userId = authHelper.getCurrentUser().getUserId();
+
+        queryApiOrderListRequest.setMobile(authHelper.getCurrentUser().getPhone());
+        queryApiOrderListRequest.setOutUserId(userId);
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+
+        QueryApiOrderListResponse queryApiOrderListResponse = queryClient.api().queryOrderList(queryApiOrderListRequest);
+
+        return queryApiOrderListResponse;
+
+
+    }
+
+
     // 下单前查询最优可用券
     public ResultContent<List<AllowancePromotionInfo>> queryOrderPromotionList(XiaoJuQueryOrderPromotionListModel xiaoJuQueryOrderPromotionListModel) {
         String userId = authHelper.getCurrentUser().getUserId();
@@ -399,7 +425,7 @@ public class XiaoJuService {
             List<AllowancePromotionInfo> response = queryClient.promotion().queryOrderPromotionList(request);
             apiLog.setResponse(JSONUtil.toJsonStr(response));
             apiLogDao.save(apiLog);
-            return ResultContent.build(ResultState.Success,response);
+            return ResultContent.build(ResultState.Success, response);
         } catch (Exception e) {
             e.printStackTrace();
             apiLog.setResponse(e.getCause().getMessage());
@@ -429,7 +455,7 @@ public class XiaoJuService {
             List<AllowancePromotionInfo> response = queryClient.promotion().queryStorePromotionList(request);
             apiLog.setResponse(JSONUtil.toJsonStr(response));
             apiLogDao.save(apiLog);
-            return ResultContent.build(ResultState.Success,response);
+            return ResultContent.build(ResultState.Success, response);
         } catch (Exception e) {
             apiLog.setResponse(e.getCause().getMessage());
             apiLogDao.save(apiLog);
@@ -459,7 +485,7 @@ public class XiaoJuService {
             QueryUserPromotionListResponse response = queryClient.promotion().queryUserPromotionList(request);
             apiLog.setResponse(JSONUtil.toJsonStr(response));
             apiLogDao.save(apiLog);
-            return ResultContent.build(ResultState.Success,response);
+            return ResultContent.build(ResultState.Success, response);
         } catch (Exception e) {
 
             e.printStackTrace();

SpringBatchServiceServer/src/main/resources/application-dev.yml

@@ -52,8 +52,8 @@ xiaoju:
   dataSecret: mMkL/1/BVfLY8a2p
   dataSecretIV: mMkL/1/BVfLY8a2p
   sigSecret: NFKACWIUzimfacs=
-  serverUrl: https://gw.am.xiaojukeji.com/sandbox
-#  serverUrl: https://gw.am.xiaojukeji.com/pre
+#  serverUrl: https://gw.am.xiaojukeji.com/sandbox
+  serverUrl: https://gw.am.xiaojukeji.com/pre
 
 #logging:
 #  level: