Antiloveg лет назад: 8
Родитель
Сommit
1521d83048

+ 5 - 0
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -94,4 +94,9 @@ public class ErrorConstants {
 
 	public static final String	MCODE_EMPTY_ERROR				= "MCODE_EMPTY_ERROR";
 
+	public static final String	IDENTITY_PAY_OVER_TIME			= "IDENTITY_PAY_OVER_TIME";
+
+	public static final String	OVER_MAX_WRONG_COUNT			= "OVER_MAX_WRONG_COUNT";
+
+	public static final String	WRONG_MONEY						= "WRONG_MONEY";
 }

+ 2 - 2
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -1097,7 +1097,7 @@
 	
 	<select id="selectAuditorOrgIdentityDetailByUserId" parameterType="java.lang.String" resultType="com.goafanti.user.bo.AuditorOrgIdentityDetailBo">
 		select  u.aid, u.mid,
-			oi.id, oi.uid,  oi.aft_username as aftUsername,  oi.unit_name as unitName,  oi.identity_type as identityType,
+			 oi.id, oi.uid,  oi.aft_username as aftUsername,  oi.unit_name as unitName,  oi.identity_type as identityType,
 			 oi.first_contacts as firstContacts,  oi.first_mobile as firstMobile,  oi.second_contacts as secondContacts,
 			 oi.second_mobile as secondMobile,  oi.third_contacts as thirdContacts,  oi.third_mobile as thirdMobile,
 			 oi.legal_person as legalPerson,  oi.legal_person_id_card as legalPersonIdCard,  oi.registration_time as registrationTime,
@@ -1106,7 +1106,7 @@
 			 oi.org_code_url as orgCodeUrl,  oi.banks, bank_branch as bankBranch,  oi.bank_card_number as bankCardNumber,
 			 oi.location_province as locationProvince,  oi.location_city as locationCity,  oi.location_area as locationArea,
 			 oi.validation_amount as validationAmount,  oi.payment_date as paymentDate,  oi.audit_status as auditStatus,
-			 oi.last_year_tax_report_url as lastYearTaxReportUrl
+			 oi.last_year_tax_report_url as lastYearTaxReportUrl, oi.field
 		from user u 
 		LEFT JOIN organization_identity oi on oi.uid = u.id
 		where uid = #{uid,jdbcType=VARCHAR}

+ 10 - 0
src/main/java/com/goafanti/user/bo/OrgIdentityDetailBo.java

@@ -158,6 +158,16 @@ public class OrgIdentityDetailBo {
 	 */
 	private String		lastYearTaxReportUrl;
 
+	private String		field;
+
+	public String getField() {
+		return field;
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
 	public String getLastYearTaxReportUrl() {
 		return lastYearTaxReportUrl;
 	}

+ 8 - 8
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -707,14 +707,14 @@ public class UserApiController extends BaseApiController {
 			if ((System.currentTimeMillis() - u.getPaymentDate().getTime()) > 432000000) {
 				u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
 				userIdentityService.updateByPrimaryKeySelective(u);
-				res.getError().add(buildError("", "1"));// 超过打款日期5日,无法提交确认
+				res.getError().add(buildError(ErrorConstants.IDENTITY_PAY_OVER_TIME));// 超过打款日期5日,无法提交确认
 				return res;
 			}
 			if (MAX_WRONG_COUNT.equals(u.getWrongCount())) {
 				u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
 				u.setProcess(IdentityProcess.RESULTS.getCode());// 5
 				userIdentityService.updateByPrimaryKeySelective(u);
-				res.getError().add(buildError("", "2"));// 输入错误金额次数过多
+				res.getError().add(buildError(ErrorConstants.OVER_MAX_WRONG_COUNT));// 输入错误金额次数过多
 				return res;
 			}
 			if (0 != (u.getAmountMoney().compareTo(userIdentity.getAmountMoney()))) {
@@ -724,9 +724,9 @@ public class UserApiController extends BaseApiController {
 				if (0 == t) {
 					u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
 					u.setProcess(IdentityProcess.RESULTS.getCode());// 5
-					res.getError().add(buildError("", "2"));// 输入错误金额次数过多
+					res.getError().add(buildError(ErrorConstants.OVER_MAX_WRONG_COUNT));// 输入错误金额次数过多
 				} else {
-					res.getError().add(buildError("", "输入打款金额错误,您还有" + t + "次机会"));
+					res.getError().add(buildError(ErrorConstants.WRONG_MONEY, "", t));
 				}
 				userIdentityService.updateByPrimaryKeySelective(u);
 				return res;
@@ -785,14 +785,14 @@ public class UserApiController extends BaseApiController {
 			if (System.currentTimeMillis() - o.getPaymentDate().getTime() > 432000000) {
 				o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
 				organizationIdentityService.updateByPrimaryKeySelective(o);
-				res.getError().add(buildError("", "1"));// 超过打款日期5日,无法提交确认
+				res.getError().add(buildError(ErrorConstants.IDENTITY_PAY_OVER_TIME));// 超过打款日期5日,无法提交确认
 				return res;
 			}
 			if (MAX_WRONG_COUNT.equals(o.getWrongCount())) {
 				o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
 				o.setProcess(IdentityProcess.RESULTS.getCode());// 5
 				organizationIdentityService.updateByPrimaryKeySelective(o);
-				res.getError().add(buildError("", "2"));// 输入错误金额次数过多
+				res.getError().add(buildError(ErrorConstants.OVER_MAX_WRONG_COUNT));// 输入错误金额次数过多
 				return res;
 			}
 			if (0 != (o.getValidationAmount().compareTo(orgIdentity.getValidationAmount()))) {
@@ -801,9 +801,9 @@ public class UserApiController extends BaseApiController {
 				if (0 == t) {
 					o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
 					o.setProcess(IdentityProcess.RESULTS.getCode());// 5
-					res.getError().add(buildError("", "2"));// 输入错误金额次数过多
+					res.getError().add(buildError(ErrorConstants.OVER_MAX_WRONG_COUNT));// 输入错误金额次数过多
 				} else {
-					res.getError().add(buildError("", "输入打款金额错误,您还有" + t + "次机会"));
+					res.getError().add(buildError(ErrorConstants.WRONG_MONEY, "", t));
 				}
 				organizationIdentityService.updateByPrimaryKeySelective(o);
 				return res;

+ 6 - 0
src/main/resources/props/error.properties

@@ -80,3 +80,9 @@ MCODE_OVERTIME_ERROR=\u624b\u673a\u9a8c\u8bc1\u7801\u8d85\u65f6\u5931\u6548\uff0
 RESET_CODE_ERROR=\u9875\u9762\u5931\u6548,\u8bf7\u91cd\u65b0\u83b7\u53d6\u9a8c\u8bc1\u7801\uff01
 
 RESET_CODE_OVERTIME=\u9875\u9762\u8d85\u65f6\u5931\u6548,\u8bf7\u91cd\u65b0\u83b7\u53d6\u9a8c\u8bc1\u7801\uff01
+
+IDENTITY_PAY_OVER_TIME=\u8d85\u8fc7\u6253\u6b3e\u65e5\u671f5\u65e5\uff0c\u65e0\u6cd5\u63d0\u4ea4\u786e\u8ba4\uff01
+
+OVER_MAX_WRONG_COUNT=\u8f93\u5165\u9519\u8bef\u91d1\u989d\u6b21\u6570\u8fc7\u591a\uff01
+
+WRONG_MONEY=\u8f93\u5165\u6253\u6b3e\u91d1\u989d\u9519\u8bef\uff0c\u60a8\u8fd8\u6709{0}\u6b21\u673a\u4f1a\uff01