crm

bladex-tool/blade-core-cloud/src/main/java/org/springblade/core/cloud/client/BladeCloudApplication.java

@@ -33,7 +33,7 @@ import java.lang.annotation.*;
 @Documented
 @Inherited
 @EnableDiscoveryClient
-@EnableFeignClients(AppConstant.BASE_PACKAGES)
+@EnableFeignClients(value = {AppConstant.BASE_PACKAGES, "com.fjhx"})
 @SpringBootApplication
 public @interface BladeCloudApplication {
 

hx-common/common-client-util/src/main/java/com/fjhx/utils/RegionClientUtil.java

@@ -1,8 +1,8 @@
 package com.fjhx.utils;
 
-
 import cn.hutool.core.convert.Convert;
 import cn.hutool.extra.spring.SpringUtil;
+import com.fjhx.feign.IRegionClient;
 import org.springblade.core.tool.api.R;
 
 import java.util.HashSet;

hx-service/crm/src/main/java/com/fjhx/service/contract/impl/ContractServiceImpl.java

@@ -45,6 +45,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                         .like(Contract::getCode, keyword)
                         .like(Contract::getLinkName, keyword)
                 )
+                .eq(BaseEntity::getTenantId, AuthUtil.getTenantId())
                 .orderByDesc(BaseEntity::getId)
                 .page(condition.getPage());
     }
@@ -109,6 +110,19 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
         }
         String code = contract.getCode();
         int num = Convert.toInt(code.replace("SC", "")) + 1;
+        if (num < 10) {
+            return "SC0000" + num;
+        }
+        if (num < 100) {
+            return "SC000" + num;
+        }
+        if (num < 1000) {
+            return "SC00" + num;
+        }
+        if (num < 10000) {
+            return "SC0" + num;
+        }
+
         return "SC" + num;
     }
 

hx-service/crm/src/main/java/com/fjhx/service/customer/impl/CustomerServiceImpl.java

@@ -15,6 +15,7 @@ import com.fjhx.mapper.customer.CustomerMapper;
 import com.fjhx.params.customer.CustomerVo;
 import com.fjhx.service.customer.CustomerLinkService;
 import com.fjhx.service.customer.CustomerService;
+import com.fjhx.utils.RegionClientUtil;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,6 +48,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
                         .like(Customer::getCode, keyword)
                         .like(Customer::getName, keyword)
                 )
+                .eq(BaseEntity::getTenantId, AuthUtil.getTenantId())
                 .orderByDesc(BaseEntity::getId);
 
         Page<Map<String, Object>> page = pageMaps(condition.getPage(), wrapper);
@@ -55,7 +57,7 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
             return page;
         }
 
-//        RegionClientUtil.setRegionName(records);
+        RegionClientUtil.setRegionName(records);
 
         return page;
     }
@@ -125,6 +127,19 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         }
         String code = customer.getCode();
         int num = Convert.toInt(code.replace("C", "")) + 1;
+
+        if (num < 10) {
+            return "C0000" + num;
+        }
+        if (num < 100) {
+            return "C000" + num;
+        }
+        if (num < 1000) {
+            return "C00" + num;
+        }
+        if (num < 10000) {
+            return "C0" + num;
+        }
         return "C" + num;
     }