返回类型

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

@@ -0,0 +1,29 @@
+package com.zswl.cloud.springBatch.client.model.xiaoju;
+
+import com.xiaoju.open.oil.interfaces.domain.GenPromotionInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class QueryGetPromotionResponse {
+    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/service/XiaoJuService.java

@@ -2,16 +2,13 @@ package com.zswl.cloud.springBatch.client.service;
 
 import com.github.microservice.auth.client.content.ResultContent;
 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 com.zswl.cloud.springBatch.client.model.xiaoju.*;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import com.zswl.cloud.springBatch.client.model.xiaoju.GenPromotionInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -31,7 +28,7 @@ public interface XiaoJuService {
 
     @ApiOperation("发放优惠券")
     @RequestMapping(value = "getPromotion", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
-    ResultContent getPromotion(@RequestBody QueryGetPromotionRequest queryGetPromotionRequest);
+    ResultContent<List<QueryGetPromotionResponse>> getPromotion(@RequestBody QueryGetPromotionRequest queryGetPromotionRequest);
 
 
 }

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

@@ -34,6 +34,7 @@ import com.zhongshu.payment.client.type.TransferType;
 import com.zswl.cloud.shop.client.dto.life.TripartiteShopDto;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.springBatch.client.model.request.*;
+import com.zswl.cloud.springBatch.client.model.xiaoju.QueryGetPromotionResponse;
 import com.zswl.cloud.springBatch.client.service.XiaoJuService;
 import com.zswl.cloud.springBtach.server.core.dao.*;
 import com.zswl.cloud.springBtach.server.core.domain.*;
@@ -673,7 +674,7 @@ public class XiaoJuServiceImpl implements XiaoJuService {
         }
     }
 
-    public ResultContent<List<com.zswl.cloud.springBatch.client.model.xiaoju.GenPromotionInfo>> getPromotion(com.zswl.cloud.springBatch.client.model.xiaoju.QueryGetPromotionRequest queryGetPromotionRequest) {
+    public ResultContent<List<QueryGetPromotionResponse>> getPromotion(com.zswl.cloud.springBatch.client.model.xiaoju.QueryGetPromotionRequest queryGetPromotionRequest) {
         QueryClient queryClient = QueryClientFactory.create(oilConfig);
         ApiLog apiLog = new ApiLog();
         apiLog.setService("getPromotion");
@@ -690,7 +691,14 @@ public class XiaoJuServiceImpl implements XiaoJuService {
             xiaoJuActivityReceiverDao.save(xiaoJuActivityReceiver);
             apiLog.setResponse(JSONUtil.toJsonStr(response));
             apiLogDao.save(apiLog);
-            return ResultContent.buildContent(response);
+            List<QueryGetPromotionResponse> list=new ArrayList<>();
+            response.forEach(it->{
+                QueryGetPromotionResponse queryGetPromotionResponse = new QueryGetPromotionResponse();
+                BeanUtils.copyProperties(it, queryGetPromotionResponse);
+                list.add(queryGetPromotionResponse);
+            });
+
+            return ResultContent.buildContent(list);
         } catch (Exception e) {
             e.printStackTrace();
             apiLog.setResponse(e.getCause().getCause().getMessage());