修复认证失败bug app下单

sp-core/sp-api/src/main/java/com/pj/api/client/admin/AdminInterface.java

@@ -2,10 +2,7 @@ package com.pj.api.client.admin;
 
 import com.pj.api.FeignInterceptor;
 import com.pj.api.consts.FeignConsts;
-import com.pj.api.dto.AppUserDto;
-import com.pj.api.dto.DistrictDTO;
-import com.pj.api.dto.DistrictInfoDTO;
-import com.pj.api.dto.MessageDto;
+import com.pj.api.dto.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -55,6 +52,9 @@ public interface AdminInterface {
     @RequestMapping("/TbMessage/rpc/save")
     public void messageSave(@RequestBody MessageDto dto);
 
+    @RequestMapping("/AppUser/rpc/audit")
+    public boolean audit(@RequestBody EnterpriseAuditDto dto);
+
     /**
      * 根据城市名称查找地区数据
      *

sp-core/sp-api/src/main/java/com/pj/api/client/admin/AdminInterfaceFallback.java

@@ -1,9 +1,6 @@
 package com.pj.api.client.admin;
 
-import com.pj.api.dto.DistrictDTO;
-import com.pj.api.dto.DistrictInfoDTO;
-import com.pj.api.dto.AppUserDto;
-import com.pj.api.dto.MessageDto;
+import com.pj.api.dto.*;
 import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,6 +61,11 @@ public class AdminInterfaceFallback implements FallbackFactory<AdminInterface> {
             }
 
             @Override
+            public boolean audit(EnterpriseAuditDto dto) {
+                return true;
+            }
+
+            @Override
             public DistrictInfoDTO findInfoByCityName(String cityName) {
                 return null;
             }

sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/TbEnterpriseService.java

@@ -61,12 +61,6 @@ public class TbEnterpriseService extends ServiceImpl<TbEnterpriseMapper, TbEnter
     AdminInterface adminInterface;
 
     /**
-     * 远程调用
-     */
-    @Autowired
-    private LevelOneServerInterface levelOneServerInterface;
-
-    /**
      * 订单表mapper
      */
     @Autowired
@@ -349,13 +343,17 @@ public class TbEnterpriseService extends ServiceImpl<TbEnterpriseMapper, TbEnter
         }
         String name = StpUserUtil.getLoginName();
         tbEnterprise.setJudgeStatus(judgeStatus).setJudgeContent(judgeContent).setJudgeTime(new Date()).setJudgeBy(name);
-        this.updateById(tbEnterprise);
         if (judgeStatus == 1) {
             EnterpriseAuditDto auditDto = new EnterpriseAuditDto();
             auditDto.setAuth("1");
             auditDto.setFkId(id);
             auditDto.setId(Long.parseLong(tbEnterprise.getCreateBy()));
-            return levelOneServerInterface.audit(auditDto);
+            System.out.println("商户审核:"+auditDto.getId());
+            boolean row = adminInterface.audit(auditDto);
+            if (row) {
+                this.updateById(tbEnterprise);
+            }
+            return row;
         }
         return false;
     }

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserService.java

@@ -158,7 +158,6 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 		if(aBoolean){
 			//发送通知给收购商
 			MessageDto dto = new MessageDto();
-			dto.setUrl("/pages/market/one/merchant/order/list");
 			dto.setUserId(appUser.getId());
 			dto.setContents("恭喜商户信息认证成功!");
 			adminInterface.messageSave(dto);

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserApiController.java

@@ -42,6 +42,13 @@ public class AppUserApiController {
         return AjaxJson.getSuccessData(a);
     }
 
+    /** 获取审核状态 */
+    @RequestMapping("getAuth")
+    public AjaxJson getAuth(){
+        return AjaxJson.getSuccessData(appUserService.getById(StpAPPUserUtil.getAPPLoginInfo().getLoginId()).getAuth());
+    }
+
+
     /**
      * 用户注册
      */

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserController.java

@@ -111,9 +111,10 @@ public class AppUserController {
 	}
 	/** 商户认证 */
 	@RequestMapping("rpc/audit")
-	public boolean audit(EnterpriseAuditDto dto){
+	public boolean audit(@RequestBody EnterpriseAuditDto dto){
 		AppUser user=new AppUser();
 		BeanUtils.copyProperties(dto, user);
+		System.out.println("EnterpriseAuditDto:"+dto.getFkId());
 		return appUserService.updateById(user);
 	}