Merge branch 'dev' into release

epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml

@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:

epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml

@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/prod:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:

epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml

@@ -10,6 +10,7 @@ services:
       - "/opt/epmet-cloud-logs/test:/logs"
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
+    restart: "unless-stopped"
     deploy:
       resources:
         limits:

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java

@@ -58,6 +58,11 @@ public class CodeAuditResultDTO implements Serializable {
      */
 	private String result;
 
+	/**
+	 * 是否加急
+	 */
+	private Boolean isSpeed;
+
     /**
      * 原因
      */

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java

@@ -25,6 +25,11 @@ public class SubmitAuditFormDTO implements Serializable {
 	 */
 	private Boolean isSpeed;
 
+	/**
+	 * isSpeed=true时，是否是审核失败后的反馈提审
+	 */
+	private Boolean isRepeat;
+
 	/**
 	 * 小程序版本说明和功能解释
 	 */

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java

@@ -71,6 +71,10 @@ public class CodeVersionInfoResultDTO implements Serializable {
 		 *
 		 */
 		private String status;
+		/**
+		 *
+		 */
+		private Boolean isSpeed;
 	}
 
 	@Data

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.138
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.139
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.138</version>
+    <version>0.0.139</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java

@@ -58,6 +58,11 @@ public class CodeAuditResultEntity extends BaseEpmetEntity {
      */
 	private String result;
 
+	/**
+	 * 是否加急
+	 */
+	private Boolean isSpeed;
+
     /**
      * 原因
      */

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -183,6 +183,7 @@ public class CodeServiceImpl implements CodeService {
 		//审核版本
 		CodeCustomerDTO audit = codeCustomerService.getAuditInfo(formDTO.getCustomerId(), formDTO.getClientType());
 		if(null != audit) {
+			CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(audit.getId());
 			CodeVersionInfoResultDTO.AuditBean auditBean = new CodeVersionInfoResultDTO.AuditBean();
 			auditBean.setCodeId(audit.getId());
 			auditBean.setVersion(audit.getUserVersion());
@@ -191,7 +192,6 @@ public class CodeServiceImpl implements CodeService {
 				//获取小程序调用令牌
 				AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
 				//获取审核结果信息
-				CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(audit.getId());
 				//调用微信API获取最新审核状态
 				WxMaCodeAuditStatusReq request = new WxMaCodeAuditStatusReq();
 				request.setAuditId(auditResult.getAuditId());
@@ -222,6 +222,7 @@ public class CodeServiceImpl implements CodeService {
 				}
 			}
 			auditBean.setStatus(audit.getStatus());
+			auditBean.setIsSpeed(auditResult.getIsSpeed());
 			auditBean.setCommitTime(DateUtils.format(audit.getCommitTime(), DateUtils.DATE_TIME_PATTERN));
 			auditBean.setAuditTime(DateUtils.format(audit.getAuditTime(), DateUtils.DATE_TIME_PATTERN));
 			resultDTO.setAudit(auditBean);
@@ -283,6 +284,7 @@ public class CodeServiceImpl implements CodeService {
 					codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxResult.getErrorMsg());
 			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
 		}
+		boolean speedSuccess = false;
 		if(formDTO.getIsSpeed()) {
 			//调用微信API 加急审核
 			WxMaSpeedUpAuditReq speedRequest = new WxMaSpeedUpAuditReq();
@@ -291,8 +293,9 @@ public class CodeServiceImpl implements CodeService {
 			if (!wxSpeedResult.success()) {
 				saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(),
 						codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxSpeedResult.getErrorMsg());
-				throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg());
+				log.error(wxSpeedResult.getErrorMsg());
 			}
+			speedSuccess = wxSpeedResult.success();
 		}
 		//获取审核结果信息
 		CodeAuditResultDTO codeAuditResultDTO = codeAuditResultService.getAuditResultByCodeId(formDTO.getCodeId());
@@ -302,18 +305,24 @@ public class CodeServiceImpl implements CodeService {
 			codeAuditResultDTO.setCustomerId(codeCustomerDTO.getCustomerId());
 			codeAuditResultDTO.setCodeId(codeCustomerDTO.getId());
 			codeAuditResultDTO.setAuditId(wxResult.getData());
+			codeAuditResultDTO.setIsSpeed(speedSuccess);
 			codeAuditResultDTO.setResult(CodeConstant.AUDITING);
 			codeAuditResultService.save(codeAuditResultDTO);
 		} else {
-			codeAuditResultDTO.setFeedbackInfo(formDTO.getFeedbackInfo());
-			codeAuditResultDTO.setFeedbackStuff(formDTO.getFeedbackStuff());
 			codeAuditResultService.update(codeAuditResultDTO);
 			codeAuditResultService.deleteById(codeAuditResultDTO.getId());
 			codeAuditResultDTO = new CodeAuditResultDTO();
+			codeAuditResultDTO.setFeedbackInfo(formDTO.getFeedbackInfo());
+			codeAuditResultDTO.setFeedbackStuff(formDTO.getFeedbackStuff());
 			codeAuditResultDTO.setCustomerId(codeCustomerDTO.getCustomerId());
 			codeAuditResultDTO.setCodeId(codeCustomerDTO.getId());
 			codeAuditResultDTO.setAuditId(wxResult.getData());
 			codeAuditResultDTO.setResult(CodeConstant.AUDITING);
+			if (formDTO.getIsRepeat()) {
+				codeAuditResultDTO.setIsSpeed(true);
+			} else {
+				codeAuditResultDTO.setIsSpeed(speedSuccess);
+			}
 			codeAuditResultService.save(codeAuditResultDTO);
 		}
 		//更新代码表状态
@@ -656,6 +665,8 @@ public class CodeServiceImpl implements CodeService {
 					codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxSpeedResult.getErrorMsg());
 			throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg());
 		}
+		codeAuditResultDTO.setIsSpeed(true);
+		codeAuditResultService.update(codeAuditResultDTO);
 	}
 
 	@Override

epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.9__thirdUpdate.sql

@@ -0,0 +1 @@
+ALTER TABLE code_audit_result ADD COLUMN IS_SPEED tinyint NULL DEFAULT 0 COMMENT '是否加急' AFTER RESULT;

epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.38
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.39
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络

epmet-module/resi-mine/resi-mine-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.38</version>
+    <version>0.3.39</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>