提交代码

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdWxController.java

@@ -258,7 +258,7 @@ public class PeasantHouseholdWxController extends BaseController {
                 RequestContext.setAppKey("AMOS_STUDIO");
                 RequestContext.setProduct("AMOS_STUDIO_WEB");
                 RequestContext.setToken(requestContext.getToken());
-                Privilege.agencyUserClient.multDeleteUser(peasantHousehold.getAmosUserId());
+                Privilege.agencyUserClient.multDeleteUser(peasantHousehold.getAmosUserId(),true);
             }
             if (e instanceof BadRequest || e.getCause() instanceof BadRequest) {
                 throw new BadRequest(e.getMessage());

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java

@@ -509,7 +509,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
                     throw new RuntimeException("请扫描经销商开发人员区域二维码进行注册");
                 }
                 FeignClientResult<AgencyUserModel> registerUserModelRestult = doRegister(wxDTO);
-                if (registerUserModelRestult == null || registerUserModelRestult.getStatus() != 200) {
+                if (registerUserModelRestult == null || registerUserModelRestult.getStatus() != 200||registerUserModelRestult.getResult() == null) {
                     log.error("用户手机号码 => " + wxDTO.getPhoneNo() + " 调用平台创建用户信息失败: " + registerUserModelRestult.getDevMessage());
                     throw new RuntimeException(registerUserModelRestult.getMessage());
                 }