Bläddra i källkod

添加商户入驻易宝回调状态

july 4 år sedan
förälder
incheckning
dd80874230

+ 11 - 1
ldt-core/src/main/java/org/springblade/flow/shop/task/QueryAuthStatus.java

@@ -75,6 +75,16 @@ public class QueryAuthStatus {
 				YopResponse yopResponse = yeepaySaasService.wechatAuthQuery(item);
 				JSONObject resObj = JSON.parseObject(yopResponse.getStringResult());
 				String applymentState = resObj.getString("applymentState");
+
+				//不操作状态
+				boolean noOperate = Objects.equals(YeepayApiConstant.applymentState.APPLYMENT_STATE_WAITTING_FOR_AUDIT.name(), applymentState) ||
+					Objects.equals(YeepayApiConstant.applymentState.APPLYMENT_STATE_EDITTING.name(), applymentState) ||
+					Objects.equals(YeepayApiConstant.applymentState.APPLYMENT_STATE_WAITTING_FOR_CONFIRM_LEGALPERSON.name(), applymentState) ||
+					Objects.equals(YeepayApiConstant.applymentState.APPLYMENT_STATE_CANCELED.name(), applymentState);
+				if (noOperate) {
+					return;
+				}
+
 				//状态为待用户验证
 				boolean confirm = Objects.equals(YeepayApiConstant.applymentState.APPLYMENT_STATE_WAITTING_FOR_CONFIRM_CONTACT.name(), applymentState);
 				if (confirm) {
@@ -91,7 +101,7 @@ public class QueryAuthStatus {
 
 				//状态为驳回
 				boolean rejected = Objects.equals(YeepayApiConstant.applymentState.APPLYMENT_STATE_REJECTED.name(), applymentState);
-				if (rejected || (!passed && !confirm)) {
+				if (rejected) {
 					applyReject(item, resObj.getString("rejectReason"));
 				}