PilotAuditStatusQO(update)

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/dronepilot/PilotAuditStatusQO.java

@@ -33,4 +33,7 @@ public class PilotAuditStatusQO {
     @ApiModelProperty(value = "审批人", required = false, example = "信息不完善", hidden = true)
     private Integer operatorUserId;
 
+    @ApiModelProperty(value = "是否是第一次审批", required = false, example = "是否是第一次审批", hidden = true)
+    private Integer isFirstApprove;
+
 }

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

@@ -58,4 +58,6 @@ public interface PilotCertificationDao {
     List<PilotReasonDO> backListReason();
 
     PilotReasonDO selectPilotReason(String reasonId);
+
+    int selectFirstApprove(Integer id);
 }

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

@@ -218,15 +218,22 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
 
     @Override
     public ResultBody updateAuditStatus(PilotAuditStatusQO param, LoginSuccessDTO userLoginInfoFromRedis) {
+        int i = certificationDao.selectFirstApprove(param.getId());
+        UserAccountDO userAccountDO = certificationDao.selectUserAccountId(param);
+        if (param.getAuditStatus() == 1 && i == 0) {
+            //积分
+            extracted(userAccountDO.getId());
+        }
+        if (param.getAuditStatus() == 1) {
+            param.setIsFirstApprove(1);
+        }
         param.setOperatorUserId(userLoginInfoFromRedis.getUserAccountId());
         certificationDao.updateAuditStatus(param);
-        UserAccountDO userAccountDO = certificationDao.selectUserAccountId(param);
+
         PilotCertificationLogDO pilotCertificationLog = new PilotCertificationLogDO(userAccountDO.getId(), userLoginInfoFromRedis.getUserAccountId(), CertificationMessage.match(param.getAuditStatus()));
         certificationDao.insertPilotLog(pilotCertificationLog);
-
         SendCertificationMessage match = SendCertificationMessage.match(param.getAuditStatus());
 
-
         this.sendMsgFlyerInfoAuth(userAccountDO, match.getMessage(), param);
         return ResultBody.success();
     }
@@ -247,8 +254,6 @@ public class PilotCertificationServiceImpl implements PilotCertificationService
         String reason = null;
         if (param.getAuditStatus() == 1) {
             reason = userAccountDO.getUserName() + match.getMessage();
-            //积分
-            extracted(userAccountDO.getId());
         }
         if (param.getAuditStatus() == 2) {
             PilotReasonDO pilotReasonDO = certificationDao.selectPilotReason(param.getReasonId());

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

@@ -266,7 +266,8 @@
             audit_status = #{auditStatus},
             reason_id=#{reasonId},
             operator_user_id=#{operatorUserId},
-            update_time=NOW()
+            update_time=NOW(),
+            is_first_approve=#{isFirstApprove}
         </set>
         where id = #{id}
     </update>
@@ -321,4 +322,9 @@
         from pilot_reason
         where id = #{reasonId}
     </select>
+    <select id="selectFirstApprove" resultType="java.lang.Integer">
+        select is_first_approve
+        from pilot_certification
+        where id = #{id}
+    </select>
 </mapper>

csm-service/cms-service-user/src/main/resources/mapper/userpoints/UserPointsDetailsDao.xml

@@ -36,7 +36,7 @@
                  INNER JOIN user_account ua ON upd.user_account_id = ua.id
         WHERE ua.`disable` = 0
           AND upd.user_account_id = #{userAccountId}
-        order by upd.create_time desc
+        order by upd.create_time desc, upd.id desc
             limit #{pageNo}, #{pageSize}
     </select>
 
@@ -63,7 +63,7 @@
                  INNER JOIN user_account ua ON upd.user_account_id = ua.id
         WHERE ua.`disable` = 0
           AND upd.user_account_id = #{userAccountId}
-        order by upd.create_time desc
+        order by upd.create_time desc, upd.id desc
             limit #{pageNo}, #{pageSize}
     </select>