卡券修改

src/main/java/com/gogirl/infrastructure/mapper/store/career/CareerMapper.java

@@ -81,4 +81,20 @@ public interface CareerMapper extends BaseMapper<Career> {
      * @return
      */
     Integer queryTotalAgainOrderNum(@Param("technicianId") Integer id, @Param("month") String month);
+
+    /**
+     * 客户总好评
+     *
+     * @param id
+     */
+    Double queryTotalPraisePercent(Integer id);
+
+    /**
+     * 客户当月好评
+     *
+     * @param id
+     * @param month
+     * @return
+     */
+    Double queryMonthPraisePercent(@Param("id") Integer id, @Param("month") String month);
 }

src/main/java/com/gogirl/shared/store/query/dto/CareerDTO.java

 package com.gogirl.shared.store.query.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,6 +15,7 @@ public class CareerDTO {
 
     private String technicianName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("加入gogirl时间")
     private Date joinDate;
 

src/main/resources/application-dev.yml

@@ -38,6 +38,13 @@ spring:
     host: 127.0.0.1
     port: 6379
     database: 0
+    lettuce:
+      pool:
+        max-active: 200
+        max-wait: -1ms
+        max-idle: 20
+        min-idle: 0
+    timeout: 2000ms
 
 #项目属性
 gogirl:

src/main/resources/application-pre.yml

@@ -37,10 +37,11 @@ spring:
     database: 0
     lettuce:
       pool:
-        max-active: 100
-        max-wait: 10000
-        max-idle: 100
-        min-idle: 10
+        max-active: 200
+        max-wait: -1ms
+        max-idle: 20
+        min-idle: 0
+    timeout: 2000ms
 
 
 #项目属性

src/main/resources/application-prod.yml

@@ -36,6 +36,14 @@ spring:
     host: 127.0.0.1
     port: 6379
     database: 0
+    lettuce:
+      pool:
+        max-active: 200
+        max-wait: -1ms
+        max-idle: 20
+        min-idle: 0
+    timeout: 2000ms
+
 
 
 #项目属性

src/main/resources/mapper/store/CareerMapper.xml

@@ -62,7 +62,9 @@
                 and (t1.`status` = 3 or t1.`status` = 4)
                 and t1.launch_time > #{month}
               GROUP BY t1.id) tt
-                 LEFT JOIN order_manage oo on tt.order_user = oo.order_user and oo.launch_time > DATE_SUB(tt.launch_time, INTERVAL 45 day) and oo.launch_time < tt.launch_time
+                 LEFT JOIN order_manage oo on tt.order_user = oo.order_user and
+                                              oo.launch_time > DATE_SUB(tt.launch_time, INTERVAL 45 day) and
+                                              oo.launch_time < tt.launch_time
         where oo.id is not null
     </select>
 
@@ -74,8 +76,33 @@
               where t2.technician_id like concat('%', #{technicianId}, '%')
                 and (t1.`status` = 3 or t1.`status` = 4)
               GROUP BY t1.id) tt
-                 LEFT JOIN order_manage oo on tt.order_user = oo.order_user and oo.launch_time &gt; DATE_SUB(tt.launch_time, INTERVAL 45 day) and oo.launch_time &lt; tt.launch_time
+                 LEFT JOIN order_manage oo on tt.order_user = oo.order_user and
+                                              oo.launch_time &gt; DATE_SUB(tt.launch_time, INTERVAL 45 day) and
+                                              oo.launch_time &lt; tt.launch_time
         where oo.id is not null
     </select>
+    <select id="queryTotalPraisePercent" resultType="java.lang.Double">
+        SELECT (SELECT count(id)
+                from order_comment
+                where technician_id = #{id}
+                  and level &gt;= 3)
+                   /
+               (SELECT count(id)
+                from order_comment
+                where technician_id = #{id}
+               )
+    </select>
+    <select id="queryMonthPraisePercent" resultType="java.lang.Double">
+        SELECT (SELECT count(id)
+                from order_comment
+                where technician_id = 127
+                  and level &gt;= 3
+                  and finish_time &gt; #{month})
+                   /
+               (SELECT count(id)
+                from order_comment
+                where technician_id = 127
+               )
+    </select>
 
 </mapper>
\ No newline at end of file