Merge branch 'develop'

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/dronepilot/PilotCertificationController.java

@@ -20,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * @Author small
@@ -192,4 +193,12 @@ public class PilotCertificationController extends BaseController {
         return certificationService.deletePilotFromTeam(pilotId);
     }
 
+
+    @ApiOperation(value = "查询团队里面的飞手id")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("/selectPilotIdList")
+    public List<Integer> selectPilotListByTeamId(HttpServletRequest request) {
+        return certificationService.selectPilotIdList(this.getUserLoginInfoFromRedis(request).getUserAccountId());
+    }
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/dronepilot/PilotCertificationDao.java

@@ -135,4 +135,11 @@ public interface PilotCertificationDao {
      * @param pilotId 飞手的user_id
      */
     void deletePilotFromTeam(Integer pilotId);
+
+    /**
+     * 根据后台（团队）id查询所属于该团队飞手的用户id
+     * @param backUserId
+     * @return {@link List}<{@link Integer}>
+     */
+    List<Integer> selectPilotIdList(Integer backUserId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/dronepilot/PilotCertificationService.java

@@ -11,6 +11,8 @@ import com.mmc.iuav.user.model.qo.dronepilot.*;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
 import com.mmc.iuav.user.model.vo.dronepilot.PilotCertificationVO;
 
+import java.util.List;
+
 /**
  * @Author small
  * @Date 2023/7/28 9:35
@@ -55,4 +57,6 @@ public interface PilotCertificationService {
     ResultBody selectCompanyInfoByPilotId(Integer pilotId);
 
     ResultBody deletePilotFromTeam(Integer pilotId);
+
+    List<Integer> selectPilotIdList(Integer backUserId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/dronepilot/impl/PilotCertificationServiceImpl.java

@@ -627,4 +627,9 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
         certificationDao.deletePilotFromTeam(pilotId);
         return ResultBody.success();
     }
+
+    @Override
+    public List<Integer> selectPilotIdList(Integer backUserId) {
+        return certificationDao.selectPilotIdList(backUserId);
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CooperationServiceImpl.java

@@ -24,6 +24,7 @@ import com.mmc.iuav.user.service.UserAccountService;
 import com.mmc.iuav.user.util.LocationUtils;
 import com.mmc.iuav.user.util.SmsUtil;
 import com.mmc.iuav.user.util.TDateUtil;
+import com.sun.xml.bind.v2.TODO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -259,6 +260,7 @@ public class CooperationServiceImpl implements CooperationService {
         bUserAccountVO.setAlertPwd(userAccountVO.getPhoneNum());
         bUserAccountVO.setAccountStatus(1);
         // 根据加盟类型分配角色
+        // TODO加盟商标签
         if (userApplyTagDO.getCooperationTagId().equals(3)) {
             bUserAccountVO.setRoleId(RoleEnums.LEASE_FRANCHISEE.getId());
         } else if (userApplyTagDO.getCooperationTagId().equals(5)) {

csm-service/cms-service-user/src/main/resources/mapper/dronepilot/PilotCertificationDao.xml

@@ -506,5 +506,9 @@
                                      inner join pilot_join_team pjt on cbu.back_user_account_id = pjt.back_user_id
         where pjt.pilot_user_id = #{userId}
     </select>
+    <select id="selectPilotIdList" resultType="java.lang.Integer">
+        select pilot_user_id from pilot_join_team pjt left join user_account  ua on pjt.pilot_user_id = ua.id
+                             where ua.disable = 0 and back_user_id = #{backUserId}
+    </select>
 
 </mapper>

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: 7014c0f4759c385c47536425de2eba8af240d338
+  newTag: 0edf5ddaddda8faeece63c0434cab6b497001121