gongfuzhu 1 год назад
Родитель
Сommit
d9fb1d327e

+ 7 - 0
SpringBatchServiceClient/pom.xml

@@ -68,5 +68,12 @@
             <artifactId>PaymentClient</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.xiaoju.open</groupId>
+            <artifactId>oil-core</artifactId>
+            <version>1.0.16</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/java/com/zswl/cloud/springBatch/client/lib/oil-sdk-jar-1.0.16.jar</systemPath>
+        </dependency>
     </dependencies>
 </project>

+ 0 - 0
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/lib/oil-sdk-jar-1.0.16.jar → SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/lib/oil-sdk-jar-1.0.16.jar


+ 0 - 7
SpringBatchServiceServer/pom.xml

@@ -99,13 +99,6 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>com.xiaoju.open</groupId>
-            <artifactId>oil-core</artifactId>
-            <version>1.0.16</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/src/main/java/com/zswl/cloud/springBtach/server/lib/oil-sdk-jar-1.0.16.jar</systemPath>
-        </dependency>
         <dependency>
             <groupId>com.github.microservice.components</groupId>
             <artifactId>MongodbData</artifactId>

+ 233 - 0
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/xiaoju/XiaoJuApi2.java

@@ -0,0 +1,233 @@
+package com.zswl.cloud.springBtach.server.core.api.xiaoju;
+
+import com.google.gson.Gson;
+import com.xiaoju.open.oil.commons.config.OilConfig;
+import com.xiaoju.open.oil.core.QueryClient;
+import com.xiaoju.open.oil.core.QueryClientFactory;
+import com.xiaoju.open.oil.interfaces.domain.AllowanceInfo;
+import com.xiaoju.open.oil.interfaces.domain.AllowancePromotionInfo;
+import com.xiaoju.open.oil.interfaces.domain.CalBatchPriceItemInfo;
+import com.xiaoju.open.oil.interfaces.domain.GenPromotionInfo;
+import com.xiaoju.open.oil.interfaces.request.*;
+import com.xiaoju.open.oil.interfaces.response.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Component
+public class XiaoJuApi2 {
+
+
+
+    @Autowired
+    OilConfig oilConfig;
+
+    // 查询门店详情
+    public void queryStoreDetail() {
+
+        QueryStoreDetailRequest queryStoreDetailRequest = new QueryStoreDetailRequest();
+
+        queryStoreDetailRequest.setLat(28.4004F);
+        queryStoreDetailRequest.setLon(112.7921F);
+        queryStoreDetailRequest.setOutUserId("dajihao2");
+        queryStoreDetailRequest.setStoreId("5154031457384536897");
+        queryStoreDetailRequest.setOpenChannel(1);
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        QueryStoreDetailResponse queryStoreDetailResponse = queryClient.api().queryStoreDetail(queryStoreDetailRequest);
+
+        System.out.println(new Gson().toJson(queryStoreDetailResponse));
+
+    }
+
+    // 查询门店价格
+    public void queryStorePrice() {
+
+        QueryApiStorePriceRequest queryApiStorePriceRequest = new QueryApiStorePriceRequest();
+        queryApiStorePriceRequest.setOpenChannel(1);
+        queryApiStorePriceRequest.setOutUserId("dajihao2");
+        List<String> list = new ArrayList<>();
+        list.add("5154031457384536897");
+        queryApiStorePriceRequest.setStoreIds(list);
+
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        List<QueryApiStorePriceResponse> list1 = queryClient.api().queryStorePrice(queryApiStorePriceRequest);
+
+        System.out.println(new Gson().toJson(list1));
+
+    }
+
+
+    // 价格计算
+    public void queryCalPrice() {
+        QueryCalPriceRequest queryCalPriceRequest = new QueryCalPriceRequest();
+        queryCalPriceRequest.setStoreId("5154031457384536897");
+        queryCalPriceRequest.setOpenChannel(1);
+        queryCalPriceRequest.setOutUserId("a09kWkRLM2ZWcWs9");
+        queryCalPriceRequest.setItemName("92#");
+        queryCalPriceRequest.setAmount(20000);
+
+//        // 优惠券
+//        List<AllowanceInfo> allowanceInfos = new ArrayList<>();
+//        AllowanceInfo allowanceInfo = new AllowanceInfo();
+//        allowanceInfo.setAllowanceId("E1-4ji-1kiJSL");
+//        allowanceInfo.setAllowanceType(2);
+//        allowanceInfos.add(allowanceInfo);
+//
+//        queryCalPriceRequest.setPromotionInfo(allowanceInfos);
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        QueryCalPriceResponse queryCalPriceResponse = queryClient.api().queryCalPrice(queryCalPriceRequest);
+
+        System.out.println(new Gson().toJson(queryCalPriceResponse));
+
+    }
+
+    // 批量价格计算
+    public void queryCalPrices() {
+        QueryCalBatchPriceRequest queryCalPriceRequest = new QueryCalBatchPriceRequest();
+        queryCalPriceRequest.setStoreId("5154031457384536897");
+        queryCalPriceRequest.setOpenChannel(1);
+        queryCalPriceRequest.setOutUserId("1640563200");
+
+        // 优惠券
+        List<CalBatchPriceItemInfo> itemList = new ArrayList<>();
+        CalBatchPriceItemInfo calBatchPriceItemInfo = new CalBatchPriceItemInfo();
+        calBatchPriceItemInfo.setItemName("92#");
+        calBatchPriceItemInfo.setAmount(20000);
+        itemList.add(calBatchPriceItemInfo);
+
+        queryCalPriceRequest.setItemList(itemList);
+
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        QueryCalBatchPriceResponse queryCalBatchPriceResponse = queryClient.api().queryCalPrices(queryCalPriceRequest);
+
+        System.out.println(new Gson().toJson(queryCalBatchPriceResponse));
+
+    }
+
+    // 创建订单
+    public void queryNewOrder() {
+        QueryNewOrderRequest queryNewOrderRequest = new QueryNewOrderRequest();
+        queryNewOrderRequest.setOutUserId("a09kWkRLM2ZWcWs9");
+        queryNewOrderRequest.setMobile("13111222233");
+        queryNewOrderRequest.setOutOrderId("123456789");
+        queryNewOrderRequest.setLat(114.30F);
+        queryNewOrderRequest.setLon(14.23F);
+        queryNewOrderRequest.setStoreId("5211967762877389105");
+        queryNewOrderRequest.setItemId(4879454965524071453L);
+        queryNewOrderRequest.setGunNo("10");
+        queryNewOrderRequest.setOriginalAmount(20000);
+        queryNewOrderRequest.setPaymentAmount(18000);
+        queryNewOrderRequest.setServiceFee(20);
+        queryNewOrderRequest.setLitre(382);
+        queryNewOrderRequest.setVipPrice(460);
+        queryNewOrderRequest.setStorePrice(523);
+
+        // 优惠券
+        List<AllowanceInfo> allowanceInfos = new ArrayList<>();
+        AllowanceInfo allowanceInfo = new AllowanceInfo();
+        allowanceInfo.setAllowanceId("E1-4ji-1kiJSL");
+        allowanceInfo.setAllowanceType(2);
+        allowanceInfos.add(allowanceInfo);
+
+        queryNewOrderRequest.setPromotionInfo(allowanceInfos);
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        QueryNewOrderResponse queryNewOrderResponse = queryClient.api().queryNewOrder(queryNewOrderRequest);
+
+        System.out.println(new Gson().toJson(queryNewOrderResponse));
+
+    }
+
+    // 同步订单状态
+    public void syncOrderStatus() {
+        SynOrderStatusRequest synOrderStatusRequest = new SynOrderStatusRequest();
+        synOrderStatusRequest.setOutOrderId("123456789");
+        synOrderStatusRequest.setXjOrderId("3476780108933473940");
+        synOrderStatusRequest.setOrderStatus(9);
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        queryClient.api().syncOrderStatus(synOrderStatusRequest);
+
+    }
+
+    // 退款状态同步
+    public void SyncRefundStatus() {
+        SynRefundStatusRequest synRefundStatusRequest = new SynRefundStatusRequest();
+        synRefundStatusRequest.setOutOrderId("123456789");
+        synRefundStatusRequest.setXjOrderId("35489273812090023831");
+        synRefundStatusRequest.setRefundStatus(1);
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        queryClient.api().syncRefundStatus(synRefundStatusRequest);
+    }
+
+
+    // 下单前查询最优可用券
+    public void queryOrderPromotionList() {
+        QueryOrderPromotionListRequest request = new QueryOrderPromotionListRequest();
+        request.setMobile("15210240132");
+        request.setOutUserId("80200281708");
+        request.setStoreId("5429504232738269218");
+        request.setAllowanceType(2);
+        request.setOrderAmount(24500);
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        List<AllowancePromotionInfo> response = queryClient.promotion().queryOrderPromotionList(request);
+
+        System.out.println(response);
+    }
+
+    // 查询多个门店可用券
+    public void queryStorePromotionList() {
+        QueryStorePromotionListRequest request = new QueryStorePromotionListRequest();
+        request.setMobile("152102401323");
+        request.setAllowanceType(2);
+        request.setOutUserId("1223131");
+        List<String> storeIdList = new ArrayList<String>();
+        storeIdList.add("5429504232738269218");
+        request.setStoreIdList(storeIdList);
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        List<AllowancePromotionInfo> response = queryClient.promotion().queryStorePromotionList(request);
+
+        System.out.println();
+    }
+
+    // 查询用户所有券列表
+    public void queryUserPromotionList() {
+        QueryUserPromotionListRequest request = new QueryUserPromotionListRequest();
+        request.setAllowanceType(2);
+        request.setOrderAmount(2400);
+
+        request.setMobile("13758284401");
+        request.setOutUserId("dajihao");
+
+
+        request.setStatus(-2);
+        request.setPageIndex(1);
+        request.setPageSize(20);
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        QueryUserPromotionListResponse response = queryClient.promotion().queryUserPromotionList(request);
+
+        System.out.println(response);
+
+    }
+
+    // 获取优惠券
+    public void getPromotion() {
+        QueryGetPromotionRequest request = new QueryGetPromotionRequest();
+        request.setOutUserId("18874");
+        request.setActivityId("983425694278877184");
+        request.setTradeNo("2202071307003069990");
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+        List<GenPromotionInfo> response = queryClient.promotion().getPromotion(request);
+
+        System.out.println();
+    }
+
+
+}

+ 2 - 2
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/xiaoju/XiaoJunConfig.java

@@ -1,6 +1,8 @@
 package com.zswl.cloud.springBtach.server.core.api.xiaoju;
 
 import com.xiaoju.open.oil.commons.config.OilConfig;
+import com.xiaoju.open.oil.core.QueryClient;
+import com.xiaoju.open.oil.core.QueryClientFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -28,7 +30,6 @@ public class XiaoJunConfig {
 
     @Bean
     public OilConfig config() {
-
         OilConfig oilConfig = new OilConfig();
         oilConfig.setAppId(appid);
         oilConfig.setAppSecret(appSecret);
@@ -42,5 +43,4 @@ public class XiaoJunConfig {
     }
 
 
-
 }

+ 6 - 7
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/XiaoJuController.java

@@ -1,13 +1,10 @@
 package com.zswl.cloud.springBtach.server.core.controller;
 
-import com.github.microservice.auth.client.content.ResultContent;
-import com.github.microservice.auth.security.annotations.ResourceAuth;
-import com.github.microservice.auth.security.type.AuthType;
-import com.zhongshu.payment.client.model.payment.CreateResponseModel;
-import com.zhongshu.payment.client.model.payment.zswl.CreatePaymentModel;
-import com.zswl.cloud.springBtach.server.core.api.xiaoju.sdk.request.NotificationPushStoreInfoRequest;
+import com.xiaoju.open.oil.interfaces.request.NotificationPushStoreInfoRequest;
+import com.zswl.cloud.springBtach.server.core.service.XiaoJuService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -18,12 +15,14 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("xiaoju")
 public class XiaoJuController {
 
+    @Autowired
+    XiaoJuService xiaoJuService;
 
     @ApiOperation("同步加油站信息")
     @RequestMapping(value = "receivingGasStation", method = RequestMethod.POST)
     public String receivingGasStation(@RequestBody NotificationPushStoreInfoRequest notificationPushStoreInfoRequest) {
 
-        log.info("同步加油站信息:{}", notificationPushStoreInfoRequest);
+        xiaoJuService.notificationPushStoreInfoRequest(notificationPushStoreInfoRequest);
         return "ddddddd";
     }
 

+ 3 - 0
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/dao/XiaoJuStoreDao.java

@@ -4,4 +4,7 @@ import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
 import com.zswl.cloud.springBtach.server.core.domain.XiaoJuStore;
 
 public interface XiaoJuStoreDao extends MongoDao<XiaoJuStore> {
+
+
+    XiaoJuStore findByStoreId(String storeId);
 }

+ 5 - 3
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/domain/XiaoJuStore.java

@@ -1,10 +1,12 @@
 package com.zswl.cloud.springBtach.server.core.domain;
 
+import cn.hutool.json.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import com.github.microservice.components.data.mongo.mongo.domain.SuperEntity;
+import org.bson.json.JsonObject;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.List;
@@ -16,12 +18,14 @@ import java.util.List;
 @NoArgsConstructor
 public class XiaoJuStore  extends SuperEntity{
 
+
     private String storeId;
     private String storeName;
     private String address;
     private Float lat;
     private Float lon;
     private String cityName;
+    private String brandId;
     private String provinceName;
     private String brandName;
     private String tel;
@@ -29,10 +33,8 @@ public class XiaoJuStore  extends SuperEntity{
     private String openTimeHourEnd;
     private String logo;
     private List<String> picList;
-    private List<Object> itemInfoList;
     private Integer status;
     private Integer invoiceManner;
     private List<String> marketTags;
-
-
+    private JSONObject itemInfoList;
 }

+ 66 - 0
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/XiaoJuService.java

@@ -0,0 +1,66 @@
+package com.zswl.cloud.springBtach.server.core.service;
+
+
+import cn.hutool.json.JSONUtil;
+import com.github.microservice.auth.security.helper.AuthHelper;
+import com.xiaoju.open.oil.commons.config.OilConfig;
+import com.xiaoju.open.oil.core.QueryClient;
+import com.xiaoju.open.oil.core.QueryClientFactory;
+import com.xiaoju.open.oil.interfaces.request.NotificationPushStoreInfoRequest;
+import com.xiaoju.open.oil.interfaces.request.QueryStoreDetailRequest;
+import com.xiaoju.open.oil.interfaces.response.QueryStoreDetailResponse;
+import com.zswl.cloud.springBtach.server.core.dao.XiaoJuStoreDao;
+import com.zswl.cloud.springBtach.server.core.domain.XiaoJuStore;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class XiaoJuService {
+
+
+    @Autowired
+    AuthHelper authHelper;
+
+    @Autowired
+    XiaoJuStoreDao xiaoJuStoreDao;
+
+    @Autowired
+    OilConfig oilConfig;
+
+    public QueryStoreDetailResponse queryStoreDetail(String storeId) {
+        XiaoJuStore byStoreId = xiaoJuStoreDao.findByStoreId(storeId);
+        QueryStoreDetailRequest queryStoreDetailRequest = new QueryStoreDetailRequest();
+
+        queryStoreDetailRequest.setOutUserId(authHelper.getCurrentUser().getUserId());
+        queryStoreDetailRequest.setStoreId(storeId);
+        queryStoreDetailRequest.setLat(byStoreId.getLat());
+        queryStoreDetailRequest.setLon(byStoreId.getLon());
+        queryStoreDetailRequest.setOpenChannel(1);
+
+        QueryClient queryClient = QueryClientFactory.create(oilConfig);
+
+        QueryStoreDetailResponse queryStoreDetailResponse = queryClient.api().queryStoreDetail(queryStoreDetailRequest);
+
+        return queryStoreDetailResponse;
+    }
+
+
+
+
+
+    public void notificationPushStoreInfoRequest(NotificationPushStoreInfoRequest notificationPushStoreInfoRequest){
+
+        XiaoJuStore xiaoJuStore = new XiaoJuStore();
+        BeanUtils.copyProperties(notificationPushStoreInfoRequest, xiaoJuStore);
+        xiaoJuStore.setItemInfoList(JSONUtil.parseObj(notificationPushStoreInfoRequest.getItemInfoList()));
+        xiaoJuStoreDao.save(xiaoJuStore);
+
+
+    }
+
+
+
+
+
+}