Merge remote-tracking branch 'origin/master'

# Conflicts:
#	gateway/src/main/resources/application-dev.yml

commons/src/main/java/com/jzg/commons/core/base/BaseController.java

@@ -192,4 +192,9 @@ public class BaseController {
         return userSystemCode;
     }
 
+    public String getUserIdAndSystemCode(){
+        return getUserId() + ":" + getAppSystemCode();
+    }
+
+
 }

commons/src/main/java/com/jzg/commons/entity/dto/InsOrdersParam.java

@@ -51,4 +51,21 @@ public class InsOrdersParam extends PageRequest {
 
     @Schema(description = "前端传入录单时间")
     private String[] recordingTime;
+
+    @Schema(description = "主订单标识")
+    private Integer parentId;
+
+    @Schema(description = "投保人")
+    private String policyholder;
+
+    @Schema(description = "投保人手机号")
+    private String policyholderMobile;
+
+    @Schema(description = "被保人")
+    private String insured;
+
+    @Schema(description = "被保人手机号")
+    private String insuredMobile;
+
+
 }

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

@@ -106,6 +106,7 @@ spring:
                   - /feeAudit/**
                   - /adjust/**
                   - /homepage/**
+                  - /order/searchHistory/**
 
         - id: costsorrule_route
           uri: http://localhost:8085/

partner/src/main/java/com/jzg/client/OrganizationClient.java

@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name="jzg-organization",url = "http://localhost:8084")
+@FeignClient(name="jzg-organization",url = "${feign.client.jzg-org.url}")
 public interface OrganizationClient {
 
 

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

@@ -18,3 +18,7 @@ spring:
       - nacos:redisson
 
 
+feign:
+  client:
+    jzg-org:
+      url: http://localhost:8084/

partner/src/main/resources/application-test.yml

@@ -22,4 +22,9 @@ config:
   sso: 1
 
 
+feign:
+  client:
+    jzg-org:
+      url: http://localhost:8084/
+
 

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -785,6 +785,9 @@
         <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
             AND io.id = #{insOrdersParam.orderNo}
         </if>
+        <if test="insOrdersParam.parentId != null">
+            AND io.parent_id = #{insOrdersParam.parentId}
+        </if>
         <if test="insOrdersParam.licenseNo != null and insOrdersParam.licenseNo != ''">
             AND ioci.license_no = #{insOrdersParam.licenseNo}
         </if>

tenant/organization/src/main/java/com/jzg/organization/client/OrgClient.java

@@ -12,7 +12,7 @@ public interface OrgClient {
 
     @PostMapping("/ptlAgreementDispatch/getAgreementDispatch")
     public HttpResult getAgreementDispatch(@RequestBody PtlAgreementDispatchQuery ptlAgreementDispatchQuery,
-                                           @RequestHeader("Authorization") String token);
+                                           @RequestHeader("Authorization") String token,@RequestHeader("system_code") String sysCode);
 
 
 }

tenant/organization/src/main/java/com/jzg/organization/client/PartnerDistributionClient.java

@@ -8,7 +8,7 @@ import com.jzg.commons.entity.vo.SysUserVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-@FeignClient(name = "jzg-partner",url = "http://localhost:8087")
+@FeignClient(name = "jzg-partner",url = "${feign.client.jzg-partner.url}")
 public interface PartnerDistributionClient {
 
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -379,10 +379,11 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         ValidateDispatchRuleVo dispatchRuleVos = new ValidateDispatchRuleVo();
         dispatchRuleVos.setQuoteVo(validateSchemeRuleVo.getQuoteVo());
         //2.协议调度规则数据拼接
+        String finalSystemCode = systemCode;
         companyList.forEach(company->{
             PtlAgreementDispatchQuery query = new PtlAgreementDispatchQuery();
             query.setCompanyId(company.getId());
-            HttpResult agreementDispatch = orgClient.getAgreementDispatch(query,baseController.getToken());
+            HttpResult agreementDispatch = orgClient.getAgreementDispatch(query,baseController.getToken(), finalSystemCode);
             if(agreementDispatch.getCode() == 200){
                 ObjectMapper mapper = new ObjectMapper();
                 List<PtlAgreementDispatchVo.DispatchVo> vos = new ArrayList<>();

tenant/organization/src/main/resources/application-dev.yml

@@ -44,4 +44,6 @@ feign:
       url: http://localhost:8085/
     jzg-platform:
       url: http://localhost:8083/
+    jzg-partner:
+      url: http://localhost:8087/