Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

project-order/src/main/java/com/dituhui/pea/order/dao/OrgBranchDao.java

@@ -8,7 +8,6 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 import java.util.List;
 
 
 @Repository
 @Repository
-@Where(clause = "status = 1")
 public interface OrgBranchDao  extends JpaRepository<OrgBranchEntity, Integer> {
 public interface OrgBranchDao  extends JpaRepository<OrgBranchEntity, Integer> {
 
 
     List<OrgBranchEntity> findAllByClusterId(String clusterId);
     List<OrgBranchEntity> findAllByClusterId(String clusterId);

project-order/src/main/java/com/dituhui/pea/order/dao/OrgClusterDao.java

@@ -9,7 +9,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
 @Repository
 @Repository
-@Where(clause = "status = 1")
 public interface OrgClusterDao extends JpaRepository <OrgClusterEntity, Integer> {
 public interface OrgClusterDao extends JpaRepository <OrgClusterEntity, Integer> {
 
 
     OrgClusterEntity getByClusterId(String clusterId);
     OrgClusterEntity getByClusterId(String clusterId);

project-order/src/main/java/com/dituhui/pea/order/dao/OrgGroupDao.java

@@ -10,7 +10,6 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 import java.util.List;
 
 
 @Repository
 @Repository
-@Where(clause = "status = 1")
 public interface OrgGroupDao extends JpaRepository<OrgGroupEntity, Integer> {
 public interface OrgGroupDao extends JpaRepository<OrgGroupEntity, Integer> {
 
 
     List<OrgGroupEntity> findAllByBranchId(String branchId);
     List<OrgGroupEntity> findAllByBranchId(String branchId);

project-order/src/main/java/com/dituhui/pea/order/dao/OrgTeamDao.java

@@ -14,7 +14,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.Set;
 
 
 @Repository
 @Repository
-@Where(clause = "status = 1")
 public interface OrgTeamDao extends JpaRepository<OrgTeamEntity, Integer>, JpaSpecificationExecutor<OrgTeamEntity> {
 public interface OrgTeamDao extends JpaRepository<OrgTeamEntity, Integer>, JpaSpecificationExecutor<OrgTeamEntity> {
 
 
     @Query("select t from OrgTeamEntity t where t.clusterId = :clusterId and t.status=1")
     @Query("select t from OrgTeamEntity t where t.clusterId = :clusterId and t.status=1")

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java

@@ -272,11 +272,10 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         OrderInfoEntity entity = new OrderInfoEntity();
         OrderInfoEntity entity = new OrderInfoEntity();
         String orderId = req.getOrderId();
         String orderId = req.getOrderId();
         if (StringUtils.isEmpty(orderId)) {
         if (StringUtils.isEmpty(orderId)) {
-            String s = UUID.randomUUID().toString().replace("-", "");
-            orderId = s.substring(s.length() - 9);
+            return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY);
         }
         }
         OrderInfoEntity byOrderId = orderInfoDao.getByOrderId(req.getOrderId());
         OrderInfoEntity byOrderId = orderInfoDao.getByOrderId(req.getOrderId());
-        String peaBrand = fixBrand(req.getBrand());
+        String peaBrand = CommonUtil.fixBrand(req.getBrand());
         if (ObjectUtil.isNotNull(byOrderId)) {
         if (ObjectUtil.isNotNull(byOrderId)) {
             return Result.failed(StatusCodeEnum.ORDER_EXISTS);
             return Result.failed(StatusCodeEnum.ORDER_EXISTS);
         }
         }
@@ -507,11 +506,4 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         return String.format("%s_%s", orderId, DateUtils.formatDateTime(LocalDateTime.now(), "MMdd"));
         return String.format("%s_%s", orderId, DateUtils.formatDateTime(LocalDateTime.now(), "MMdd"));
     }
     }
 
 
-    private String fixBrand(String brand) {
-        if (!brand.equals("嘉格纳")) {
-            return "博世/西门子以及其他品牌";
-        } else {
-            return brand;
-        }
-    }
 }
 }