（主账号）转变成企业用户后之前的订单统计的角标还是会统计。

（子账号）绑定企业用户后，之前自己订单会带入企业订单当中，包括待评价的订单

crmeb-admin/src/main/java/com/zbkj/admin/controller/platform/NewPlatformApi.java

@@ -11,6 +11,7 @@ import com.zbkj.admin.controller.newapi.request.SetLineOfCreditRequest;
 import com.zbkj.admin.controller.newapi.request.UserEnterpriseSearchRequest;
 import com.zbkj.common.constants.BalanceRecordConstants;
 import com.zbkj.common.model.admin.SystemAdmin;
+import com.zbkj.common.model.order.Order;
 import com.zbkj.common.model.organization.Organization;
 import com.zbkj.common.model.organization.OrganizationDepartmentUser;
 import com.zbkj.common.model.organization.VO.OrganizationDepartmentVO;
@@ -86,6 +87,8 @@ public class NewPlatformApi {
     private OrganizationDepartmentService organizationDepartmentService;
     @Autowired
     private OrganizationDepartmentUserService organizationDepartmentUserService;
+    @Autowired
+    private OrderService orderService;
 
 
     @ApiOperation(value = "平台端企业用户分页列表")
@@ -94,6 +97,7 @@ public class NewPlatformApi {
                                                             @Validated PageParamRequest pageParamRequest) {
 
         LambdaQueryWrapper<UserEnterprise> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserEnterprise::getIsDelete, 0);
         if (request.getRealName() != null) {
             queryWrapper.like(UserEnterprise::getRealName, request.getRealName());
         }
@@ -154,11 +158,31 @@ public class NewPlatformApi {
                 return CommonResult.failed("该用户已成为企业子用户");
             }
             LambdaQueryWrapper<UserEnterprise> queryWrapper2 = new LambdaQueryWrapper<>();
+            queryWrapper2.eq(UserEnterprise::getIsDelete, 0);
             queryWrapper2.eq(UserEnterprise::getUserId, userEnterprise.getUserId());
             List<UserEnterprise> list2 = userEnterpriseService.list(queryWrapper2);
             if (list2.size() != 0) {
                 return CommonResult.failed("该用户已认证过企业用户");
             }
+
+            LambdaQueryWrapper<UserEnterprise> queryWrapper4 = new LambdaQueryWrapper<>();
+            queryWrapper4.eq(UserEnterprise::getIsDelete, 0);
+            queryWrapper4.eq(UserEnterprise::getOrganizationId, userEnterprise.getOrganizationId());
+            List<UserEnterprise> list4 = userEnterpriseService.list(queryWrapper4);
+            if (null != list4 && list4.size() > 0) {
+                return CommonResult.failed("该企业已被用户认证");
+            }
+
+
+            LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            orderLambdaQueryWrapper.in(Order::getStatus, 0, 1, 3, 4);
+            orderLambdaQueryWrapper.eq(Order::getIsDel, false);
+            orderLambdaQueryWrapper.eq(Order::getUid, byId.getId());
+            List<Order> orderList = orderService.list(orderLambdaQueryWrapper);
+            if (null != orderList && orderList.size() > 0) {
+                return CommonResult.failed("该用户存在未完成订单,请完成订单后进行认证");
+            }
+
             //需要判断认证这个是否已经认证过了 子用户也需要做校验添加过的子用户不能添加
             userEnterprise.setLineOfCredit(BigDecimal.valueOf(0));
             userEnterprise.setUsedLineOfCredit(BigDecimal.valueOf(0));
@@ -171,8 +195,21 @@ public class NewPlatformApi {
             userEnterprise.setRealName(organizationDepartmentUser.getName());
             userEnterprise.setIsAuthentication(1);
             userEnterprise.setCreateTime(new Date());
-            userEnterpriseService.save(userEnterprise);
 
+            LambdaQueryWrapper<UserEnterprise> queryWrapper3 = new LambdaQueryWrapper<>();
+            queryWrapper3.eq(UserEnterprise::getOrganizationId, userEnterprise.getOrganizationId());
+            List<UserEnterprise> userEnterprises3 = userEnterpriseService.list(queryWrapper3);
+            if (null != userEnterprises3 && userEnterprises3.size() > 0) {
+                for (UserEnterprise enterprise : userEnterprises3) {
+                    Integer id = enterprise.getId();
+                    BeanUtils.copyProperties(userEnterprise, enterprise);
+                    enterprise.setId(id);
+                    enterprise.setIsDelete(0);
+                    userEnterpriseService.updateById(enterprise);
+                }
+            } else {
+                userEnterpriseService.save(userEnterprise);
+            }
             //修改用户表字段
             byId.setIsEnterpriseUser(2);
             userService.updateById(byId);
@@ -190,7 +227,8 @@ public class NewPlatformApi {
             if (byId.getUsedLineOfCredit().compareTo(BigDecimal.ZERO) != 0) {
                 return CommonResult.failed("已用额度不为零，需还清后才能注销");
             }
-            userEnterpriseService.removeById(id);
+            byId.setIsDelete(1);
+            userEnterpriseService.updateById(byId);
             LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(UserBypassAccount::getEnterpriseId, id);
             userBypassAccountService.remove(queryWrapper);
@@ -550,14 +588,14 @@ public class NewPlatformApi {
     @ApiOperation(value = "平台端组织机构删除--部门")
     @RequestMapping(value = "/departmentDelete", method = RequestMethod.POST)
     public CommonResult<?> departmentDelete(@RequestParam(name = "id") String id) {
-        return  organizationService.deleteDepartment(id);
+        return organizationService.deleteDepartment(id);
 
     }
 
     @ApiOperation(value = "平台端组织机构删除--用户")
     @RequestMapping(value = "/userDelete", method = RequestMethod.POST)
     public CommonResult<?> userDelete(@RequestParam(name = "id") String id) {
-        return  organizationService.deleteUser(id);
+        return organizationService.deleteUser(id);
 
     }
 
@@ -737,7 +775,7 @@ public class NewPlatformApi {
         LambdaQueryWrapper<UserEnterprise> enterpriseLambdaQueryWrapper = new LambdaQueryWrapper<>();
         enterpriseLambdaQueryWrapper.eq(UserEnterprise::getOrganizationId, request.getOrganizationId());
         OrganizationDepartment organizationDepartment = organizationDepartmentService.getById(request.getDepartmentId());
-        if (null!=organizationDepartment){
+        if (null != organizationDepartment) {
             String name1 = organizationDepartment.getName();
             enterpriseLambdaQueryWrapper.eq(UserEnterprise::getDepartment, name1);
             List<UserEnterprise> userEnterprises = userEnterpriseService.list(enterpriseLambdaQueryWrapper);
@@ -772,6 +810,4 @@ public class NewPlatformApi {
     }
 
 
-
-
 }