工作室批量修改

src/main/java/com/ydtech/modules/admin/controller/SysAgencyLeaderController.java

@@ -122,7 +122,7 @@ public class SysAgencyLeaderController extends BaseController {
      */
     @PostMapping("/editAll")
     @ApiOperation(value = "批量修改配置")
-    public HttpResult editAll(@RequestBody List<SysAgencyLeaderDto> sysAgencyLeaderDto) {
+    public HttpResult editAll(@RequestBody SysAgencyLeaderListDto sysAgencyLeaderDto) {
         return HttpResult.ok(this.sysAgencyLeaderService.editAll(sysAgencyLeaderDto));
     }
 

src/main/java/com/ydtech/modules/admin/dao/SysAgencyLeaderMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.admin.model.SysAgencyLeader;
 import com.ydtech.modules.admin.model.dto.AgencyUserInsAreaDto;
 import com.ydtech.modules.admin.model.dto.DeptBalanceDto;
+import com.ydtech.modules.admin.model.dto.SysAgencyLeaderListDto;
 import com.ydtech.modules.admin.model.dto.SysAgencyLeaderPageDto;
 import com.ydtech.modules.admin.model.vo.AgencyUserInsAreaVo;
 import com.ydtech.modules.admin.model.vo.DeptBalanceVo;
@@ -48,5 +49,7 @@ public interface SysAgencyLeaderMapper extends BaseMapper<SysAgencyLeader> {
      * @return
      */
     IPage<SysAgencyLeader> queryLeaderPage(Page page,@Param("dto") SysAgencyLeaderPageDto sysAgencyLeaderPageDto);
+
+    int updateByIds(@Param("dto") SysAgencyLeaderListDto sysAgencyLeaderDto);
 }
 

src/main/java/com/ydtech/modules/admin/model/dto/SysAgencyLeaderListDto.java

@@ -0,0 +1,13 @@
+package com.ydtech.modules.admin.model.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SysAgencyLeaderListDto {
+
+    private String proportional;
+
+    private List<Integer> ids;
+}

src/main/java/com/ydtech/modules/admin/service/SysAgencyLeaderService.java

@@ -31,7 +31,7 @@ public interface SysAgencyLeaderService extends IService<SysAgencyLeader> {
 
 
     boolean edit(SysAgencyLeaderDto sysAgencyLeaderDto);
-    boolean editAll(List<SysAgencyLeaderDto> sysAgencyLeaderDto);
+    boolean editAll(SysAgencyLeaderListDto sysAgencyLeaderDto);
     void editInfo(SysAgencyLeaderDeptDto sysAgencyLeaderDeptDto);
 
     boolean delById(Integer id);

src/main/java/com/ydtech/modules/admin/service/impl/SysAgencyLeaderServiceImpl.java

@@ -345,36 +345,36 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
         sysDeptService.updateDept(sysDept);
 
         //不修改负责人userId传null
-        String userId = sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserId();
-        String loginId = BaseController.getUserId();
-        SysAgencyLeader sysAgencyLeader1 = sysAgencyLeaderMapper.selectById(sysAgencyLeaderDeptDto.getSysAgencyLeader().getId());
-        //修改管理员
-        List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new QueryWrapper<SysAgencyLeader>().lambda().eq(SysAgencyLeader::getDelFlag, 1));
-        List<String> userIdList = sysAgencyLeaders.stream().map(SysAgencyLeader::getUserId).collect(Collectors.toList());
-        if (userIdList.contains(userId)) {
-            throw new DescribeException(sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserName() + "已是工作室管理员，不可重复配置");
-        }
-        List<SysPartner> sysPartners = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1));
-        if (sysPartners.size() > 0) {
-            List<String> list = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
-            if (list.contains(sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserId())) {
-                throw new DescribeException(sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserName() + "已是合伙人，不可设置为机构负责人");
-            }
-        }
-
-        //修改负责人时解除合伙人或者推荐人与机构负责人的关系
-        List<SysRelationPerson> sysRelationPeople = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
-                .eq(SysRelationPerson::getAgencyLeaderId, sysAgencyLeader1.getUserId())
-                .eq(SysRelationPerson::getDelFlag, 1)
-                .eq(SysRelationPerson::getType, 1));
-        if (sysRelationPeople.size() > 0) {
-            throw new DescribeException(sysAgencyLeader1.getUserName() + "有推荐关系，不允许修改");
-        }
-
-        SysAgencyLeader sysAgencyLeader = BeanUtil.copyProperties(sysAgencyLeaderDeptDto.getSysAgencyLeader(), SysAgencyLeader.class);
-        sysAgencyLeader.setUpdateTime(new Date());
-        sysAgencyLeader.setUpdateBy(loginId);
-        sysAgencyLeaderMapper.updateById(sysAgencyLeader);
+//        String userId = sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserId();
+//        String loginId = BaseController.getUserId();
+//        SysAgencyLeader sysAgencyLeader1 = sysAgencyLeaderMapper.selectById(sysAgencyLeaderDeptDto.getSysAgencyLeader().getId());
+//        //修改管理员
+//        List<SysAgencyLeader> sysAgencyLeaders = sysAgencyLeaderMapper.selectList(new QueryWrapper<SysAgencyLeader>().lambda().eq(SysAgencyLeader::getDelFlag, 1));
+//        List<String> userIdList = sysAgencyLeaders.stream().map(SysAgencyLeader::getUserId).collect(Collectors.toList());
+//        if (userIdList.contains(userId)) {
+//            throw new DescribeException(sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserName() + "已是工作室管理员，不可重复配置");
+//        }
+//        List<SysPartner> sysPartners = sysPartnerMapper.selectList(new LambdaQueryWrapper<SysPartner>().eq(SysPartner::getDelFlag, 1));
+//        if (sysPartners.size() > 0) {
+//            List<String> list = sysPartners.stream().map(SysPartner::getUserId).collect(Collectors.toList());
+//            if (list.contains(sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserId())) {
+//                throw new DescribeException(sysAgencyLeaderDeptDto.getSysAgencyLeader().getUserName() + "已是合伙人，不可设置为机构负责人");
+//            }
+//        }
+//
+//        //修改负责人时解除合伙人或者推荐人与机构负责人的关系
+//        List<SysRelationPerson> sysRelationPeople = sysRelationPersonMapper.selectList(new LambdaQueryWrapper<SysRelationPerson>()
+//                .eq(SysRelationPerson::getAgencyLeaderId, sysAgencyLeader1.getUserId())
+//                .eq(SysRelationPerson::getDelFlag, 1)
+//                .eq(SysRelationPerson::getType, 1));
+//        if (sysRelationPeople.size() > 0) {
+//            throw new DescribeException(sysAgencyLeader1.getUserName() + "有推荐关系，不允许修改");
+//        }
+//
+//        SysAgencyLeader sysAgencyLeader = BeanUtil.copyProperties(sysAgencyLeaderDeptDto.getSysAgencyLeader(), SysAgencyLeader.class);
+//        sysAgencyLeader.setUpdateTime(new Date());
+//        sysAgencyLeader.setUpdateBy(loginId);
+//        sysAgencyLeaderMapper.updateById(sysAgencyLeader);
     }
 
     @Override
@@ -1080,20 +1080,14 @@ public class SysAgencyLeaderServiceImpl extends ServiceImpl<SysAgencyLeaderMappe
     }
 
     @Override
-    public boolean editAll(List<SysAgencyLeaderDto> sysAgencyLeaderDto) {
+    public boolean editAll(SysAgencyLeaderListDto sysAgencyLeaderDto) {
         String loginId = BaseController.getUserId();
-        if (CollectionUtil.isEmpty(sysAgencyLeaderDto)) {
+        if (sysAgencyLeaderDto ==null) {
             throw new DescribeException( "批量修改参数不能为空");
         }
-        for (SysAgencyLeaderDto agencyLeaderDto : sysAgencyLeaderDto) {
-            SysAgencyLeader sysAgencyLeader = new SysAgencyLeader();
-            sysAgencyLeader.setId(agencyLeaderDto.getId());
-            sysAgencyLeader.setProportional(agencyLeaderDto.getProportional());
-            sysAgencyLeader.setUpdateBy(loginId);
-            return sysAgencyLeaderMapper.updateById(sysAgencyLeader) > 0;
-        }
 
-        return false;
+
+        return sysAgencyLeaderMapper.updateByIds(sysAgencyLeaderDto)>0;
     }
 
     @Override

src/main/java/com/ydtech/modules/order/service/impl/InsCrawlerOrderServiceImpl.java

@@ -249,31 +249,31 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
     @Override
     public HttpResult<Object> verifyPayment(String subOrderNo) {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(subOrderNo);
-        // 请求地址
-        String apiUrl = ptlCrawlerApiService.getApiUrl(insAreaCompany.getAgreementId(), PtlCrawlerApiType.API_5);
-        //组装参数
-        CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo());
-        CrawlerVerifyPaymentResponse crawlerAuditResponse = insCrawlerOrderComponents.request(apiUrl, insAreaCompany.getCompanyId(),
-                PtlCrawlerApiType.API_5.getDesc(), crawlerBaseRequest, CrawlerVerifyPaymentResponse.class);
-
-        // 0未缴费，1已缴费
-        if (crawlerAuditResponse.getState() == CrawlerVerifyPaymentConstants.PAID) {
-            // 保单号
-            insAreaCompany.setJqpolicyno(crawlerAuditResponse.getJqApplication());
-            insAreaCompany.setSypolicyno(crawlerAuditResponse.getSyApplication());
-            // 3 交叉销售
-            List<CrawlerVerifyPaymentResponse.DrivingInsurancesDTO> drivingInsurances = crawlerAuditResponse.getDrivingInsurancesDto();
-            insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(drivingInsurances)));
-
-            //  add  by  hxl  添加自动更新状态
-            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
+//        // 请求地址
+//        String apiUrl = ptlCrawlerApiService.getApiUrl(insAreaCompany.getAgreementId(), PtlCrawlerApiType.API_5);
+//        //组装参数
+//        CrawlerBaseRequest crawlerBaseRequest = new CrawlerBaseRequest(insAreaCompany.getInsOrderNo());
+//        CrawlerVerifyPaymentResponse crawlerAuditResponse = insCrawlerOrderComponents.request(apiUrl, insAreaCompany.getCompanyId(),
+//                PtlCrawlerApiType.API_5.getDesc(), crawlerBaseRequest, CrawlerVerifyPaymentResponse.class);
+//
+//        // 0未缴费，1已缴费
+//        if (crawlerAuditResponse.getState() == CrawlerVerifyPaymentConstants.PAID) {
+//            // 保单号
+//            insAreaCompany.setJqpolicyno(crawlerAuditResponse.getJqApplication());
+//            insAreaCompany.setSypolicyno(crawlerAuditResponse.getSyApplication());
+//            // 3 交叉销售
+//            List<CrawlerVerifyPaymentResponse.DrivingInsurancesDTO> drivingInsurances = crawlerAuditResponse.getDrivingInsurancesDto();
+//            insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(drivingInsurances)));
+//
+//            //  add  by  hxl  添加自动更新状态
+//            insSubOrderUpdateDetailService.insertData(insAreaCompany,insAreaCompany.getOrderstatus(),InsOrderStatusEnum.ACCEPT_INSURANCE.getCode(),"1");
 
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode());//已承保
             insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
             return HttpResult.ok("支付成功");
-        }
-
-        throw new SystemException("此订单还未缴费");
+//        }
+//
+//        throw new SystemException("此订单还未缴费");
     }
 
     @Override

src/main/resources/mapper/modules/admin/SysAgencyLeaderMapper.xml

@@ -23,6 +23,24 @@
         dept_id,dept_name,comlevel,
         source,proportional,create_time,create_by,update_time,update_by,del_flag
     </sql>
+    <update id="updateByIds">
+        update sys_agency_leader
+        <set>
+            <if test="dto.proportional != null and dto.proportional != ''">
+                proportional = #{dto.proportional}
+            </if>
+        </set>
+        <where>
+            <if test="dto.ids != null and dto.ids != '' and dto.ids.size() > 0">
+                and id in
+                <foreach collection="dto.ids" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+        </where>
+
+
+    </update>
     <select id="getByUserIdList" resultType="com.ydtech.modules.admin.model.SysAgencyLeader">
         select *
         from sys_agency_leader sal