Merge branch 'develop'

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/dronepilot/PilotCertificationDTO.java

@@ -119,4 +119,7 @@ public class PilotCertificationDTO {
     @ApiModelProperty(value = "是否是管理员")
     private int isAdmin;
 
+    @ApiModelProperty(value = "飞手简历")
+    private String pilotResume;
+
 }

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

@@ -177,4 +177,11 @@ public interface PilotCertificationDao {
     int getUserId(String name);
 
     int chongqian(Integer userId, BigDecimal money);
+
+    /**
+     * 判断用户是否通过飞手认证
+     * @param userId 用户id
+     * @return int
+     */
+    int pilotAuditStatus(Integer userId);
 }

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

@@ -163,6 +163,7 @@ public class PilotCertificationDO {
                 .reasonId(this.reasonId)
                 .reason(this.reason)
                 .userImg(this.userImg)
+                .pilotResume(this.pilotResume)
                 .build();
     }
 

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

@@ -5,6 +5,7 @@ import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.dao.MessageDao;
 import com.mmc.iuav.user.dao.UserServiceDao;
+import com.mmc.iuav.user.dao.dronepilot.PilotCertificationDao;
 import com.mmc.iuav.user.entity.*;
 import com.mmc.iuav.user.feign.PaymentAppApi;
 import com.mmc.iuav.user.model.qo.MessageQO;
@@ -47,6 +48,9 @@ public class MessageServiceImpl implements MessageService {
     @Autowired
     private UserPointsService userPointsService;
 
+    @Autowired
+    private PilotCertificationDao pilotCertificationDao;
+
     @Qualifier("com.mmc.iuav.user.feign.PaymentAppApi")
     @Autowired
     private PaymentAppApi paymentAppApi;

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

@@ -241,7 +241,8 @@
                ua.phone_num,
                pc.reason_id,
                pr.reason,
-               ua.user_img
+               ua.user_img,
+               pc.pilot_resume
         FROM pilot_certification pc
                  LEFT JOIN real_name_auth rna ON pc.user_account_id = rna.user_account_id
                  LEFT JOIN user_account ua ON pc.user_account_id = ua.id
@@ -271,7 +272,8 @@
                ua.phone_num,
                pc.reason_id,
                pr.reason,
-               ua.user_img
+               ua.user_img,
+               pc.pilot_resume
         FROM pilot_certification pc
                  LEFT JOIN real_name_auth rna ON pc.user_account_id = rna.user_account_id
                  LEFT JOIN user_account ua ON pc.user_account_id = ua.id
@@ -610,6 +612,12 @@
     <select id="getUserId" resultType="java.lang.Integer">
         select user_account_id from real_name_auth where user_name = #{name}
     </select>
+    <select id="pilotAuditStatus" resultType="java.lang.Integer">
+        select count(*)
+        from pilot_certification
+        where user_account_id = #{userId}
+        and audit_status = 1
+    </select>
 
     <update id="chongqian">
         update pay_wallet

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: d09e9d1d159f90fefe98d9993c70839d0122f4f7
+  newTag: fec1d46ffa94e111a1e627fad1a9b43df02d2c8d