update

src/main/java/com/gogirl/application/store/complaint/impl/ComplaintMainServiceImpl.java

@@ -10,6 +10,7 @@ import com.gogirl.domain.order.serve.OrderServe;
 import com.gogirl.domain.store.complaint.ComplaintDetailed;
 import com.gogirl.domain.store.complaint.ComplaintDetailedTechnician;
 import com.gogirl.domain.store.complaint.ComplaintMain;
+import com.gogirl.domain.store.complaint.ComplaintSkuView;
 import com.gogirl.domain.user.investigation.OrderQuestionOption;
 import com.gogirl.infrastructure.common.util.ListUtil;
 import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
@@ -76,6 +77,8 @@ public class ComplaintMainServiceImpl extends ServiceImpl<ComplaintMainMapper, C
                         complaintDetailed.setMainId(complaintMain.getId());
                         complaintDetailed.setCreateDate(LocalDateTime.now());
                         complaintDetailed.setSkuId(orderQuestionOption1.getComplaintSkuId());
+
+                        ComplaintSkuView complaintSkuView = baseMapper.selectComplaintSkuView(complaintDetailed.getSkuId(), complaintDetailed.getComplaintSkuType());
                         return complaintDetailed;
                     })
                     .collect(Collectors.toList());

src/main/java/com/gogirl/domain/store/complaint/ComplaintSkuView.java

+package com.gogirl.domain.store.complaint;
+
+import lombok.Data;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/8/25 11:55 上午
+ */
+@Data
+public class ComplaintSkuView {
+
+    private Integer id;
+    private Integer type;
+
+    private String typeName;
+
+    private String name;
+}

src/main/java/com/gogirl/infrastructure/mapper/store/complaint/ComplaintMainMapper.java

@@ -2,6 +2,8 @@ package com.gogirl.infrastructure.mapper.store.complaint;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gogirl.domain.store.complaint.ComplaintMain;
+import com.gogirl.domain.store.complaint.ComplaintSkuView;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +15,14 @@ import com.gogirl.domain.store.complaint.ComplaintMain;
  */
 public interface ComplaintMainMapper extends BaseMapper<ComplaintMain> {
 
+    /**
+     * <p>
+     * 获取客诉sku分类名和name
+     * </p>
+     *
+     * @param skuId
+     * @param complaintSkuType
+     * @return
+     */
+    ComplaintSkuView selectComplaintSkuView(@Param("skuId") Integer skuId, @Param("complaintSkuType") Integer complaintSkuType);
 }

src/main/java/com/gogirl/interfaces/user/customer/TestPaperController.java

@@ -23,7 +23,7 @@ public class TestPaperController {
     private final BaseQuestionService baseQuestionService;
     private final GogirlTokenService gogirlTokenService;
 
-    @ApiOperation("获取s调查问卷")
+    @ApiOperation("获取调查问卷")
     @GetMapping("/customer/testPaper/getTestPaper")
     public JsonResult<List<BaseQuestion>> getTestPaper(@RequestHeader String token) {
 

src/main/resources/application-dev.yml

@@ -109,11 +109,31 @@ server:
   port: 7777
 
 
-feign:
-  hystrix:
-    enabled: false
-  client:
-    config:
-      default:
-        connectTimeout: 30000
-        readTimeout: 30000
+#feign:
+#  hystrix:
+#    enabled: true
+#  client:
+#    config:
+#      default:
+#        connectTimeout: 2000
+#        readTimeout: 2000
+#ribbon:
+#  okhttp:
+#    enabled: true
+
+###hystrix的超时时间
+#hystrix:
+#  command:
+#    default:
+#      execution:
+#        timeout:
+#          enabled: true
+#        isolation:
+#          thread:
+#            timeoutInMilliseconds: 60000
+##Ribbon超时
+ribbon:
+  ConnectTimeout: 20000  #毫秒    连接超时时间
+  ReadTimeout: 20000     #毫秒      逻辑处理超时时间
+
+

src/main/resources/mapper/user/BaseQuestionMapper.xml

@@ -40,7 +40,7 @@
         SELECT t2.*
         FROM base_question_type t1
         LEFT JOIN base_question t2 ON t1.id = t2.type_id
-        where t2.object_oriented=2
+        where t2.object_oriented= 2
         ORDER BY RAND()) t3
         GROUP BY t3.type_id
         ) bq

src/main/resources/mapper/xcx/ComplaintMainMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.gogirl.infrastructure.mapper.store.complaint.ComplaintMainMapper">
+    <select id="selectComplaintSkuView" resultType="com.gogirl.domain.store.complaint.ComplaintSkuView">
+        select *
+        from complaint_sku_view
+        where id = #{skuId}
+          and type = #{complaintSkuType}
+    </select>
+</mapper>

src/test/java/com/gogirl/infrastructure/mapper/store/complaint/ComplaintMainMapperTest.java

+package com.gogirl.infrastructure.mapper.store.complaint;
+
+import com.gogirl.domain.store.complaint.ComplaintSkuView;
+import com.gogirl.infrastructure.common.util.JsonUtilByJackson;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author robbendev
+ * @since 2020/8/25 12:00 下午
+ */
+@ActiveProfiles("prod")
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@Slf4j
+public class ComplaintMainMapperTest {
+
+    @Resource
+    ComplaintMainMapper complaintMainMapper;
+
+    @Test
+    public void selectComplaintSkuView() {
+        ComplaintSkuView complaintSkuView = complaintMainMapper.selectComplaintSkuView(1, 2);
+        log.info(JsonUtilByJackson.writeValueAsString(complaintSkuView));
+    }
+}