客诉

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

@@ -11,11 +11,15 @@ 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.BaseQuestion;
+import com.gogirl.domain.user.investigation.BaseQuestionOption;
 import com.gogirl.domain.user.investigation.OrderQuestionOption;
 import com.gogirl.infrastructure.common.util.ListUtil;
 import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderServeMapper;
 import com.gogirl.infrastructure.mapper.store.complaint.ComplaintMainMapper;
+import com.gogirl.infrastructure.mapper.user.investigation.BaseQuestionMapper;
+import com.gogirl.infrastructure.mapper.user.investigation.BaseQuestionOptionMapper;
 import com.google.common.collect.Lists;
 import org.springframework.stereotype.Service;
 
@@ -44,6 +48,10 @@ public class ComplaintMainServiceImpl extends ServiceImpl<ComplaintMainMapper, C
     OrderServeMapper orderServeMapper;
     @Resource
     OrderManageMapper orderManageMapper;
+    @Resource
+    BaseQuestionMapper baseQuestionMapper;
+    @Resource
+    BaseQuestionOptionMapper baseQuestionOptionMapper;
 
     @Override
     public void saveComplainsByOrderQuestion(List<OrderQuestionOption> list) {
@@ -80,6 +88,18 @@ public class ComplaintMainServiceImpl extends ServiceImpl<ComplaintMainMapper, C
                         complaintDetailed.setSkuId(orderQuestionOption1.getComplaintSkuId());
 
                         ComplaintSkuView complaintSkuView = baseMapper.selectComplaintSkuView(complaintDetailed.getSkuId(), complaintDetailed.getComplaintSkuType());
+                        complaintDetailed.setSkuName(complaintSkuView.getName());
+                        complaintDetailed.setComplaintSkuTypeName(complaintSkuView.getTypeName());
+                        complaintDetailed.setQuestionOptionId(orderQuestionOption1.getQuestionOptionId());
+
+                        BaseQuestion baseQuestion = baseQuestionMapper.selectById(orderQuestionOption1.getQuestionId());
+                        BaseQuestionOption baseQuestionOption = baseQuestionOptionMapper.selectById(orderQuestionOption1.getQuestionOptionId());
+                        String answer = baseQuestionOption.getInfo();
+                        if (baseQuestionOption.getHasOther() == 1) {
+                            answer = orderQuestionOption1.getRemarks();
+                        }
+                        complaintDetailed.setQuestionOptionInfo(baseQuestion.getName() + ":" + answer);
+
                         return complaintDetailed;
                     })
                     .collect(Collectors.toList());

src/main/java/com/gogirl/domain/order/serve/OrderManage.java

@@ -155,14 +155,14 @@ public class OrderManage implements Serializable {
 
     @TableField(value = "is_reminder")
     @ApiModelProperty("是否已推送 1#未推送 2#已推送")
-
     private String reminder;
-    @ApiModelProperty("数据完整度")
 
+    @ApiModelProperty("数据完整度")
     private Double dataIntegrity;
-    @ApiModelProperty("删除备注")
 
+    @ApiModelProperty("删除备注")
     private String delRemark;
+
     @ApiModelProperty("预约时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date arriveTime;

src/main/java/com/gogirl/domain/product/serve/BaseType.java

@@ -36,5 +36,7 @@ public class BaseType implements Serializable {
 
     @ApiModelProperty("服务短码")
     private String shortCode;
+
+    private Integer sorts;
 }
 

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

@@ -46,5 +46,10 @@ public class ComplaintDetailed implements Serializable {
     @ApiModelProperty(value = "sku名称")
     private String skuName;
 
+    @ApiModelProperty(value = "客诉sku类型")
+    private String complaintSkuTypeName;
 
+    private Integer questionOptionId;
+
+    private String questionOptionInfo;
 }

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

@@ -61,4 +61,5 @@ public class ComplaintMain implements Serializable {
 
     @ApiModelProperty(value = "照片")
     private String picturePath;
+
 }

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

@@ -14,6 +14,7 @@ import lombok.Data;
 public class ComplaintSkuView {
 
     private Integer id;
+
     private Integer type;
 
     private String typeName;

src/main/resources/application.yml

 spring:
   profiles:
-    active: pre
+    active: prod
   servlet:
     #文件上传最大容量
     multipart:

src/test/java/com/gogirl/Test.java

@@ -659,7 +659,7 @@ public class Test {
 
 
         List<OrderManage> orderManageList = orderManageMapper.selectList(new LambdaQueryWrapper<OrderManage>()
-                .gt(OrderManage::getCreateTime, "2020-01-01"));
+                .gt(OrderManage::getCreateTime, "2020-09-07"));
 
         orderManageList.forEach(orderManage -> {
             try {