Merge branch 'master' into pre

order-application-service/src/main/java/cn/freemud/entities/dto/pay/svc/SVCQueryMultiInfo.java

+package cn.freemud.entities.dto.pay.svc;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author : xh.Z
+ * @email : fisherman0510@163.com
+ * @Date : 2022/6/1 20:17
+ * @description :
+ */
+@Data
+public class SVCQueryMultiInfo {
+    List<BatchSvcInfoRequest> queryList;
+}

order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

@@ -28,6 +28,7 @@ import cn.freemud.entities.dto.pay.PayProductDto;
 import cn.freemud.entities.dto.pay.UnifiedOrderRequestDto;
 import cn.freemud.entities.dto.pay.svc.BatchSvcInfoRequest;
 import cn.freemud.entities.dto.pay.svc.CardApplyRes;
+import cn.freemud.entities.dto.pay.svc.SVCQueryMultiInfo;
 import cn.freemud.entities.dto.shoppingCart.GetShoppingCartGoodsApportionDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.dto.store.*;
@@ -227,7 +228,9 @@ public class CheckOrder {
                 request.setVer("1");
                 requestList.add(request);
             });
-            cn.freemud.base.entity.BaseResponse<List<CardApplyRes>> response = svcAppClient.multiInfo(requestList);
+            SVCQueryMultiInfo req = new SVCQueryMultiInfo();
+            req.setQueryList(requestList);
+            cn.freemud.base.entity.BaseResponse<List<CardApplyRes>> response = svcAppClient.multiInfo(req);
             if (response != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
                 if (CollectionUtils.isNotEmpty(response.getResult())) {
                     CardApplyRes cardApplyRes1 = response.getResult().stream().filter(cardApplyRes -> cardApplyRes.getEnableSharing().compareTo(0) == 0).findFirst().orElse(null);

order-application-service/src/main/java/cn/freemud/service/thirdparty/SvcAppClient.java

 package cn.freemud.service.thirdparty;
 
+import cn.freemud.entities.dto.pay.svc.*;
 import com.freemud.application.sdk.api.ordercenter.annotation.LogIgnoreFeign;
 import cn.freemud.base.entity.BaseResponse;
-import cn.freemud.entities.dto.pay.svc.BatchSvcInfoRequest;
-import cn.freemud.entities.dto.pay.svc.CardApplyRes;
-import cn.freemud.entities.dto.pay.svc.SVCCardAmountRequestDto;
-import cn.freemud.entities.dto.pay.svc.SVCCardAmountResponseDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @FeignClient(name = "fm-svc-app", url = "${saas.svc.app.feign.url:}")
@@ -25,6 +23,6 @@ public interface SvcAppClient {
 
     //批量查询卡配置规则
     @PostMapping(value = "/svc/cardapply/multi-info")
-    BaseResponse<List<CardApplyRes>> multiInfo(@RequestBody List<BatchSvcInfoRequest> requestList);
+    BaseResponse<List<CardApplyRes>> multiInfo(@RequestBody SVCQueryMultiInfo req);
 
 }