优惠券开发接口

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

@@ -0,0 +1,25 @@
+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 AllowancePromotionInfo {
+    private String allowanceId;
+    private String promotionDesc;
+    private Integer amount;
+    private Integer discount;
+    private Integer promotionType;
+    private Integer status;
+    private String statusDesc;
+    private String startTimestamp;
+    private String endTimestamp;
+    private Boolean restrict;
+
+
+}

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

@@ -0,0 +1,30 @@
+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 GenPromotionInfo {
+    private int allowanceType;
+    private int promotionType;
+    private String promotionDesc;
+    private int amount;
+    private int discount;
+    private List<Promotion> promotionInfo;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Promotion {
+        private String allowanceId;
+        private String batchId;
+        private Object status;
+    }
+
+
+}

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

@@ -0,0 +1,20 @@
+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 QueryUserPromotionListResponse {
+    private Integer pageIndex;
+    private Integer pageSize;
+    private Integer totalSize;
+    private Integer totalPage;
+    private List<AllowancePromotionInfo> data;
+
+
+}

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

@@ -1,11 +1,10 @@
 package com.zswl.cloud.springBatch.client.service;
 
 import com.github.microservice.auth.client.content.ResultContent;
-import com.xiaoju.open.oil.interfaces.domain.GenPromotionInfo;
-import com.xiaoju.open.oil.interfaces.response.QueryUserPromotionListResponse;
 import com.zswl.cloud.springBatch.client.model.request.XiaoJuQueryUserPromotionListModel;
 import com.zswl.cloud.springBatch.client.model.xiaoju.QueryApiStorePriceRequest;
 import com.zswl.cloud.springBatch.client.model.xiaoju.QueryGetPromotionRequest;
+import com.zswl.cloud.springBatch.client.model.xiaoju.QueryUserPromotionListResponse;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -31,7 +30,7 @@ public interface XiaoJuService {
 
     @ApiOperation("发放优惠券")
     @RequestMapping(value = "getPromotion", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
-    ResultContent<List<GenPromotionInfo>> getPromotion(@RequestBody QueryGetPromotionRequest queryGetPromotionRequest);
+    ResultContent<List<com.zswl.cloud.springBatch.client.model.xiaoju.GenPromotionInfo>> getPromotion(@RequestBody QueryGetPromotionRequest queryGetPromotionRequest);
 
 
 }

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

@@ -645,7 +645,7 @@ public class XiaoJuServiceImpl implements XiaoJuService {
     }
 
     // 查询用户所有券列表
-    public ResultContent<QueryUserPromotionListResponse> queryUserPromotionList(XiaoJuQueryUserPromotionListModel xiaoJuQueryUserPromotionListModel) {
+    public ResultContent<com.zswl.cloud.springBatch.client.model.xiaoju.QueryUserPromotionListResponse> queryUserPromotionList(XiaoJuQueryUserPromotionListModel xiaoJuQueryUserPromotionListModel) {
 
         QueryUserPromotionListRequest request = new QueryUserPromotionListRequest();
         request.setMobile(xiaoJuQueryUserPromotionListModel.getMobile());
@@ -675,7 +675,7 @@ public class XiaoJuServiceImpl implements XiaoJuService {
         }
     }
 
-    public ResultContent<List<GenPromotionInfo>> getPromotion(com.zswl.cloud.springBatch.client.model.xiaoju.QueryGetPromotionRequest queryGetPromotionRequest){
+    public ResultContent<List<com.zswl.cloud.springBatch.client.model.xiaoju.GenPromotionInfo>> getPromotion(com.zswl.cloud.springBatch.client.model.xiaoju.QueryGetPromotionRequest queryGetPromotionRequest) {
         QueryClient queryClient = QueryClientFactory.create(oilConfig);
         ApiLog apiLog = new ApiLog();
         apiLog.setService("queryUserPromotionList");
@@ -692,6 +692,12 @@ public class XiaoJuServiceImpl implements XiaoJuService {
             xiaoJuActivityReceiverDao.save(xiaoJuActivityReceiver);
             apiLog.setResponse(JSONUtil.toJsonStr(response));
             apiLogDao.save(apiLog);
+//            ArrayList< com.zswl.cloud.springBatch.client.model.xiaoju.GenPromotionInfo> objects = new ArrayList<>();
+//            for (GenPromotionInfo genPromotionInfo : response) {
+//                com.zswl.cloud.springBatch.client.model.xiaoju.GenPromotionInfo s = new com.zswl.cloud.springBatch.client.model.xiaoju.GenPromotionInfo();
+//                BeanUtils.copyProperties(genPromotionInfo, s);
+//
+//            }
             return ResultContent.buildContent(response);
         } catch (Exception e) {
             e.printStackTrace();
@@ -702,6 +708,7 @@ public class XiaoJuServiceImpl implements XiaoJuService {
         }
 
     }
+
     // 券发放
     public ResultContent<List<GenPromotionInfo>> getPromotion(String activityId) {
         AuthDetails currentUser = authHelper.getCurrentUser();
@@ -739,8 +746,8 @@ public class XiaoJuServiceImpl implements XiaoJuService {
         xiaoJuQueryUserPromotionListModel.setMobile(currentUser.getPhone());
         xiaoJuQueryUserPromotionListModel.setOutUserId(currentUser.getUserId());
 
-        ResultContent<QueryUserPromotionListResponse> queryUserPromotionListResponseResultContent = queryUserPromotionList(xiaoJuQueryUserPromotionListModel);
-        QueryUserPromotionListResponse queryUserPromotionListResponse = queryUserPromotionListResponseResultContent.getContent();
+        ResultContent<com.zswl.cloud.springBatch.client.model.xiaoju.QueryUserPromotionListResponse> queryUserPromotionListResponseResultContent = queryUserPromotionList(xiaoJuQueryUserPromotionListModel);
+        com.zswl.cloud.springBatch.client.model.xiaoju.QueryUserPromotionListResponse queryUserPromotionListResponse = queryUserPromotionListResponseResultContent.getContent();
 
         if (queryUserPromotionListResponse.getTotalSize() != 0) {
             return ResultContent.build(ResultState.Fail, "有未消费的优惠券，请先使用");