修改bug

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

@@ -0,0 +1,21 @@
+package com.jzg.commons.entity.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.core.base.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "申请提现param")
+@Data
+public class ApplyWithdrawParam{
+
+    @Schema(description = "提现金额")
+    private BigDecimal withdrawAmount;
+
+    @Schema(description = "银行卡ID")
+    private String bankCardId;
+
+}

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

@@ -92,6 +92,9 @@ public class PtlAgreementCostEnd {
         @Schema(description = "左操作数")
         private String min;
 
+        @Schema(description = "操作数组")
+        private List<String> minArray;
+
         @Schema(description = "右操作数")
         private String max;
 

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

@@ -17,8 +17,8 @@ public class SysUserJzgInfoBankCardDto implements Serializable {
     @Schema(description = "id")
     private String id;
 
-    @Schema(description = "用户id")
-    private String userId;
+    @Schema(description = "用户INFOid")
+    private String userInfoId;
 
     @Schema(description = "用户名称")
     private String name;

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

@@ -0,0 +1,17 @@
+package com.jzg.commons.entity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 提现参数
+ */
+
+@Data
+public class WithdrawParam {
+    @Schema(description = "提现金额")
+    private String amount;
+
+    @Schema(description = "提现的银行卡Id")
+    private String cardId;
+}

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

@@ -2,6 +2,7 @@ package com.jzg.commons.entity.po;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jzg.commons.core.base.BaseModel;
@@ -24,6 +25,9 @@ public class PtlNewCarJudgeRules{
 
     private String companyId;
 
+    @TableField(exist = false)
+    private String companyName;
+
     private String vehicleType;
 
     private String unitTypeCode;

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

@@ -9,9 +9,12 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.core.base.BaseModel;
+import com.jzg.commons.entity.dto.ApplyWithdrawParam;
+import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 提现申请表
@@ -20,14 +23,15 @@ import lombok.Data;
 @Data
 @Schema(description = "提现申请表")
 @AllArgsConstructor
+@NoArgsConstructor
 public class SysAmountAuditing extends BaseModel {
 
     @Schema(description = "主键")
     @TableId
     private String id;
 
-    @Schema(description = "银行卡号")
-    private String bankNumber;
+//    @Schema(description = "银行卡号")
+//    private String bankNumber;
 
     @Schema(description = "提现金额")
     private BigDecimal amount;
@@ -82,4 +86,31 @@ public class SysAmountAuditing extends BaseModel {
     @Schema(description = "系统code")
     private String systemCode;
 
+
+    /**
+     * 构造提现
+     * @param applyWithdrawParam
+     * @param sysUserAccount
+     * @param sysUserJzgInfoBankCardDto
+     * @param userId
+     */
+    public SysAmountAuditing(
+            ApplyWithdrawParam applyWithdrawParam,
+            SysUserAccount sysUserAccount,
+            SysUserJzgInfoBankCardDto sysUserJzgInfoBankCardDto,
+            String userId
+    ){
+        // 提现金额
+        this.setAmount(applyWithdrawParam.getWithdrawAmount());
+        // 当前账户金额
+        this.setBalanceAmount(sysUserAccount.getSumAmount());
+        // 提现用户
+        this.setUserId(userId);
+        // 银行卡卡号
+        this.setBankCardNum(sysUserJzgInfoBankCardDto.getBankCardNumber());
+        // 银行卡开户行
+        this.setBankName(sysUserJzgInfoBankCardDto.getBankName());
+        // 银行卡开户行
+        this.setBankNum(sysUserJzgInfoBankCardDto.getBankAddress());
+    }
 }

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

@@ -23,9 +23,9 @@ public class SysUserJzgInfoBankCard extends BaseModel {
     @Schema(description = "主键")
     private String id;
 
-    @TableField(value = "user_id")
+    @TableField(value = "user_info_id")
     @Schema(description = "user表id")
-    private String userId;
+    private String userInfoId;
 
     @TableField(value = "bank_card_number")
     @Schema(description = "银行卡号")
@@ -86,7 +86,7 @@ public class SysUserJzgInfoBankCard extends BaseModel {
 
     public SysUserJzgInfoBankCard(String userId,String bankCardNumber,String bankName,String systemCode){
         this.id = IdGenerate.nextId();
-        this.userId = userId;
+        this.userInfoId = userId;
         this.bankCardNumber = bankCardNumber;
         this.bankName = bankName;
         this.isDefault = false;

commons/src/main/java/com/jzg/commons/entity/vo/NewCarQuery.java

@@ -0,0 +1,16 @@
+package com.jzg.commons.entity.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.core.base.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 新车查询接口
+ */
+@Data
+public class NewCarQuery extends PageRequest {
+    @Schema
+    private String companyId;
+
+}

commons/src/main/java/com/jzg/commons/util/BuildDescUtils.java

@@ -31,7 +31,15 @@ public class BuildDescUtils {
             } else if ("radio".equals(attrType)) {
                 desc.append(radioIdentifying(ptlAgreementUndwrtRulesAttr, link)).append("，");
             } else if ("checkbox".equals(attrType) || "select".equals(attrType)) {
-                desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("包含").append(link.getMin()).append("，");
+                if(link.getMinArray() != null && link.getMinArray().length > 0){
+                    desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("包含");
+                    for (int k=0 ; k<link.getMinArray().length; k++){
+                        desc.append(link.getMinArray()[k]).append("，");
+                    }
+
+                }else {
+                    desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("包含").append(link.getMin()).append("，");
+                }
             } else if ("inputTag".equals(attrType)) {
                 if (link.getOperator() != null && "1".equals(link.getOperator())) {
                     desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("包含").append(link.getMin()).append("，");

platform/src/main/java/com/jzg/controller/AttributionTemplateController.java

@@ -66,7 +66,7 @@ public class AttributionTemplateController {
      */
     @GetMapping("/getAgreementAttributionByCompanyId")
     @Operation(summary = "获取协议属性信息")
-    public HttpResult<PtlAgreementAttribution> getAgreementAttributionByCompanyId(String companyId) {
+    public HttpResult<List<PtlAgreementAttribution>> getAgreementAttributionByCompanyId(String companyId) {
         return ptlInsAttributionTemplateService.getAgreementAttributionByCompanyId(companyId);
     }
 

platform/src/main/java/com/jzg/controller/EsmInsCompanyController.java

@@ -434,4 +434,16 @@ public class EsmInsCompanyController extends BaseController {
         return result ?  HttpResult.ok("更新保司排序成功") : HttpResult.error("更新保司排序失败");
     }
 
+    @Operation(summary = "获取保司的所有下级id")
+    @PostMapping(value = "getParentIds")
+    public HttpResult getParentIds(@RequestBody List<String> companyIds){
+        return HttpResult.ok(esmInsCompanyService.getParentIds(companyIds));
+    }
+
+    @Operation(summary = "查找顶级保司id")
+    @PostMapping(value = "getTopCompanyId")
+    public HttpResult getTopCompanyId(@RequestBody String companyId){
+        return HttpResult.ok(esmInsCompanyService.getTopCompanyId(companyId));
+    }
+
 }

platform/src/main/java/com/jzg/mapper/EsmInsCompanyMapper.java

@@ -62,4 +62,8 @@ public interface EsmInsCompanyMapper extends BaseMapper<EsmInsCompany> {
     List<EsmInsCompanyResVo> leftList(EsmInsCompanyReq req);
 
     List<EsmInsCompanyVo> findTree(EsmInsCompanyReq req);
+
+    List<String> getParentIds(List<String> companyIds);
+
+    String getTopCompanyId(String companyId);
 }

platform/src/main/java/com/jzg/service/EsmInsCompanyService.java

@@ -129,6 +129,21 @@ public interface EsmInsCompanyService extends IService<EsmInsCompany> {
      * @return
      */
     boolean updateCompanySort(List<EsmInsCompany> companyList, String systemCode);
+
+    /**
+     * 获取所有下级
+     * @param companyIds
+     * @return
+     */
+    List<String> getParentIds(List<String> companyIds);
+
+
+    /**
+     * 获取顶级保司id
+     * @param companyId
+     * @return
+     */
+    String getTopCompanyId(String companyId);
 }
 
 

platform/src/main/java/com/jzg/service/PtlInsAttributionTemplateService.java

@@ -51,5 +51,5 @@ public interface PtlInsAttributionTemplateService extends IService<PtlInsAttribu
      */
     HttpResult<PtlAgreementAttribution> getAgreementAttribution(String agreementId);
 
-    HttpResult<PtlAgreementAttribution> getAgreementAttributionByCompanyId(String companyId);
+    HttpResult<List<PtlAgreementAttribution>> getAgreementAttributionByCompanyId(String companyId);
 }

platform/src/main/java/com/jzg/service/SysUserService.java

@@ -104,4 +104,9 @@ public interface SysUserService extends IService<SysUser> {
      * @return
      */
     List<SysUserVo> getUserInfo(SysUserVo sysUserVo);
+
+    /**
+     * 通过手机号查询用户
+     */
+    SysUser getUserByMobile(String mobile);
 }

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

@@ -344,6 +344,16 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
         esmInsCompanyTenantSortMapper.insert(companyTenantSorts);
         return true;
     }
+
+    @Override
+    public List<String> getParentIds(List<String> companyIds) {
+        return baseMapper.getParentIds(companyIds);
+    }
+
+    @Override
+    public String getTopCompanyId(String companyId) {
+        return baseMapper.getTopCompanyId(companyId);
+    }
 }
 
 

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

@@ -128,12 +128,12 @@ public class PtlInsAttributionTemplateServiceImpl extends ServiceImpl<PtlInsAttr
     }
 
     @Override
-    public HttpResult<PtlAgreementAttribution> getAgreementAttributionByCompanyId(String companyId) {
+    public HttpResult<List<PtlAgreementAttribution>> getAgreementAttributionByCompanyId(String companyId) {
         EsmInsCompany company = esmInsCompanyService.getById(companyId);
         AssertionUtils.isEmpty(company, "保司不存在");
         LambdaQueryWrapper<PtlAgreementAttribution> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PtlAgreementAttribution::getInsCompanyId,companyId);
-        PtlAgreementAttribution ptlAgreementAttribution = agreementAttributionMapper.selectOne(wrapper);
+        List<PtlAgreementAttribution> ptlAgreementAttribution = agreementAttributionMapper.selectList(wrapper);
         AssertionUtils.isEmpty(ptlAgreementAttribution, "账号归属信息查询失败");
         return HttpResult.ok(ptlAgreementAttribution);
     }

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

@@ -81,6 +81,9 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     @Autowired
     private SysUserJzgInfoSalesmanMapper sysUserJzgInfoSalesmanMapper;
 
+    @Autowired
+    SysUserService sysUserService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     @IgnoreTenant
@@ -300,7 +303,11 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
                 .eq(SysUserJzgInfo::getIsDelete, YesNoEnum.NO.getCode())
                 .eq(SysUserJzgInfo::getSystemCode, system.getSysCode())
         );
-        vo.setUserName(info.getName());
+        if(Objects.isNull(info)){
+            vo.setUserName(user.getUsername());
+        }else{
+            vo.setUserName(info.getName());
+        }
         vo.setUserAccount(user.getMobile());
         return vo;
     }
@@ -419,16 +426,11 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void sysEdit(SysSystemEditParam param) {
+        SysUser sysUser = sysUserService.getUserByMobile(param.getUserAccount());
         SysSystem sysSystem = new SysSystem();
         BeanUtils.copyProperties(param, sysSystem);
-        updateById(sysSystem);
-        List<SysUser> userList = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getMobile, param.getUserAccount())
-        );
-        SysUser sysUser;
-        if(CollUtil.isNotEmpty(userList)){
-            sysUser = userList.get(0);
-            sysUser.setUsername(param.getUserName());
+
+        if(Objects.nonNull(sysUser)){
             sysUserMapper.updateById(sysUser);
             //修改顶级机构
             SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
@@ -447,12 +449,24 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
             sysUserMapper.insert(sysUser);
 
             // 新建顶级机构
-            SysDept sysDept = new SysDept(sysSystem);
-            sysDeptMapper.insert(sysDept);
+            SysDept sysDept = sysDeptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
+                    .eq(SysDept::getSystemCode, sysSystem.getSysCode())
+                    .eq(SysDept::getParentId, "0"));
+
+            if(Objects.isNull(sysDept)) {
+                sysDept = new SysDept(sysSystem);
+                sysDeptMapper.insert(sysDept);
+            }else{
+                SysDept upDept = new SysDept(sysSystem);
+                upDept.setId(sysDept.getId());
+                sysDeptMapper.updateById(upDept);
+            }
             // 新增用户机构关联信息
             SysUserJzgInfo info = new SysUserJzgInfo(param.getUserName(), sysUser,sysSystem.getSysCode(), sysDept.getId());
             sysUserJzgInfoMapper.insert(info);
         }
+        sysSystem.setUserId(sysUser.getId());
+        updateById(sysSystem);
     }
 
     @Override
@@ -575,8 +589,11 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         if(busPerms.getQuoteCompany() == 2){
             companyIds = busPerms.getQuoteCompanyList();
         }
-        List<EsmInsCompany> companyList = baseMapper.getCompanyList(companyIds);
-
+        List<EsmInsCompany> companyList = new ArrayList<>();
+//        if(!companyIds.isEmpty()) {
+        companyList = baseMapper.getCompanyList(companyIds);
+//        }
+        System.out.printf("------------------------------------------------------------1");
         // 根据用户权限获取 可使用的协议
         List<String> companyIdList = companyList.stream().map(x -> x.getId()).collect(Collectors.toList());
         String userDeptId = baseController.getUserDeptId();
@@ -584,11 +601,12 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
             SysUserJzgInfo userByUserId = sysUserJzgInfoService.getUserByUserId(baseController.getUserId(), systemCode);
             userDeptId = userByUserId.getDeptId();
         }
+        System.out.printf("------------------------------------------------------------2");
         List<PtlAgreement> userAgreement = ptlAgreementService.getUserAgreementByCompanyIds(userDeptId, companyIdList);
 
         Map<String, List<PtlAgreement>> groupedMap = userAgreement.stream()
                 .collect(Collectors.groupingBy(PtlAgreement::getCompanyId));
-
+        System.out.printf("------------------------------------------------------------3");
         companyList.forEach(company->{
             if(groupedMap.containsKey(company.getId())){
                 company.setAgreements(groupedMap.get(company.getId()));

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

@@ -272,6 +272,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
     public List<SysUserVo> getUserInfo(SysUserVo sysUserVo) {
         return baseMapper.getUserInfo(sysUserVo);
     }
+
+    @Override
+    public SysUser getUserByMobile(String mobile) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getMobile,mobile));
+    }
 }
 
 

platform/src/main/resources/mapper/EsmInsCompanyMapper.xml

@@ -211,5 +211,43 @@
         </if>
     </select>
 
+    <select id="getParentIds" resultType="String">
+        WITH RECURSIVE t AS (
+            SELECT id
+            FROM esm_ins_company
+            WHERE id in
+        <foreach collection="companyIds"
+                 item="id"
+                 open="("
+                 close=")"
+                 separator=",">
+            #{id}
+        </foreach>
+            UNION ALL
+
+            SELECT c.id
+            FROM esm_ins_company c
+                     JOIN t ON c.parent_id = t.id
+        )
+        SELECT *
+        FROM t;
+    </select>
+
+    <select id="getTopCompanyId" resultType="String">
+        WITH RECURSIVE t AS (
+            SELECT id, parent_id
+            FROM esm_ins_company
+            WHERE id = ${companyId}
+
+            UNION ALL
+            SELECT c.id, c.parent_id
+            FROM esm_ins_company c
+                     INNER JOIN t pt ON c.id = pt.parent_id
+        )
+        SELECT id
+        FROM t
+        where parent_id = 0;
+    </select>
+
 
 </mapper>

platform/src/main/resources/mapper/PtlAgreementMapper.xml

@@ -3,13 +3,25 @@
 <mapper namespace="com.jzg.mapper.PtlAgreementMapper">
 
     <select id="getUserAgreementByCompanyIds" resultType="com.jzg.commons.entity.po.PtlAgreement">
+        WITH RECURSIVE company_tree AS (
+        SELECT id
+        FROM esm_ins_company
+        WHERE id IN
+        <foreach collection="companyIds" item="cid" open="(" separator="," close=")">
+            #{cid}
+        </foreach>
+
+        UNION ALL
+
+        SELECT c.id
+        FROM esm_ins_company c
+        JOIN company_tree ct ON c.parent_id = ct.id
+        )
         SELECT pa.*
         FROM ptl_agreement_dept pad
-                 JOIN ptl_agreement pa ON pad.agreement_id = pa.id
-        WHERE pa.company_id IN
-        <foreach collection="companyIds" item="companyId" open="(" separator="," close=")">
-            #{companyId}
-        </foreach>
-          AND pad.dept_id = #{deptId}
+        JOIN ptl_agreement pa ON pad.agreement_id = pa.id
+        JOIN company_tree ct ON pa.company_id = ct.id
+        WHERE pa.is_delete = 0
+        AND pad.dept_id = #{deptId}
     </select>
 </mapper>

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

@@ -126,4 +126,7 @@ public interface PlatformClient {
     @PostMapping("/manager/clause/addClause")
     HttpResult addClause(@RequestBody InsCompanyClause insCompanyClause);
 
+    @PostMapping("/esmInsCompany/getParentIds")
+    HttpResult getParentIds(@RequestBody List<String> companyIds);
+
 }

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

@@ -12,6 +12,7 @@ import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
+import com.jzg.commons.util.StringUtils;
 import com.jzg.commons.util.comparble.DiffResult;
 import com.jzg.commons.util.comparble.DiffUtils;
 import com.jzg.quotation.summary.constants.QuoteNumberConstant;
@@ -122,7 +123,7 @@ public class InsOrdersCarInfoServiceImpl extends ServiceImpl<InsOrdersCarInfoMap
         boolean isTransfer = carInfoVo.isTransfer();
         insOrdersCarInfo.setTransfer(isTransfer ? 1 : 0);
         if (isTransfer) {
-            AssertionUtils.isFail(Objects.isNull(carInfoVo.getTransferDate()), "请填写转移登记日期");
+            AssertionUtils.isFail(StringUtils.isBlank(carInfoVo.getTransferDate()), "请填写转移登记日期");
             insOrdersCarInfo.setTransferDate(LocalDate.parse(carInfoVo.getTransferDate(),formatter).atStartOfDay());
         } else {
             insOrdersCarInfo.setTransferDate(null);

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

@@ -374,6 +374,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         // 协议名称、协议类型
         if(Objects.nonNull(insOrdersVo.getInsOrders().getAgreementId())) {
             HttpResult<AgreementInfoVo> ptlAgreement = orgClient.queryAgreementById(insOrdersVo.getInsOrders().getAgreementId(), baseController.getToken(), baseController.getAppSystemCode());
+            AssertionUtils.isFail(ptlAgreement.getCode() == 500,ptlAgreement.getMsg() + ",请联系管理处理");
             insOrdersVo.setAgreementType(ptlAgreement.getData().getAgreement().getAgreementType());
             insOrdersVo.setAgreementName(ptlAgreement.getData().getAgreement().getAgreementName());
         }

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

@@ -323,8 +323,22 @@
     </select>
     
     <select id="selectExternalPolicyMap" resultMap="InsOrdersExternalPolicyMap">
-        select order_no, jq_policy, sy_policy, no_policy, jq_sign,
-               IF(CONCAT_WS( ', ', jq_policy, sy_policy, no_policy, jq_sign ) = '',NULL,CONCAT_WS( ', ', jq_policy, sy_policy, no_policy, jq_sign ))  AS concatenated_string
+        SELECT
+            order_no,
+            jq_policy,
+            sy_policy,
+            no_policy,
+            jq_sign,
+
+            NULLIF(
+                    CONCAT_WS(', ',
+                              NULLIF(jq_policy, ''),
+                              NULLIF(sy_policy, ''),
+                              NULLIF(no_policy, ''),
+                              NULLIF(jq_sign, '')
+                    ),
+                    ''
+            ) AS concatenated_string
         from ins_orders_external_policy where order_no = #{orderNo}
     </select>
 

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

@@ -4,10 +4,9 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.agreement.po.PtlAgreementAttribution;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.system.vo.SysSystemBusPermsVo;
+import com.jzg.commons.request.RequestSingleParam;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -53,4 +52,12 @@ public interface EsmInsCompanyClient {
                                                                                    @RequestHeader("Authorization") String authToken,
                                                                                    @RequestHeader("system_code") String systemCode);
 
+
+    @PostMapping("/esmInsCompany/getParentIds")
+    HttpResult getParentIds(@RequestBody List<String> companyIds);
+
+
+    @PostMapping("/esmInsCompany/getTopCompanyId")
+    HttpResult getTopCompanyId(@RequestSingleParam("companyId") String companyId);
+
 }

tenant/organization/src/main/java/com/jzg/organization/controller/AmountAuditingController.java

@@ -71,7 +71,7 @@ public class AmountAuditingController extends BaseController {
     @Operation(summary = "提现付款")
     public HttpResult verifyAmount(@RequestBody AmountAuditEditParam param){
         sysAmountAuditingService.verifyAmount(param);
-        return HttpResult.ok();
+        return HttpResult.ok("提现审核成功");
     }
 
     /**
@@ -82,6 +82,19 @@ public class AmountAuditingController extends BaseController {
     @Operation(summary = "提现驳回")
     public HttpResult rejectAmount(@RequestBody AmountAuditRejectParam param){
         sysAmountAuditingService.rejectAmount(param);
-        return HttpResult.ok();
+        return HttpResult.ok("提现驳回成功");
+    }
+
+    @PostMapping("/myPayment")
+    @Operation(summary = "我的付款")
+    public HttpResult myPayment(@RequestBody AmountAuditParam param){
+        Page<AmountAuditVo> amountAuditVoPage = sysAmountAuditingService.myPayment(param);
+        return HttpResult.ok(amountAuditVoPage);
+    }
+
+    @PostMapping("/applyWithdraw")
+    @Operation(summary = "申请提现")
+    public HttpResult applyWithdraw(@RequestBody ApplyWithdrawParam applyWithdrawParam){
+        return sysAmountAuditingService.applyWithdraw(applyWithdrawParam) ? HttpResult.ok("提现成功") : HttpResult.error("提现失败");
     }
 }

tenant/organization/src/main/java/com/jzg/organization/controller/NewCarJudgeRulesController.java

@@ -8,7 +8,9 @@ import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.enums.YesNoEnum;
 import com.jzg.commons.entity.po.OperatorTrajectory;
 import com.jzg.commons.entity.po.PtlAgreement;
+import com.jzg.commons.entity.po.PtlNewCarJudgeRules;
 import com.jzg.commons.entity.vo.AgreementVo;
+import com.jzg.commons.entity.vo.NewCarQuery;
 import com.jzg.commons.entity.vo.UpAndDownVo;
 import com.jzg.commons.service.OperatorTrajectoryService;
 import com.jzg.commons.util.AssertionUtils;
@@ -47,4 +49,28 @@ public class NewCarJudgeRulesController extends BaseController {
         Boolean result = newCarJudgeRulesService.compareRule(registerDate, companyId, vehicleType);
         return HttpResult.ok(result);
     }
+
+    @Operation(summary = "获取新旧车列表")
+    @PostMapping("getNewCarList")
+    public HttpResult getNewCarList(@RequestBody NewCarQuery newCarQuery){
+        return HttpResult.ok(newCarJudgeRulesService.getNewCarList(newCarQuery));
+    }
+
+    @Operation(summary = "添加新旧车规则")
+    @PostMapping("addNewCar")
+    public HttpResult addNewCar(@RequestBody PtlNewCarJudgeRules newCarJudgeRules){
+        return newCarJudgeRulesService.addNewCar(newCarJudgeRules) ? HttpResult.ok("添加新旧车规则成功") : HttpResult.error("添加新旧车规则失败");
+    }
+
+    @Operation(summary = "修改新旧车规则")
+    @PostMapping("updateNewCar")
+    public HttpResult updateNewCar(@RequestBody PtlNewCarJudgeRules newCarJudgeRules){
+        return newCarJudgeRulesService.updateNewCar(newCarJudgeRules) ? HttpResult.ok("修改新旧车规则成功") : HttpResult.error("修改新旧车规则失败");
+    }
+
+    @Operation(summary = "删除新旧车规则")
+    @PostMapping("delNewCar")
+    public HttpResult delNewCar(@RequestBody PtlNewCarJudgeRules newCarJudgeRules){
+        return newCarJudgeRulesService.delNewCar(newCarJudgeRules) ? HttpResult.ok("删除新旧车规则成功") : HttpResult.error("删除新旧车规则失败");
+    }
 }

tenant/organization/src/main/java/com/jzg/organization/controller/UserAccountController.java

@@ -2,11 +2,13 @@ package com.jzg.organization.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.account.po.SysUserAccountIncomeLog;
 import com.jzg.commons.entity.dto.IncomeAndExpenseParam;
 import com.jzg.commons.entity.dto.SysUserAccountPageParam;
 import com.jzg.commons.entity.dto.SysUserAccountParam;
+import com.jzg.commons.entity.dto.WithdrawParam;
 import com.jzg.commons.entity.po.SysUserAccount;
 import com.jzg.commons.entity.vo.SysUserAccountVo;
 import com.jzg.commons.entity.vo.UserAccountStatisVo;
@@ -30,6 +32,9 @@ public class UserAccountController {
     @Autowired
     private SysUserAccountIncomeLogService sysUserAccountIncomeLogService;
 
+    @Autowired
+    private BaseController baseController;
+
     /**
      * 用户账户信息查询
      * @param userId
@@ -92,4 +97,5 @@ public class UserAccountController {
     public HttpResult addUserAccountIncomeLog(@RequestBody List<SysUserAccountIncomeLog> incomeLogs){
         return HttpResult.ok(sysUserAccountIncomeLogService.saveBatch(incomeLogs));
     }
+
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/NewCarJudgeRulesMapper.java

@@ -1,6 +1,7 @@
 package com.jzg.organization.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.po.PtlAgreementCostRule;
 import com.jzg.commons.entity.po.PtlNewCarJudgeRules;
 import org.apache.ibatis.annotations.Delete;
@@ -8,5 +9,5 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface NewCarJudgeRulesMapper extends BaseMapper<PtlNewCarJudgeRules> {
-
+    public Page<PtlNewCarJudgeRules> getNewCarList(Page page);
 }

tenant/organization/src/main/java/com/jzg/organization/mapper/PtlAgreementMapper.java

@@ -35,6 +35,13 @@ public interface PtlAgreementMapper extends BaseMapper<PtlAgreement> {
      * @return
      */
     AgreementVo queryById(@Param("id") String id);
+
+    /**
+     * 根据保险公司id 获取协议列表
+     * @param companyId
+     * @return
+     */
+    List<PtlAgreement> getByCompanyId(String companyId);
 }
 
 

tenant/organization/src/main/java/com/jzg/organization/mapper/SysAmountAuditingMapper.java

@@ -22,6 +22,14 @@ public interface SysAmountAuditingMapper extends BaseMapper<SysAmountAuditing> {
      * @return
      */
     Page<AmountAuditVo> queryPage(Page page,@Param("param") AmountAuditParam param);
+
+    /**
+     * 我的付款列表分页
+     * @param page
+     * @param param
+     * @return
+     */
+    Page<AmountAuditVo> queryPaymentPage(Page page,@Param("param") AmountAuditParam param,@Param("userName") String userName);
 }
 
 

tenant/organization/src/main/java/com/jzg/organization/service/NewCarJudgeRulesService.java

@@ -1,7 +1,9 @@
 package com.jzg.organization.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.po.PtlNewCarJudgeRules;
+import com.jzg.commons.entity.vo.NewCarQuery;
 import com.jzg.organization.entity.WechatCustomerService;
 import org.springframework.stereotype.Service;
 
@@ -27,5 +29,33 @@ public interface NewCarJudgeRulesService extends IService<PtlNewCarJudgeRules> {
      */
     public Boolean compareRule(String registerDate,String companyId,String vehicleType);
 
+    /**
+     * 获取新旧车列表
+     * @param newCarQuery
+     * @return
+     */
+    public Page<PtlNewCarJudgeRules>  getNewCarList(NewCarQuery newCarQuery);
+
+    /**
+     * 添加新旧车规则
+     * @param ptlNewCarJudgeRules
+     * @return
+     */
+    public Boolean addNewCar(PtlNewCarJudgeRules ptlNewCarJudgeRules);
+
+    /**
+     * 修改新旧车规则
+     * @param ptlNewCarJudgeRules
+     * @return
+     */
+    public Boolean updateNewCar(PtlNewCarJudgeRules ptlNewCarJudgeRules);
+
+    /**
+     * 删除新旧车规则
+     * @param ptlNewCarJudgeRules
+     * @return
+     */
+    public Boolean delNewCar(PtlNewCarJudgeRules ptlNewCarJudgeRules);
+
 
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysAmountAuditingService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.dto.AmountAuditEditParam;
 import com.jzg.commons.entity.dto.AmountAuditParam;
 import com.jzg.commons.entity.dto.AmountAuditRejectParam;
+import com.jzg.commons.entity.dto.ApplyWithdrawParam;
 import com.jzg.commons.entity.po.SysAmountAuditing;
 import com.jzg.commons.entity.vo.AmountAuditVo;
 
@@ -53,4 +54,18 @@ public interface SysAmountAuditingService extends IService<SysAmountAuditing> {
      * @return
      */
     boolean isLock(String id);
+
+    /**
+     * 我的付款
+     * @param param
+     * @return
+     */
+    Page<AmountAuditVo> myPayment(AmountAuditParam param);
+
+    /**
+     * 申请提现
+     * @param applyWithdrawParam
+     * @return
+     */
+    Boolean applyWithdraw(ApplyWithdrawParam applyWithdrawParam);
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysUserAccountService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.dto.IncomeAndExpenseParam;
 import com.jzg.commons.entity.dto.SysUserAccountPageParam;
 import com.jzg.commons.entity.dto.SysUserAccountParam;
+import com.jzg.commons.entity.dto.WithdrawParam;
 import com.jzg.commons.entity.po.SysUserAccount;
 import com.jzg.commons.entity.vo.IncomeAndExpenseVo;
 import com.jzg.commons.entity.vo.SysUserAccountVo;
@@ -50,4 +51,5 @@ public interface SysUserAccountService extends IService<SysUserAccount> {
     List<IncomeAndExpenseVo> getIncomeAndExpense(IncomeAndExpenseParam param);
 
 
+
 }

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

@@ -12,14 +12,17 @@ import com.jzg.commons.entity.enums.YesNoEnum;
 import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.vo.*;
 import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
+import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.organization.client.EsmInsCompanyClient;
 import com.jzg.organization.mapper.NewCarJudgeRulesMapper;
 import com.jzg.organization.mapper.PtlAgreementMapper;
 import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.mapper.SysUserMapper;
 import com.jzg.organization.service.*;
+import com.thoughtworks.xstream.mapper.LambdaMapper;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +36,8 @@ import java.time.format.DateTimeParseException;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static java.util.Objects.nonNull;
+
 
 @Service
 public class NewCarJudgeRulesServiceImpl extends ServiceImpl<NewCarJudgeRulesMapper, PtlNewCarJudgeRules>
@@ -47,7 +52,7 @@ public class NewCarJudgeRulesServiceImpl extends ServiceImpl<NewCarJudgeRulesMap
         LambdaQueryWrapper<PtlNewCarJudgeRules> ptlNewCarJudgeRulesLambdaQueryWrapper = new LambdaQueryWrapper<>();
         ptlNewCarJudgeRulesLambdaQueryWrapper.eq(PtlNewCarJudgeRules::getCompanyId, companyId);
         ptlNewCarJudgeRulesLambdaQueryWrapper.eq(PtlNewCarJudgeRules::getIsEffective, 1);
-        if(Objects.nonNull(vehicleType) && !vehicleType.equals("")){
+        if(nonNull(vehicleType) && !vehicleType.equals("")){
             ptlNewCarJudgeRulesLambdaQueryWrapper.eq(PtlNewCarJudgeRules::getVehicleType,vehicleType);
         }
         List<PtlNewCarJudgeRules> ptlNewCarJudgeRules = baseMapper.selectList(ptlNewCarJudgeRulesLambdaQueryWrapper);
@@ -94,6 +99,39 @@ public class NewCarJudgeRulesServiceImpl extends ServiceImpl<NewCarJudgeRulesMap
         return false;
     }
 
+    @Override
+    public Page<PtlNewCarJudgeRules> getNewCarList(NewCarQuery newCarQuery) {
+//        Page<PtlNewCarJudgeRules> pages = baseMapper.selectPage(
+//                newCarQuery.getPage(),
+//                new LambdaQueryWrapper<PtlNewCarJudgeRules>()
+//                        .eq(nonNull(newCarQuery.getCompanyId()),
+//                                PtlNewCarJudgeRules::getCompanyId,
+//                                newCarQuery.getCompanyId()));
+        Page<PtlNewCarJudgeRules> newCarList = baseMapper.getNewCarList(newCarQuery.getPage());
+        return newCarList;
+    }
+
+    @Override
+    public Boolean addNewCar(PtlNewCarJudgeRules ptlNewCarJudgeRules) {
+        Long l = baseMapper.selectCount(new LambdaQueryWrapper<PtlNewCarJudgeRules>()
+                .eq(PtlNewCarJudgeRules::getCompanyId, ptlNewCarJudgeRules.getCompanyId())
+                .eq(PtlNewCarJudgeRules::getVehicleType, ptlNewCarJudgeRules.getVehicleType()));
+        AssertionUtils.isFail(l > 0,"规则已经存在,无法添加");
+        ptlNewCarJudgeRules.setId(IdGenerate.nextId());
+        return baseMapper.insert(ptlNewCarJudgeRules) > 0;
+    }
+
+    @Override
+    public Boolean updateNewCar(PtlNewCarJudgeRules ptlNewCarJudgeRules) {
+        return baseMapper.updateById(ptlNewCarJudgeRules) > 0;
+    }
+
+    @Override
+    public Boolean delNewCar(PtlNewCarJudgeRules ptlNewCarJudgeRules) {
+        AssertionUtils.isFail(Objects.isNull(ptlNewCarJudgeRules),"删除失败");
+        return baseMapper.deleteById(ptlNewCarJudgeRules.getId()) > 0;
+    }
+
 }
 
 

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

@@ -76,7 +76,7 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
     @Autowired
     private BaseController baseController;
 
-    private static final String[] COST_TYPE_DICT_KEY = new String[]{"checkbox", "select"};
+    private static final String[] COST_TYPE_DICT_KEY = new String[]{"checkbox", "select", "inputTag"};
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -94,10 +94,11 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
                 ptlAgreementCostAdd.setProductId(costAdd.getProductId());
                 ptlAgreementCostAdd.setProductName(costAdd.getProductName());
                 ptlAgreementCostAdd.setCoverRuleId(costAdd.getCoverRuleId());
-                boolean verify = verify(ptlAgreementCostAdd);
-                if (verify){
-                    throw new SystemException("已存在相同且有效的费用规则，请检查");
-                }
+                // 取消检验 评分 会重复!
+//                boolean verify = verify(ptlAgreementCostAdd);
+//                if (verify){
+//                    throw new SystemException("已存在相同且有效的费用规则，请检查");
+//                }
                 PtlAgreementCost ptlAgreementCost = BeanUtil.copyProperties(ptlAgreementCostAdd, PtlAgreementCost.class);
                 ptlAgreementCost.setCostRules(buildDescString(ptlAgreementCostAdd.getRuleConditions()));
                 if (baseMapper.insert(ptlAgreementCost) <= 0) {
@@ -131,7 +132,19 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
         if (!CollectionUtils.isEmpty(ptlAgreementCostEnd.getPtlAgreementCostTypeList())) {
             costTypeService.saveOrUpdateCostType(BeanUtil.copyToList(ptlAgreementCostEnd.getPtlAgreementCostTypeList(), PtlAgreementCostType.class), ptlAgreementCost.getId());
         }
+        // 处理minArray
         if (!CollectionUtils.isEmpty(ptlAgreementCostEnd.getRuleConditions())) {
+            ptlAgreementCostEnd.getRuleConditions().forEach(item->{
+                StringBuilder min = new StringBuilder();
+                if(item.getMinArray() != null && item.getMinArray().size() > 0){
+                    item.getMinArray().forEach(kk->{
+                        min.append(kk).append(",");
+                    });
+                    min.substring(0,min.length()-1);
+                    item.setMin(min.toString());
+                }
+
+            });
             costRuleService.saveOrUpdateCostRule(BeanUtil.copyToList(ptlAgreementCostEnd.getRuleConditions(), PtlAgreementCostRule.class), ptlAgreementCost.getId());
         }
         return HttpResult.ok(ReturnInformation.UPDATE_SUCCESS);

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

@@ -184,7 +184,7 @@ public class PtlAgreementDispatchServiceImpl extends ServiceImpl<PtlAgreementDis
                     }else{
                         action.setActionName(sysDict.getLabel());
                         if("specify_agreement".equals(action.getActionCode())){
-                            if(action.getActionJson() != null) {
+                            if(action.getActionJson() != null && !action.getActionJson().isEmpty()) {
                                 PtlAgreement byId = ptlAgreementService.getById(action.getActionJson().get("agreementId").toString());
                                 if(byId != null) {
                                     action.getActionJson().put("agreementName", byId.getAgreementName());

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

@@ -506,9 +506,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
     @Override
     public List<PtlAgreement> getByCompanyId(String companyId,String systemCode) {
-        List<PtlAgreement> ptlAgreements = baseMapper.selectList(new LambdaQueryWrapper<PtlAgreement>()
-                .eq(PtlAgreement::getCompanyId, companyId));
-        return ptlAgreements;
+        List<PtlAgreement> byCompanyId = baseMapper.getByCompanyId(companyId);
+        return byCompanyId;
     }
 
 }

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

@@ -3,18 +3,22 @@ package com.jzg.organization.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.agreement.vo.PtlAgreementUndwrtRulesAttrQueryVo;
 import com.jzg.commons.entity.dto.RulesAttParam;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttrLink;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesDictLabal;
 import com.jzg.commons.entity.po.SysDict;
+import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.StringUtils;
+import com.jzg.organization.client.EsmInsCompanyClient;
 import com.jzg.organization.mapper.PtlAgreementUndwrtRulesAttrMapper;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrLinkService;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrService;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesDictService;
 import com.jzg.organization.service.PtlAreaLicenseService;
+import com.jzg.quotation.commons.client.PlatformClient;
 import org.redisson.api.RList;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +44,9 @@ public class PtlAgreementUndwrtRulesAttrServiceImpl extends ServiceImpl<PtlAgree
     RedissonClient redissonClient;
     private PtlAgreementUndwrtRulesAttrQueryVo ptlAgreementUndwrtRulesAttrQueryVo;
 
+    @Autowired
+    EsmInsCompanyClient esmInsCompanyClient;
+
     @Override
     public List<PtlAgreementUndwrtRulesAttr> getUndwrtRulesAttrList() {
         this.ptlAgreementUndwrtRulesAttrQueryVo = ptlAgreementUndwrtRulesAttrQueryVo;
@@ -152,12 +159,17 @@ public class PtlAgreementUndwrtRulesAttrServiceImpl extends ServiceImpl<PtlAgree
     @Override
     public Map<String, List<PtlAgreementUndwrtRulesAttr>> attrGroup(RulesAttParam param) {
         try {
+
             LambdaQueryWrapper<PtlAgreementUndwrtRulesAttr> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.like(StringUtils.isNotEmpty(param.getScopeApplication()), PtlAgreementUndwrtRulesAttr::getScopeApplication, param.getScopeApplication());
             if(Objects.nonNull(param.getCompanyId())){
+                List<String> companyIds = new ArrayList<>();
+                companyIds.add(param.getCompanyId());
+                HttpResult topCompanyId = esmInsCompanyClient.getTopCompanyId(param.getCompanyId());
+                AssertionUtils.isFail(topCompanyId.getCode() == 500,"获取保司信息出错");
                 lambdaQueryWrapper.eq(PtlAgreementUndwrtRulesAttr::getCompanyIds, "all")
                         .or()
-                        .eq(PtlAgreementUndwrtRulesAttr::getCompanyIds, param.getCompanyId());
+                        .eq(PtlAgreementUndwrtRulesAttr::getCompanyIds, topCompanyId.getMsg());
             }else{
                 lambdaQueryWrapper.eq(PtlAgreementUndwrtRulesAttr::getCompanyIds, "all");
             }

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

@@ -14,6 +14,7 @@ import com.jzg.commons.entity.vo.AgreementRulesVo;
 import com.jzg.commons.entity.vo.CostListVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostVo;
 import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.costsorrule.constants.OperatorConstant;
 import com.jzg.organization.mapper.PtlAgreementUndwrtRulesAttrLinkMapper;
 import com.jzg.organization.mapper.PtlAgreementUndwrtRulesAttrMapper;
@@ -103,6 +104,7 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
         queryWrapper.last("LIMIT 1"); // 只取一个结果
         PtlAgreementUndwrtRules maxRules = baseMapper.selectOne(queryWrapper);
         PtlAgreementUndwrtRules rules = new PtlAgreementUndwrtRules();
+        rules.setId(IdGenerate.nextId());
         rules.setOrderNum(Objects.nonNull(maxRules) ? maxRules.getOrderNum() + 1 : 1);
         rules.setAgreementId(param.getAgreementId());
 

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

@@ -482,9 +482,18 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
         SchemeResultVo schemeResultVo = new SchemeResultVo();
         //基础方案
-        SchemeResultVo.SchemeVo schemeVo = schemeInsuranceInfo.stream().filter(x -> x.getSchemeType().equals("1")).findFirst().orElse(null);
-        assert schemeVo != null;
-        schemeResultVo.setSchemes(schemeVo.getInfos());
+        List<SchemeResultVo.SchemeVo> schemeVo = schemeInsuranceInfo.stream().filter(x -> x.getSchemeType().equals("1")).collect(Collectors.toList());
+
+        List<SchemeResultVo.SchemeInfoVo> allInfo = new ArrayList<>();
+
+        schemeVo.forEach(scheme->{
+            scheme.getInfos().forEach(item->{
+                allInfo.add(item);
+            });
+
+        });
+
+        schemeResultVo.setSchemes(allInfo);
         //把基础方案的商业险的value 赋值
         schemeResultVo.getSchemes().forEach(schemeInfoVo -> {
             schemeInfoVo.getKinds().forEach(kind -> {

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

@@ -7,18 +7,17 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.base.StateResult;
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.dto.AmountAuditEditParam;
-import com.jzg.commons.entity.dto.AmountAuditParam;
-import com.jzg.commons.entity.dto.AmountAuditRejectParam;
-import com.jzg.commons.entity.po.InsFeeOrders;
-import com.jzg.commons.entity.po.SysAmountAuditing;
-import com.jzg.commons.entity.po.SysUserAccount;
+import com.jzg.commons.entity.dto.*;
+import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.vo.AmountAuditVo;
+import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.organization.mapper.SysAmountAuditingMapper;
 import com.jzg.organization.service.SysAmountAuditingService;
 import com.jzg.organization.service.SysUserAccountService;
+import com.jzg.organization.service.SysUserJzgInfoBankCardService;
+import com.jzg.organization.service.SysUserJzgInfoService;
 import com.jzg.organization.state.AuditState;
 import com.jzg.organization.state.listener.AuditStateListener;
 import org.redisson.api.RBucket;
@@ -27,7 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
@@ -52,6 +53,12 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     @Autowired
     SysUserAccountService userAccountService;
 
+    @Autowired
+    private SysUserJzgInfoBankCardService sysUserJzgInfoBankCardService;
+
+    @Autowired
+    private SysUserJzgInfoService sysUserJzgInfoService;
+
     private static final String AMOUNT_LOCK_PREFIX = "amountLock:";
 
     @Override
@@ -155,8 +162,14 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
                 SysUserAccount userAccount = userAccountService.queryByUserId(audit.getUserId());
                 AssertionUtils.isFail(Objects.isNull(userAccount), "用户账户数据异常！");
                 AssertionUtils.isFail(audit.getAmount().compareTo(audit.getBalanceAmount()) > 0, "提现金额大于账户余额！");
+
+                if(userAccount.getSumAmount().compareTo(audit.getAmount()) < 0){
+                    throw new SystemException("账户金额少于提现金额,请审核账户");
+                }
+                userAccount.setSumAmount(userAccount.getSumAmount().subtract(audit.getAmount()));
                 userAccount.setSumAmountPaid(userAccount.getSumAmountPaid().add(audit.getAmount()));
                 userAccount.setSumAmountUnpaid(userAccount.getSumAmountUnpaid().subtract(audit.getAmount()));
+
                 userAccountService.saveOrUpdate(userAccount);
             }else{
                 AssertionUtils.isFail(true, "提现申请已被" + audit.getReceiveUser() + "领取！");
@@ -195,6 +208,44 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
         RBucket<Object> bucket = redissonClient.getBucket(AMOUNT_LOCK_PREFIX + id);
         return bucket.isExists();
     }
+
+    @Override
+    public Page<AmountAuditVo> myPayment(AmountAuditParam param) {
+        Page<AmountAuditVo> amountAuditVoPage = baseMapper.queryPaymentPage(param.getPage(), param, baseController.getUserName());
+        return amountAuditVoPage;
+    }
+
+    @Override
+    public Boolean applyWithdraw(ApplyWithdrawParam applyWithdrawParam) {
+
+        if(applyWithdrawParam.getWithdrawAmount().compareTo(BigDecimal.ZERO) <= 0){
+            throw new SystemException("提现金额错误,请重新输入");
+        }
+
+        SysUserAccount sysUserAccount = userAccountService.queryByUserId(baseController.getUserId());
+        AssertionUtils.isFail(Objects.isNull(sysUserAccount),"找不到用户");
+
+        // 当前用户的余额
+        BigDecimal sumAmount = sysUserAccount.getSumAmount();
+
+        if(sumAmount.compareTo(applyWithdrawParam.getWithdrawAmount()) < 0){
+            throw new SystemException("无法提现,请检查当前账户余额");
+        }
+
+        // 获取用户的银行卡信息
+        SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoService.getUserByUserId(baseController.getUserId());
+        List<SysUserJzgInfoBankCardDto> bankCardByUserId = sysUserJzgInfoBankCardService.getBankCardByUserId(sysUserJzgInfo.getId(),baseController.getSystemCode());
+        // 查找ID相同 并且是已审核的
+        if(!bankCardByUserId.stream().anyMatch(x -> x.getId().equals(applyWithdrawParam.getBankCardId()) && x.getAuditStatus().equals("1"))){
+            throw new SystemException("提供的银行卡信息错误");
+        }
+        SysUserJzgInfoBankCardDto sysUserJzgInfoBankCardDto = bankCardByUserId.stream().filter(x -> x.getId().equals(applyWithdrawParam.getBankCardId())).findFirst().get();
+
+        // 构造提现对象
+        SysAmountAuditing sysAmountAuditing = new SysAmountAuditing(applyWithdrawParam,sysUserAccount,sysUserJzgInfoBankCardDto,baseController.getUserId());
+        baseMapper.insert(sysAmountAuditing);
+        return true;
+    }
 }
 
 

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

@@ -4,15 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.base.BaseController;
-import com.jzg.commons.entity.dto.IncomeAndExpenseParam;
-import com.jzg.commons.entity.dto.InsFeeOrdersParam;
-import com.jzg.commons.entity.dto.SysUserAccountPageParam;
-import com.jzg.commons.entity.dto.SysUserAccountParam;
+import com.jzg.commons.entity.dto.*;
 import com.jzg.commons.entity.po.*;
 import com.jzg.commons.entity.vo.IncomeAndExpenseVo;
 import com.jzg.commons.entity.vo.SysUserAccountVo;
 import com.jzg.commons.entity.vo.SysUserWalletVo;
 import com.jzg.commons.entity.vo.UserAccountStatisVo;
+import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.AssertionUtils;
 import com.jzg.organization.client.QuoteClient;
 import com.jzg.organization.mapper.SysUserAccountMapper;
 import com.jzg.organization.service.*;
@@ -312,6 +311,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         return result;
     }
 
+
 }
 
 

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

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author quchen
@@ -53,7 +54,9 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
             if (sysUserJzgInfoBankCardDto.getFileId() != null) {
                 String cardFileId = sysUserJzgInfoBankCardDto.getFileId();
                 SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectById(cardFileId);
-                sysUserJzgInfoBankCardDto.setCardFileUrl(MinioUtils.getPresignedObjectUrl("jzg",sysUploadFiles.getFileName()));
+                if(Objects.nonNull(sysUploadFiles)) {
+                    sysUserJzgInfoBankCardDto.setCardFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
+                }
             }
             List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList = sysUserJzgInfoBankCardRecordMapper
                     .selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCardRecord>()
@@ -98,7 +101,7 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
     @Override
     public boolean setDefaultCard(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
         List<SysUserJzgInfoBankCard> sysUserJzgInfoBankCardList = sysUserJzgInfoBankCardMapper
-                .selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getUserId, sysUserJzgInfoBankCardVo.getUserId()));
+                .selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfoBankCardVo.getUserId()));
         sysUserJzgInfoBankCardList.forEach(sysUserJzgInfoBankCard -> {
             sysUserJzgInfoBankCard.setDefault(false);
             sysUserJzgInfoBankCardMapper.updateById(sysUserJzgInfoBankCard);

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

@@ -758,11 +758,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         SysUserJzgInfoBankCard sysUserJzgInfoBankCard = new SysUserJzgInfoBankCard();
         BeanUtils.copyProperties(sysUserJzgInfoBankCardVo, sysUserJzgInfoBankCard);
         sysUserJzgInfoBankCard.setFileId(fileId);
-        sysUserJzgInfoBankCard.setUserId(sysUserJzgInfo.getUserId());
+        sysUserJzgInfoBankCard.setUserInfoId(sysUserJzgInfo.getId());
         sysUserJzgInfoBankCard.setSystemCode(sysUserJzgInfo.getSystemCode());
         if (sysUserJzgInfoBankCardVo.isDefault()) {
             List<SysUserJzgInfoBankCard> sysUserJzgInfoBankCardList = sysUserJzgInfoBankCardService
-                    .list(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getUserId, sysUserJzgInfo.getUserId()));
+                    .list(new LambdaQueryWrapper<SysUserJzgInfoBankCard>().eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfo.getUserId()));
             for (SysUserJzgInfoBankCard sysUserJzgInfoBankCard1 : sysUserJzgInfoBankCardList) {
                 sysUserJzgInfoBankCard1.setDefault(false);
                 sysUserJzgInfoBankCardService.updateById(sysUserJzgInfoBankCard1);

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jzg.organization.mapper.NewCarJudgeRulesMapper">
+
+
+    <select id="getNewCarList" resultType="com.jzg.commons.entity.po.PtlNewCarJudgeRules">
+        select
+            pncjr.*,
+            eic.name as company_name
+        from
+            ptl_new_car_judge_rules pncjr
+        left join esm_ins_company eic on eic.id = pncjr.company_id
+    </select>
+
+
+</mapper>

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

@@ -202,4 +202,25 @@
             </if>
         </where>
     </select>
+
+    <select id="getByCompanyId" resultType="com.jzg.commons.entity.po.PtlAgreement">
+        select
+            *
+        FROM
+            ptl_agreement
+        where
+            is_delete = 0
+          and company_id in (
+            WITH RECURSIVE t AS (
+                SELECT id
+                FROM esm_ins_company
+                WHERE id = #{companyId}
+                  AND parent_id = 0
+                UNION ALL
+                SELECT c.id
+                FROM esm_ins_company c
+                         JOIN t ON c.parent_id = t.id
+            )
+            SELECT id FROM t)
+    </select>
 </mapper>

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

@@ -86,4 +86,44 @@
         </where>
         ORDER BY saa.create_time desc
     </select>
+
+
+    <select id="queryPaymentPage" resultType="com.jzg.commons.entity.vo.AmountAuditVo">
+        SELECT
+        saa.id,suji.name as name, su.mobile as mobile,suji.type_attr as attrType,
+        sujim.name as managerName,sum.mobile as managerMobile,saa.create_time as createTime,
+        saa.amount, saa.balance_amount as balanceAmount,saa.account_name AS accountName,
+        saa.bank_card_num as bankCardNum, saa.bank_name as bankName, saa.bank_num as bankNum
+        FROM sys_amount_auditing saa
+        LEFT JOIN sys_user_jzg_info suji on saa.user_id = suji.user_id
+        LEFT JOIN sys_user su on su.id = saa.user_id
+        LEFT JOIN sys_user_jzg_info sujim on saa.manager_user_id = sujim.user_id
+        LEFT JOIN sys_user sum on sum.id = saa.manager_user_id
+        LEFT JOIN sys_user_jzg_info sujia on saa.auditing_user_id = sujia.user_id
+        LEFT JOIN sys_user sua on sua.id = saa.auditing_user_id
+        where
+            1=1
+        and saa.receive_user = #{userName}
+            <if test="param.salesman != null and param.salesman != ''">
+                and (su.username = #{param.salesman} or su.mobile = #{param.salesman})
+            </if>
+            <if test="param.attrType != null ">
+                and suji.type_attr = #{param.attrType}
+            </if>
+
+            <if test="param.createTimeStart != null and param.createTimeEnd != null">
+                and DATE_FORMAT(saa.create_time, '%Y-%m-%d') between #{param.createTimeStart} AND #{param.createTimeEnd}
+            </if>
+            <if test="param.auditTimeStart != null and param.auditTimeEnd != null">
+                and DATE_FORMAT(saa.auditing_time, '%Y-%m-%d') between #{param.auditTimeStart} AND #{param.auditTimeEnd}
+            </if>
+            <if test="param.auditingUser != null and param.auditingUser != ''">
+                and (sua.username = #{param.auditingUser} or sua.mobile = #{param.auditingUser})
+            </if>
+
+            <if test="param.auditingStatus != null ">
+                and saa.auditing_status = #{param.auditingStatus}
+            </if>
+        ORDER BY saa.create_time desc
+    </select>
 </mapper>

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

@@ -25,12 +25,11 @@
             sujif.file_url as cardFileUrl
         from
             sys_user_jzg_info_bank_card sujibc
-        left join sys_user su on su.id = sujibc.user_id
-        left join sys_user_jzg_info suji on suji.user_id = su.id and suji.system_code = #{systemCode}
+        left join sys_user_jzg_info suji on suji.user_id = sujibc.user_info_id and suji.system_code = #{systemCode}
         left join sys_user_jzg_info_file sujif on sujif.id = sujibc.file_id
         where
             1=1
-            and suji.id = #{userInfoId}
+            and sujibc.user_info_id = #{userInfoId}
     </select>
 
 
@@ -43,7 +42,7 @@
         ss.sys_name as systemName
         from
         sys_user_jzg_info_bank_card sujibc
-        left join sys_user su on su.id = sujibc.user_id
+        left join sys_user su on su.id = sujibc.user_info_id
         left join sys_user_jzg_info suji on suji.user_id = su.id
         left join sys_system ss on ss.sys_code = sujibc.system_code
         where