Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersOther.java

@@ -66,6 +66,12 @@ public class InsOrdersOther {
     @Schema(description = "阳光交商合并经营成本率")
     private String mergeCostRate;
 
+    @Schema(description = "阳光 向阳花评分")
+    private String xyhGrade;
+
+    @Schema(description = "阳光 红黄蓝车系")
+    private String seriesTypeActualName;
+
     @Schema(description = "商业险是否有费用")
     private String ciMessage;
 

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfo.java

@@ -300,6 +300,10 @@ public class SysUserJzgInfo extends BaseModel implements Serializable {
     @Schema(description = "角色名称集合")
     private List<String> roleIds;
 
+    @TableField(exist = false)
+    @Schema(description = "角色名称集合")
+    private List<String> roleNames;
+
     @TableField(exist = false)
     @Schema(description = "密码")
     private String password;

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteResultsVo.java

@@ -163,6 +163,26 @@ public class QuoteResultsVo implements Serializable {
          * 商业出险次数
          */
         private String biClaims;
+        /**
+         * 交强转续保
+         */
+        private String jqRenewal;
+        /**
+         * 商业转续保
+         */
+        private String syRenewal;
+        /**
+         * 阳光 交商合并经营成本率
+         */
+        private String mergeCostRate;
+        /**
+         * 阳光 向阳花评分
+         */
+        private String xyhGrade;
+        /**
+         * 阳光 红黄蓝车系
+         */
+        private String seriesTypeActualName;
 
     }
 

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -243,7 +243,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
                 }
                 if(deptMap.containsKey(sysSystem.getSysCode())){
                     int count = deptMap.get(sysSystem.getSysCode()).size();
-                    sysSystem.setDeptCount(count);
+                    sysSystem.setDeptCount(count - 1); // 不包含租户本身
                 }else{
                     sysSystem.setDeptCount(0);
                 }

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/OrgClient.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.commons.client;
 
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.action.enums.ActionEnum;
 import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatchAfterAction;
 import com.jzg.commons.entity.agreement.dispatch.vo.PtlAgreementDispatchVo;
 import com.jzg.commons.entity.dto.CostAgreementParam;
@@ -125,6 +124,12 @@ public interface OrgClient {
     @GetMapping(value = "userInfo/getUserInfo")
     public HttpResult<SysUserJzgInfo> getUserInfo(String id);
 
+    @GetMapping(value = "userInfo/getUserInfoById")
+    public HttpResult<SysUserJzgInfo> getUserInfoById(String id);
+
+    @PostMapping(value = "receivable/restockInsPlyIncome")
+    public void restockInsPlyIncome(@RequestBody InsOrderAdjust insOrderAdjust);
+
     /**
      * 获取调度动作
      */

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -5,14 +5,11 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jzg.commons.constants.CompanyConstants;
 import com.jzg.commons.constants.InsuranceRisk;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
@@ -31,8 +28,6 @@ import com.jzg.commons.entity.quote.vo.aggregated.OrderStatusResultVo;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteEchoVo;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteResultsVo;
 import com.jzg.commons.entity.quote.vo.aggregated.UnderwritingResultsVo;
-import com.jzg.commons.entity.quote.vo.image.InsuranceImageVo;
-import com.jzg.commons.entity.quote.vo.underwriting.SpecialAppointmentsVo;
 import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
@@ -45,7 +40,6 @@ import com.jzg.commons.entity.quote.vo.orders.InsOrdersAdd;
 import com.jzg.commons.entity.quote.vo.orders.InsOrdersEnd;
 import com.jzg.commons.entity.quote.vo.orders.InsOrdersVo;
 import com.jzg.quotation.commons.utils.SnowFlakeUtil;
-import com.jzg.quotation.summary.constants.QuoteNumberConstant;
 import com.jzg.quotation.summary.consumer.template.OrderMessageTemplate;
 import com.jzg.quotation.summary.mapper.*;
 import com.jzg.quotation.summary.service.*;
@@ -644,6 +638,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 ordersOther.setJqLossRation(new BigDecimal(quoteResponse.getScoreVo().getJqLossRation() != null ? quoteResponse.getScoreVo().getJqLossRation() : "0"));
                 ordersOther.setSyLossRation(new BigDecimal(quoteResponse.getScoreVo().getSyLossRation() != null ? quoteResponse.getScoreVo().getSyLossRation() : "0"));
                 ordersOther.setTpColorScore(quoteResponse.getScoreVo().getTpColorScore() != null ? quoteResponse.getScoreVo().getTpColorScore() : "");
+                ordersOther.setXyhGrade(quoteResponse.getScoreVo().getXyhGrade() != null ? quoteResponse.getScoreVo().getXyhGrade() : "");
+                ordersOther.setSeriesTypeActualName(quoteResponse.getScoreVo().getSeriesTypeActualName() != null ? quoteResponse.getScoreVo().getSeriesTypeActualName() : "");
             }
             insOrdersOtherService.saveOrUpdate(ordersOther);
 

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/build/YangGuangApiQuoteResultsVoBuild.java

@@ -42,7 +42,7 @@ public final class YangGuangApiQuoteResultsVoBuild {
         // 交强保费 车船税 商业保费
         buildPremium(quoteResultsVo, yangGuangAccuracyCalculateResponse);
         quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.WAIT_AUDIT);
-        quoteResultsVo.setScoreVo(buildScoreVo(yangGuangAccuracyCalculateResponse.getDiscount()));
+        quoteResultsVo.setScoreVo(buildScoreVo(yangGuangAccuracyCalculateResponse.getDiscount(), yangGuangAccuracyCalculateResponse));
         return quoteResultsVo;
     }
 
@@ -142,13 +142,42 @@ public final class YangGuangApiQuoteResultsVoBuild {
         riskInfoVo.setEndDate(quotationResponse.getBiEndDate());
         return riskInfoVo;
     }
-    private static QuoteResultsVo.ScoreVo buildScoreVo(YangGuangAccuracyCalculateResponse.discount discount) {
+    private static QuoteResultsVo.ScoreVo buildScoreVo(YangGuangAccuracyCalculateResponse.discount discount,YangGuangAccuracyCalculateResponse yangGuangAccuracyCalculateResponse) {
         QuoteResultsVo.ScoreVo scoreVo = new QuoteResultsVo.ScoreVo();
         scoreVo.setJqScore(discount.getMarkingnobcCI());
         scoreVo.setSyScore(discount.getMarkingnobcBI());
         scoreVo.setLossRation(discount.getFinalmarkingnobc());
         scoreVo.setJqLossRation(discount.getFinalmarkingnoCi());
         scoreVo.setSyLossRation(discount.getFinalmarkingnoBi());
+        scoreVo.setMergeCostRate(yangGuangAccuracyCalculateResponse.getVascostmarginbc());
+        scoreVo.setXyhGrade(yangGuangAccuracyCalculateResponse.getXYHGrade() != null ? "1" : "0");
+        scoreVo.setSeriesTypeActualName(yangGuangAccuracyCalculateResponse.getSeriesTypeActualName() != null ? yangGuangAccuracyCalculateResponse.getSeriesTypeActualName() : "");
+        if (yangGuangAccuracyCalculateResponse.getNewAndRenewalFlagCI() != null) {
+            switch (yangGuangAccuracyCalculateResponse.getNewAndRenewalFlagCI()) {
+                case "1":
+                case "3":
+                    scoreVo.setJqRenewal("0");
+                    break;
+                case "2":
+                case "4":
+                case "5":
+                    scoreVo.setJqRenewal("1");
+                    break;
+            }
+        }
+        if (yangGuangAccuracyCalculateResponse.getNewAndRenewalFlagBI() != null) {
+            switch (yangGuangAccuracyCalculateResponse.getNewAndRenewalFlagBI()) {
+                case "1":
+                case "3":
+                    scoreVo.setSyRenewal("0");
+                    break;
+                case "2":
+                case "4":
+                case "5":
+                    scoreVo.setSyRenewal("1");
+                    break;
+            }
+        }
         return scoreVo;
     }
 

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangGetNonVehicleProductsRequest.java

@@ -1,6 +1,10 @@
 package com.jzg.quotation.yangguang.api.entity.request;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.jzg.commons.entity.quote.vo.CarInfoVo;
+import com.jzg.quotation.yangguang.api.constant.enums.YangGuangCarType;
+import com.jzg.quotation.yangguang.api.constant.enums.YgUseNatureCodeMapping;
+import com.jzg.quotation.yangguang.api.entity.YangGuangConfigureParameters;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -86,24 +90,22 @@ public class YangGuangGetNonVehicleProductsRequest extends YangGuangBaseRequest
     private String ProjectBrand;
 
 
-//    public YangGuangGetNonVehicleProductsRequest(String seatcount, InsOrders insOrders, YangGuangConfigureParameters ygConfigureParameters) {
+    public YangGuangGetNonVehicleProductsRequest(CarInfoVo carInfoVo, YangGuangConfigureParameters ygConfigureParameters) {
 //        String json = insOrders.getCarinfo().toJSONString();
 //        JSONObject jsonObject = JSONObject.parseObject(json);
 //        String useNatureCode = jsonObject.getString("vehicleUse");
-//        this.RequestNo = "getNonVehicleProducts";
-//        this.ComCode = ygConfigureParameters.getComCode();
-//        this.HandlerCode = ygConfigureParameters.getHandlerCode();
-//        this.AgentCode = ygConfigureParameters.getAgentCode();
-//        this.ServiceArea = ygConfigureParameters.getServiceArea() == null ? "" : ygConfigureParameters.getServiceArea();
-//        this.Seatcount = seatcount;
-//        if (useNatureCode != null) {
-//            this.UseNatureCode = YgUseNatureCodeMapping.getYgUseNatureCode(useNatureCode);
-//        }
+        this.RequestNo = "getNonVehicleProducts";
+        this.ComCode = ygConfigureParameters.getComCode();
+        this.HandlerCode = ygConfigureParameters.getHandlerCode();
+        this.AgentCode = ygConfigureParameters.getAgentCode();
+        this.ServiceArea = ygConfigureParameters.getServiceArea() == null ? "" : ygConfigureParameters.getServiceArea();
+        this.Seatcount = carInfoVo.getSeatCount();
+        this.UseNatureCode = YgUseNatureCodeMapping.getYgUseNatureCode(carInfoVo.getVehicleUseCode());
 //        String cartype = jsonObject.getString("cartype");
-//        //车辆种类
-//        YangGuangCarType yangGuangCarType = Enum.valueOf(YangGuangCarType.class,cartype);
-//        this.VehicleType = yangGuangCarType.getCode();
-//        this.LicenseCategory = jsonObject.getString("cartype");
-//        this.Toncount = jsonObject.getString("seatCount");
-//    }
+        //车辆种类
+        YangGuangCarType yangGuangCarType = Enum.valueOf(YangGuangCarType.class,carInfoVo.getCarTypeCode());
+        this.VehicleType = yangGuangCarType.getCode();
+        this.LicenseCategory = carInfoVo.getCarTypeCode();
+        this.Toncount = carInfoVo.getSeatCount();
+    }
 }

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/response/YangGuangAccuracyCalculateResponse.java

@@ -125,6 +125,18 @@ public class YangGuangAccuracyCalculateResponse extends YangGuangBaseResponse{
     @JSONField(name = "vascostmarginbc")
     private String vascostmarginbc;
 
+    /**
+     *  红黄蓝车系（仅电车返回有值）
+     */
+    @JSONField(name = "SeriesTypeActualName")
+    private String SeriesTypeActualName;
+
+    /**
+     *  向阳花标识返回
+     */
+    @JSONField(name = "XYHGrade")
+    private String XYHGrade;
+
     /**
      *  商业险重复投保提示
      */

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiRequestImpl.java

@@ -3,7 +3,6 @@ package com.jzg.quotation.yangguang.api.service.impl;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
-import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.agreement.po.PtlAgreementUrl;
 import com.jzg.commons.entity.quote.vo.AttributionInformationVo;
@@ -12,7 +11,6 @@ import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.aggregated.*;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.annotation.QuoteApiService;
-import com.jzg.quotation.commons.client.OrgClient;
 import com.jzg.quotation.commons.client.PlatformClient;
 import com.jzg.quotation.commons.constant.InsuranceCode;
 import com.jzg.commons.entity.quote.vo.base.OrderBase;
@@ -77,6 +75,8 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
         // 过滤车型
         YangGuangQueryVehicleModelResponse.carmodellist carModel =
                 CarModelsFilterUtils.to(yangGuangQueryVehicleModelResponse.getCarmodellist(), quoteVo.getCarInfoVo());
+        // 获取非车套餐列表
+        getNonVehicleList(carInfoVo, parameters, url);
         // 报价
         YangGuangAccuracyCalculateRequest yangGuangAccuracyCalculateRequest = new YangGuangAccuracyCalculateRequest(quoteVo, carModel, parameters);
         yangGuangAccuracyCalculateRequest.setInfotransNo(yangGuangQueryVehicleModelResponse.getInfotransNo());
@@ -376,4 +376,12 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
         }
         return orderStatusResultVo;
     }
+
+    public YangGuangGetNonVehicleProductsResponse getNonVehicleList(CarInfoVo carInfoVo, YangGuangConfigureParameters ygConfigureParameters,String apiUrl) throws JsonProcessingException {
+        // 获取非车列表
+        YangGuangGetNonVehicleProductsRequest yangGuangGetNonVehicleProductsRequest = new YangGuangGetNonVehicleProductsRequest(carInfoVo,ygConfigureParameters);
+        return yangGuangApiRequestComponent.getNonVehicleProducts(yangGuangGetNonVehicleProductsRequest,apiUrl);
+    }
+
+
 }

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

@@ -679,7 +679,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUserJzgInfoService.updateBatchById(sysUserJzgInfoList);
         } else {
             for (String id : isEnableVo.getIds()) {
-                SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getUserByUserId(id);
+                SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getById(id);
                 if (sysUserJzgInfo == null) {
                     throw new SystemException("该用户不存在");
                 }
@@ -871,9 +871,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         sysUserJzgInfo.setPassword("******");
         //角色
         List<SysRole> userRole = sysUserRoleService.getUserRole(sysUser.getId());
-        List<String> roleIds = userRole.stream().map(u -> u.getId()).collect(Collectors.toList());
+        List<String> roleIds = userRole.stream().map(SysRole::getId).collect(Collectors.toList());
         sysUserJzgInfo.setRoleIds(roleIds);
-
+        sysUserJzgInfo.setRoleNames(userRole.stream().map(SysRole::getName).collect(Collectors.toList()));
 
         List<SysUserJzgInfoFile> sysUserJzgInfoFile = sysUserJzgInfoFileService.list
                 (new LambdaQueryWrapper<SysUserJzgInfoFile>().eq(SysUserJzgInfoFile::getUserId, sysUserJzgInfo.getId()));

tenant/organization/src/main/resources/mapper/SysOrganizationMapper.xml

@@ -34,10 +34,16 @@
 
     <select id="getTeamUserPage" resultType="com.jzg.commons.entity.vo.SysOrganizationUserLinkVo">
         SELECT
-        su.*,
-        suji.*,
+        su.id as userId,
+        suji.id as id,
+        suji.name as name,
+        su.mobile as mobile,
+        suji.type_attr as typeAttr,
+        suji.status as status,
+        suji.is_enable as isEnable,
+        suji.dept_id as deptId,
         sd.NAME AS dept_name,
-        so.attribute,
+        so.attribute as attribute ,
         ref_suji.name as referrer_name,
         ref_su.mobile as referrer_id,
         led_suji.name as leader_name,

tenant/organization/src/main/resources/mapper/SysUserJzgInfoMapper.xml

@@ -56,7 +56,7 @@
         su.username as leader_name,
         suji.referrer_id,
         su.username as referrer_name,
-        GROUP_CONCAT(sr.name) as role_name,
+        GROUP_CONCAT(DISTINCT sr.name) as role_name,
         soul.organization_id as organization_id,
         so.name as organization_name,
         suji.create_time as createTime,