容量查询、预约订单相关的接口代码实现

project-order/src/main/java/com/alibaba/cloud/integration/order/controller/OrderCreateController.java

@@ -19,18 +19,14 @@ package com.alibaba.cloud.integration.order.controller;
 import com.alibaba.cloud.integration.common.BusinessException;
 import com.alibaba.cloud.integration.common.Result;
 import com.alibaba.cloud.integration.order.dto.OrderCreateReqDTO;
-import com.alibaba.cloud.integration.order.dto.TimeRangeReqDTO;
+import com.alibaba.cloud.integration.order.dto.CapacityQueryReqDTO;
 import com.alibaba.cloud.integration.order.service.OrderService;
 
-import com.alibaba.cloud.integration.order.service.ProductService;
-import com.alibaba.cloud.integration.order.service.TimeRangeService;
+import com.alibaba.cloud.integration.order.service.CapacityQueryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-/**
- * @author TrevorLink
- */
 @RestController
 public class OrderCreateController {
 
@@ -38,10 +34,7 @@ public class OrderCreateController {
     private OrderService orderService;
 
     @Autowired
-    private ProductService productService;
-
-    @Autowired
-    private TimeRangeService timeRangeService;
+    private CapacityQueryService capacityQueryService;
 
     @PostMapping("/order/service/create")
     public Result<?> createOrder(@Validated @RequestBody OrderCreateReqDTO orderCreateReqDTO) {
@@ -58,18 +51,18 @@ public class OrderCreateController {
     public Result<?> getParameter() {
         Result<?> res = null;
         try {
-            res = productService.getProductCategoryList();
+            res = orderService.initParameter();
         } catch (BusinessException e) {
             return Result.failed(e.getMessage());
         }
         return res;
     }
 
-    @PostMapping("/order/service/timerange")
-    public Result<?> getTimerange(@Validated @RequestBody TimeRangeReqDTO timeRangeReqDTO) {
+    @PostMapping("/order/service/capacity/query")
+    public Result<?> capacityQuery(@Validated @RequestBody CapacityQueryReqDTO capacityQueryReqDTO) {
         Result<?> res = null;
         try {
-            res = timeRangeService.getTimeRangeData(timeRangeReqDTO);
+            res = capacityQueryService.getOneCapacityData(capacityQueryReqDTO);
         } catch (BusinessException e) {
             return Result.failed(e.getMessage());
         }

project-order/src/main/java/com/alibaba/cloud/integration/order/dao/CapacityTeamStatDao.java

 package com.alibaba.cloud.integration.order.dao;
 
 import com.alibaba.cloud.integration.order.entity.CapacityTeamStatEntity;
+import org.hibernate.annotations.Where;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository
 public interface CapacityTeamStatDao extends JpaRepository<CapacityTeamStatEntity, Long> {
 
-    List<CapacityTeamStatEntity> findAllByTeamIdAndSkillTagAndWorkdayBetween(String teamId, String skill, String beginDate, String endDate);
+    List<CapacityTeamStatEntity> findAllByTeamIdAndLayerAndWorkdayBetween(String teamId, String layer, String beginDate, String endDate);
 }

project-order/src/main/java/com/alibaba/cloud/integration/order/dao/MapBlockInfoDao.java

+package com.alibaba.cloud.integration.order.dao;
+
+import com.alibaba.cloud.integration.order.entity.MapBlockInfoEntity;
+import org.hibernate.annotations.Where;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Where(clause = "status = 1")
+public interface MapBlockInfoDao extends JpaRepository<MapBlockInfoEntity, Integer> {
+
+    @Query("select s.teamId from MapBlockInfoEntity s where s.blockId = :blockId and s.layer = :layer")
+    String getTeamidByBlockidAndLayer(String blockId, String layer);
+}

project-order/src/main/java/com/alibaba/cloud/integration/order/dao/OrderReqeustDao.java → project-order/src/main/java/com/alibaba/cloud/integration/order/dao/OrderRequestDao.java

@@ -3,5 +3,5 @@ package com.alibaba.cloud.integration.order.dao;
 import com.alibaba.cloud.integration.order.entity.OrderRequestEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface OrderReqeustDao extends JpaRepository <OrderRequestEntity, Long> {
+public interface OrderRequestDao extends JpaRepository <OrderRequestEntity, Long> {
 }

project-order/src/main/java/com/alibaba/cloud/integration/order/dao/ProductCategoryDao.java

@@ -2,6 +2,12 @@ package com.alibaba.cloud.integration.order.dao;
 
 import com.alibaba.cloud.integration.order.entity.ProductCategoryEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface ProductCategoryDao extends JpaRepository<ProductCategoryEntity, Long> {
+
+    ProductCategoryEntity getProductCategoryEntityByBrandAndTypeAndSkill(String brand, String type, String skill);
+
+    @Query("select p.layer from ProductCategoryEntity p where p.brand = :brand and p.type = :type and p.skill = :skill")
+    String getLayerByBrandAndTypeAndSkill(String brand, String type, String skill);
 }

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/TimeRangeReqDTO.java → project-order/src/main/java/com/alibaba/cloud/integration/order/dto/CapacityQueryReqDTO.java

@@ -3,9 +3,12 @@ package com.alibaba.cloud.integration.order.dto;
 import lombok.Data;
 
 @Data
-public class TimeRangeReqDTO {
+public class CapacityQueryReqDTO {
     private String location;
-    private String categoryId;
+    private String address;
+    private String brand;
+    private String type;
+    private String skill;
     private String beginDate;
     private String endDate;
 }

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/CapacityQueryRespDTO.java

+package com.alibaba.cloud.integration.order.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class CapacityQueryRespDTO {
+    private String beginDate;
+    private String endDate;
+    private String remark;
+    private List<LegendDTO> legend;
+    private List<CalendarDTO> calendar;
+
+
+    @Data
+    @Accessors(chain = true)
+    public static class LegendDTO {
+        private int type;
+        private String memo;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class CalendarDTO {
+        private String week;
+        private String date;
+        private List<TimeDTO> times;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class TimeDTO {
+        private String text;
+        private String begin;
+        private String end;
+        private int type;
+    }
+}

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/OrderCreateReqDTO.java

@@ -9,7 +9,8 @@ public class OrderCreateReqDTO {
     private String address;
     private LocationDTO location;
     private String brand;
-    private String catalogId;
+    private String type;
+    private String skill;
     private String faultDescribe;
     private String expectBegin;
     private String expectEnd;

project-order/src/main/java/com/alibaba/cloud/integration/order/dto/ParameterRespDTO.java

@@ -8,7 +8,6 @@ import java.util.List;
 @Data
 @Accessors(chain = true)
 public class ParameterRespDTO {
-    private List<BrandDTO> brands;
     private List<KeyValueDTO> priorities;
     private List<KeyValueDTO> standardTags;
 }

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/CapacityTeamStatEntity.java

@@ -35,7 +35,7 @@ public class CapacityTeamStatEntity implements Serializable {
     private String teamId;
 
 
-    private String skillTag;
+    private String layer;
 
 
     private Integer engineerCount;

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/MapBlockInfoEntity.java

+package com.alibaba.cloud.integration.order.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Data
+@Table(name="map_block_Info")
+public class MapBlockInfoEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    /**
+     * 主键
+     */
+    private Integer id;
+
+    /**
+     * 区块id
+     */
+    private String blockId;
+
+    /**
+     * 区块名称
+     */
+    private String blockName;
+
+    /**
+     * 归属分部
+     */
+    private String subsectionId;
+
+    /**
+     * 归属小组
+     */
+    private String groupId;
+
+    /**
+     * 所在城市id
+     */
+    private String cityCode;
+
+    /**
+     * 面数据
+     */
+    private String areaData;
+
+    /**
+     * 类型（1自然行政片区，2自定义片区）
+     */
+    private int kind;
+
+    /**
+     * 关联小队id
+     */
+    private String teamId;
+
+    /**
+     * 图标标签，[基础图层，ggn] -- 与map_layer.layer 对应
+     */
+    private String layer;
+
+    /**
+     * 状态（0无效 1有效）
+     */
+    private int status;
+
+    /**
+     * 备注
+     */
+    private String memo;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    public MapBlockInfoEntity() {}
+}

project-order/src/main/java/com/alibaba/cloud/integration/order/entity/ProductCategoryEntity.java

@@ -23,73 +23,61 @@ public class ProductCategoryEntity {
     /**
      * 小组id
      */
-    @Column(name="product_category_id")
     private String productCategoryId;
 
     /**
      * 品牌
      */
-    @Column(name="brand")
     private String brand;
 
     /**
      * 产品类别
      */
-    @Column(name="type")
     private String type;
 
     /**
      * 服务类型
      */
-    @Column(name="skill")
     private String skill;
 
     /**
      * 所需工时（分钟）
      */
-    @Column(name="take_time")
     private Integer takeTime;
 
     /**
      * 所需人数
      */
-    @Column(name="take_engineer")
     private Integer takeEngineer;
 
     /**
      * 是否需要低压电工证
      */
-    @Column(name="low_electrician_cert")
     private int lowElectricianCert;
 
     /**
      * 是否需要燃气证
      */
-    @Column(name="gas_cert")
     private int gasCert;
 
     /**
      * 图层标签
      */
-    @Column(name="tag")
-    private String tag;
+    private String layer;
 
     /**
      * 备注
      */
-    @Column(name="memo")
     private String memo;
 
     /**
      * 创建时间
      */
-    @Column(name="create_time")
     private Date createTime;
 
     /**
      * 更新时间
      */
-    @Column(name="update_time")
     private Date updateTime;
 
     public ProductCategoryEntity() {

project-order/src/main/java/com/alibaba/cloud/integration/order/service/CapacityQueryService.java

+package com.alibaba.cloud.integration.order.service;
+
+import com.alibaba.cloud.integration.common.Result;
+import com.alibaba.cloud.integration.order.dto.CapacityQueryReqDTO;
+import com.fasterxml.jackson.core.JsonProcessingException;
+
+public interface CapacityQueryService {
+
+    /**
+     * 单条容量查询
+     * @param capacityQueryReqDTO
+     * @return
+     * @throws JsonProcessingException
+     */
+    Result<?> getOneCapacityData(CapacityQueryReqDTO capacityQueryReqDTO);
+}

project-order/src/main/java/com/alibaba/cloud/integration/order/service/OrderService.java

@@ -25,6 +25,8 @@ import com.alibaba.cloud.integration.order.dto.OrderCreateReqDTO;
  */
 public interface OrderService {
 
+	Result<?>  initParameter();
+
 	Result<?> createOrder(OrderCreateReqDTO orderCreateReqDTO)
 			throws BusinessException;
 

project-order/src/main/java/com/alibaba/cloud/integration/order/service/TimeRangeService.java

-package com.alibaba.cloud.integration.order.service;
-
-import com.alibaba.cloud.integration.common.Result;
-import com.alibaba.cloud.integration.order.dto.TimeRangeReqDTO;
-
-public interface TimeRangeService {
-
-    Result<?> getTimeRangeData(TimeRangeReqDTO timeRangeReqDTO);
-
-}

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/TimeRangeServiceImpl.java → project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/CapacityQueryServiceImpl.java

@@ -2,15 +2,21 @@ package com.alibaba.cloud.integration.order.service.impl;
 
 import com.alibaba.cloud.integration.common.Result;
 import com.alibaba.cloud.integration.order.dao.CapacityTeamStatDao;
-import com.alibaba.cloud.integration.order.dto.CalendarDTO;
-import com.alibaba.cloud.integration.order.dto.TimeDTO;
-import com.alibaba.cloud.integration.order.dto.TimeRangeReqDTO;
-import com.alibaba.cloud.integration.order.dto.TimeRangeRespDTO;
+import com.alibaba.cloud.integration.order.dao.MapBlockInfoDao;
+import com.alibaba.cloud.integration.order.dao.ProductCategoryDao;
+import com.alibaba.cloud.integration.order.dto.CapacityQueryReqDTO;
+import com.alibaba.cloud.integration.order.dto.CapacityQueryRespDTO;
 import com.alibaba.cloud.integration.order.entity.CapacityTeamStatEntity;
-import com.alibaba.cloud.integration.order.service.TimeRangeService;
+import com.alibaba.cloud.integration.order.service.CapacityQueryService;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.*;
 import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
 
 import java.time.DayOfWeek;
 import java.time.LocalDate;
@@ -20,22 +26,30 @@ import java.util.*;
 
 @Service
 @Slf4j
-public class TimeRangeServiceImpl implements TimeRangeService {
+public class CapacityQueryServiceImpl implements CapacityQueryService {
 
     private final String[] fullDay = {"08:00", "18:00"};
     @Autowired
     private CapacityTeamStatDao capacityTeamStatDao;
 
+    @Autowired
+    private ProductCategoryDao productCategoryDao;
+
+    @Autowired
+    private MapBlockInfoDao mapBlockInfoDao;
+
     @Override
-    public Result<?> getTimeRangeData(TimeRangeReqDTO reqDTO) {
+    public Result<?> getOneCapacityData(CapacityQueryReqDTO reqDTO) {
         /*
         location ==> [layer_info] ==> team ==> (+skill) ==> [capacity_team_stat]
          */
-        String teamId = getTeamByLayer(reqDTO.getLocation());
-        TimeRangeRespDTO timeRangeRespDTO = new TimeRangeRespDTO();
-        timeRangeRespDTO.setBeginDate(timeRangeRespDTO.getBeginDate()).setEndDate(reqDTO.getEndDate());
-        timeRangeRespDTO.setCalendar(getTimeRangeByTeamSkill(teamId, reqDTO.getCategoryId(), reqDTO.getBeginDate(), reqDTO.getEndDate()));
-        return Result.success(timeRangeRespDTO);
+        String layer = productCategoryDao.getLayerByBrandAndTypeAndSkill(reqDTO.getBrand(), reqDTO.getType(), reqDTO.getSkill());
+        String teamId = getTeamByLayer(reqDTO.getLocation(), reqDTO.getAddress(), layer);
+        CapacityQueryRespDTO capacityQueryRespDTO = new CapacityQueryRespDTO();
+        capacityQueryRespDTO.setBeginDate(capacityQueryRespDTO.getBeginDate()).setEndDate(reqDTO.getEndDate());
+        capacityQueryRespDTO.setCalendar(getTimeRangeByTeamSkill(teamId, reqDTO.getSkill(), reqDTO.getBeginDate(), reqDTO.getEndDate()));
+        capacityQueryRespDTO.setRemark(String.format("%s-%s", teamId, layer));
+        return Result.success(capacityQueryRespDTO);
     }
 
     /**
@@ -45,10 +59,54 @@ public class TimeRangeServiceImpl implements TimeRangeService {
      * @param location
      * @return
      */
-    private String getTeamByLayer(String location) {
-        // todo
+    private String getTeamByLayer(String location, String address, String layer) {
+        // todo 由于saas的分单接口尚未完成，目前仅仅是调用分单获取
+        // 创建RestTemplate实例
+        RestTemplate restTemplate = new RestTemplate();
+
+        // 设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+
+        // 构建请求参数
+        String url;
+        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+        params.add("ak", "284c57cbabad4755a9c657885a8df3e2");
+        if (location != null && !location.isEmpty()) {
+            url = "https://pea-test.bshg.com.cn/v2/xyfendan";
+            params.add("coordinate", location);
+        } else {
+            url = "https://pea-test.bshg.com.cn/v2/fendan";
+            params.add("addresses", String.format("[{\"address\":\"%s\"}]", address));
+        }
+        params.add("need_district", "true");
+        params.add("need_layer", "true");
+        params.add("related_point_fields", "");
+        params.add("area_fields", "名称,唯一编号");
+
+        // 构建请求实体
+        HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
+
+        // 发送POST请求
+        ResponseEntity<String> responseEntity = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
+
+        // 获取响应结果
+        String responseBody = responseEntity.getBody();
+
+// 使用Jackson库解析JSON数据
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            JsonNode responseJson = objectMapper.readTree(responseBody);
+            // 获取areaResults[0]的值
+            JsonNode areaResult = responseJson.get("result").get(0).get("areaResults").get(0);
+
+// 将areaResult转换为JSON字符串
+            // todo 分单接口其实也应该直接返回 图层
+            return mapBlockInfoDao.getTeamidByBlockidAndLayer(areaResult.get("field2").toString(), layer);
+        } catch (Exception e) {
             return null;
         }
+    }
 
     private int getSpanType(int capLeft, int capTotal) {
         float ratio = (float) capLeft / capTotal;
@@ -82,23 +140,23 @@ public class TimeRangeServiceImpl implements TimeRangeService {
      * 根据工作队、技能，返回对应时间段内的容量
      *
      * @param teamId
-     * @param skill
+     * @param layer
      * @param beginDate
      * @param endDate
      * @return
      */
-    private List<CalendarDTO> getTimeRangeByTeamSkill(String teamId, String skill, String beginDate, String endDate) {
-        Map<String, CalendarDTO> dayMaps = new HashMap<>();
-        List<CapacityTeamStatEntity> capacityTeamStatEntityList = capacityTeamStatDao.findAllByTeamIdAndSkillTagAndWorkdayBetween(teamId, skill, beginDate, endDate);
+    private List<CapacityQueryRespDTO.CalendarDTO> getTimeRangeByTeamSkill(String teamId, String layer, String beginDate, String endDate) {
+        Map<String, CapacityQueryRespDTO.CalendarDTO> dayMaps = new HashMap<>();
+        List<CapacityTeamStatEntity> capacityTeamStatEntityList = capacityTeamStatDao.findAllByTeamIdAndLayerAndWorkdayBetween(teamId, layer, beginDate, endDate);
         for (CapacityTeamStatEntity e : capacityTeamStatEntityList) {
-            TimeDTO timeDTO = new TimeDTO();
+            CapacityQueryRespDTO.TimeDTO timeDTO = new CapacityQueryRespDTO.TimeDTO();
             timeDTO.setType(getSpanType(e.getCapLeft(), e.getCapTotal()));
             Object[] timeSpans = getTimeSpanInfo(e.getWorkday(), e.getTimeSpan(), e.getTimeSpanDetail());
             timeDTO.setText((String) timeSpans[0]);
             timeDTO.setBegin((String) timeSpans[1]);
             timeDTO.setEnd((String) timeSpans[2]);
             if (!dayMaps.containsKey(e.getWorkday())) {
-                CalendarDTO calendarDTO = new CalendarDTO();
+                CapacityQueryRespDTO.CalendarDTO calendarDTO = new CapacityQueryRespDTO.CalendarDTO();
                 calendarDTO.setDate(e.getWorkday());
                 calendarDTO.setWeek(getWeekday(e.getWorkday()));
                 dayMaps.put(e.getWorkday(), calendarDTO);
@@ -114,4 +172,5 @@ public class TimeRangeServiceImpl implements TimeRangeService {
         DayOfWeek weekday = date.getDayOfWeek();
         return String.format("周%s", weekday.getDisplayName(TextStyle.SHORT, Locale.CHINA));
     }
+
 }

project-order/src/main/java/com/alibaba/cloud/integration/order/service/impl/OrderServiceImpl.java

@@ -17,30 +17,73 @@
 package com.alibaba.cloud.integration.order.service.impl;
 
 import com.alibaba.cloud.integration.common.Result;
-import com.alibaba.cloud.integration.order.dao.OrderReqeustDao;
+import com.alibaba.cloud.integration.order.dao.OrderRequestDao;
+import com.alibaba.cloud.integration.order.dao.OrderTagStrategyDao;
+import com.alibaba.cloud.integration.order.dao.ProductCategoryDao;
+import com.alibaba.cloud.integration.order.dto.KeyValueDTO;
 import com.alibaba.cloud.integration.order.dto.LocationDTO;
 import com.alibaba.cloud.integration.order.dto.OrderCreateReqDTO;
+import com.alibaba.cloud.integration.order.dto.ParameterRespDTO;
 import com.alibaba.cloud.integration.order.entity.OrderRequestEntity;
-import com.alibaba.cloud.integration.order.feign.AccountServiceFeignClient;
-import com.alibaba.cloud.integration.order.feign.StorageServiceFeignClient;
-import com.alibaba.cloud.integration.order.mapper.OrderMapper;
+import com.alibaba.cloud.integration.order.entity.ProductCategoryEntity;
 import com.alibaba.cloud.integration.order.service.OrderService;
 import io.seata.core.context.RootContext;
-import io.seata.spring.annotation.GlobalTransactional;
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Slf4j
 @Service
 public class OrderServiceImpl implements OrderService {
 
     @Autowired
-    private OrderReqeustDao orderReqeustDao;
+    private OrderRequestDao orderRequestDao;
+
+    @Autowired
+    private OrderTagStrategyDao orderTagStrategyDao;
+
+    @Autowired
+    private ProductCategoryDao productCategoryDao;
+
+    private List<KeyValueDTO> getPriorities() {
+        List<KeyValueDTO> listPriorities = new ArrayList<>();
+        int prioritiesLevels = 10;
+        for (int i = 0; i <= prioritiesLevels; i++) {
+            String label;
+            if (i == 0) {
+                label = "最低";
+            } else if (i == prioritiesLevels) {
+                label = "最高";
+
+            } else {
+                label = String.format("优先级%d", i);
+            }
+            listPriorities.add(new KeyValueDTO().setLabel(label).setValue(String.valueOf(i)));
+        }
+        return listPriorities;
+    }
+
+    private List<KeyValueDTO> getStandardTags() {
+        List<KeyValueDTO> tagList = new ArrayList<>();
+        for (String tag : orderTagStrategyDao.getAllTags()) {
+            tagList.add(new KeyValueDTO().setLabel(tag).setValue(tag));
+        }
+        return tagList;
+    }
+
+
+    @Override
+    public Result<?> initParameter() {
+        ParameterRespDTO respDTO = new ParameterRespDTO();
+        respDTO.setPriorities(getPriorities()).setStandardTags(getStandardTags());
+        return Result.success(respDTO);
+    }
 
     @Override
-    @GlobalTransactional
     public Result<?> createOrder(OrderCreateReqDTO req) {
 
         log.info("[createOrder] current XID: {}", RootContext.getXID());
@@ -49,7 +92,13 @@ public class OrderServiceImpl implements OrderService {
         entity.setPhone(req.getPhone());
         entity.setAddress(req.getAddress());
         entity.setBrand(req.getBrand());
-        entity.setCategoryId(req.getCatalogId());
+
+        ProductCategoryEntity categoryEntity = productCategoryDao.getProductCategoryEntityByBrandAndTypeAndSkill(req.getBrand(), req.getType(), req.getSkill());
+        if (categoryEntity == null) {
+            throw new RuntimeException("产品代码不存在！");
+        }
+        String catalogId = categoryEntity.getProductCategoryId();
+        entity.setCategoryId(catalogId);
         entity.setFaultDescribe(req.getFaultDescribe());
         entity.setExpectTimeBegin(req.getExpectBegin());
         entity.setExpectTimeEnd(req.getExpectEnd());
@@ -59,7 +108,7 @@ public class OrderServiceImpl implements OrderService {
         entity.setProvince(location.getProvince());
         entity.setCity(location.getCity());
         entity.setCounty(location.getCountry());
-        orderReqeustDao.save(entity);
+
         // 根据orderTags, 解析保存到type、skill等字段
         String[] l = req.getLocation().getLocation().split(",");
         entity.setX(l[0]);
@@ -67,6 +116,7 @@ public class OrderServiceImpl implements OrderService {
         // todo 服务单状态、预约状态等
         entity.setStatus("");
         entity.setAppointmentStatus("");
+        orderRequestDao.save(entity);
         return Result.success(null);
     }
 }