Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmCooperateManageService.java

@@ -199,38 +199,33 @@ public class KwmCooperateManageService {
         Long userId = LoginUserHolder.getUserId();
         Date date = new Date();
         //判断是否可以解除-销售订单
-        Boolean order = tradeOrderInfoService.associateEnt(kwmCooperates.get(0).getInviteeEntId(),kwmCooperates.get(0).getInviterEntId());
-        if (order)
-        {
+        KwmCooperate kwmCooperate = kwmCooperates.get(0);
+        Boolean order = tradeOrderInfoService.associateEnt(kwmCooperate.getInviteeEntId(), kwmCooperate.getInviterEntId());
+        if (order) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.MSG_031);
         }
 
         //判断是否可以解除-托运和承运
-        HttpResult response = transportDubboService.checkLogisticsOrderIsFinishByEntId(kwmCooperates.get(0).getInviteeEntId(),kwmCooperates.get(0).getInviterEntId());
-        log.info("getInviteeEntId-{}",kwmCooperates.get(0).getInviteeEntId());
-        log.info("getInviterEntId-{}",kwmCooperates.get(0).getInviterEntId());
-        log.info("aaaaa-{}",JSONObject.toJSONString(response));
+        HttpResult response = transportDubboService.checkLogisticsOrderIsFinishByEntId(kwmCooperate.getInviteeEntId(), kwmCooperate.getInviterEntId());
+        log.info("getInviteeEntId-{}", kwmCooperate.getInviteeEntId());
+        log.info("getInviterEntId-{}", kwmCooperate.getInviterEntId());
+        log.info("aaaaa-{}", JSONObject.toJSONString(response));
         Integer receivedResult = response.getCode();
-        if (!receivedResult.toString().equals(String.valueOf(HttpStatus.SUCCESS_CODE)))
-        {
+        if (!receivedResult.toString().equals(String.valueOf(HttpStatus.SUCCESS_CODE))) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.MSG_032);
         }
-        Map<OrderEnum, List<String>> ledgerMap = paymentDubboService.checkLedger(kwmCooperates.get(0).getInviteeEntId(),kwmCooperates.get(0).getInviterEntId());
-        if (!CollectionUtils.isEmpty(ledgerMap.get(OrderEnum.LOGISTICS)))
-        {
+        Map<OrderEnum, List<String>> ledgerMap = paymentDubboService.checkLedger(kwmCooperate.getInviteeEntId(), kwmCooperate.getInviterEntId());
+        if (!CollectionUtils.isEmpty(ledgerMap.get(OrderEnum.LOGISTICS))) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.MSG_034);
         }
-        if (!CollectionUtils.isEmpty(ledgerMap.get(OrderEnum.TRADE)))
-        {
+        if (!CollectionUtils.isEmpty(ledgerMap.get(OrderEnum.TRADE))) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.MSG_034);
         }
-        Map<OrderEnum,List<String>> settlementMap= paymentDubboService.checkSettlement(kwmCooperates.get(0).getInviteeEntId(),kwmCooperates.get(0).getInviterEntId());
-        if (!CollectionUtils.isEmpty(settlementMap.get(OrderEnum.LOGISTICS)))
-        {
+        Map<OrderEnum, List<String>> settlementMap = paymentDubboService.checkSettlement(kwmCooperate.getInviteeEntId(), kwmCooperate.getInviterEntId());
+        if (!CollectionUtils.isEmpty(settlementMap.get(OrderEnum.LOGISTICS))) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.MSG_034);
         }
-        if (!CollectionUtils.isEmpty(settlementMap.get(OrderEnum.TRADE)))
-        {
+        if (!CollectionUtils.isEmpty(settlementMap.get(OrderEnum.TRADE))) {
             throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.MSG_034);
         }
         kwmCooperates.forEach(item -> {
@@ -301,7 +296,7 @@ public class KwmCooperateManageService {
         CooperateManageQueryReqDto reqDto = buildQueryParam(reqVo);
         List<CooperateManageQueryResDto> list = kwmCooperateMapper.findManageList(reqDto);
         if (CollectionUtils.isEmpty(list)) {
-            return ;
+            return;
         }
         List<CooperateManageQueryResVo> cooperateManageQueryResVos = commonBusinessService.getCooperateManageQueryResVos(list);
         if (CollectionUtils.isEmpty(cooperateManageQueryResVos)) {

sckw-modules/sckw-manage/src/main/resources/mapper/KwmCooperateMapper.xml

@@ -115,7 +115,7 @@
                  #{item}
              </foreach>
          </if>
-        <if test="reqDto.keywords != null and reqDto.keywords != ''">
+        <if test="reqDto.keywords != null and (reqDto.targetEntIdList == null or reqDto.targetEntIdList.size() == 0)">
             and (a.invitee_contacts like concat('%', #{reqDto.keywords}, '%') or
                  a.inviter_contacts like concat('%', #{reqDto.keywords}, '%') or
                  a.invitee_phone like concat('%', #{reqDto.keywords}, '%') or
@@ -240,7 +240,7 @@
                 #{item}
             </foreach>
         </if>
-        <if test="reqDto.keywords != null">
+        <if test="reqDto.keywords != null and (reqDto.targetEntIdList == null or reqDto.targetEntIdList.size() == 0)">
             and (a.invitee_contacts like concat('%', #{reqDto.keywords}, '%') or
                  a.inviter_contacts like concat('%', #{reqDto.keywords}, '%') or
                  a.invitee_phone like concat('%', #{reqDto.keywords}, '%') or