Merge branch 'master' into 3.7

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

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -81,14 +82,14 @@ public class ComplaintMainServiceImpl extends ServiceImpl<ComplaintMainMapper, C
 
             complaintDetailedService.saveBatch(complaintDetailedList);
 
-            List<Integer> orderTechnicianIds = orderServeMapper.selectList(
+            Set<Integer> orderTechnicianIds = orderServeMapper.selectList(
                     new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, complaintMain.getOrderId()))
                     .stream()
                     .map(OrderServe::getTechnicianId)
                     .map(technicianIds -> Lists.newArrayList(technicianIds.split(",")))
                     .flatMap(List::stream)
                     .map(Integer::valueOf)
-                    .collect(Collectors.toList());
+                    .collect(Collectors.toSet());
 
             List<ComplaintDetailedTechnician> complaintDetailedTechnicianList = complaintDetailedList
                     .stream()

src/main/java/com/gogirl/application/xcx/impl/GogirlTokenServiceImpl.java

@@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 
 @Service
@@ -37,7 +38,7 @@ public class GogirlTokenServiceImpl implements GogirlTokenService {
 
     @Override
     public void save(GogirlToken gogirlToken) {
-        redisTemplate.opsForValue().set(gogirlToken.getToken(), JsonUtilByFsJson.beanToJson(gogirlToken));
+        redisTemplate.opsForValue().set(gogirlToken.getToken(), JsonUtilByFsJson.beanToJson(gogirlToken), 1, TimeUnit.DAYS);
     }
 
     @Override
@@ -48,7 +49,7 @@ public class GogirlTokenServiceImpl implements GogirlTokenService {
 
     @Override
     public void updateByToken(GogirlToken gogirlToken) {
-        redisTemplate.opsForValue().set(gogirlToken.getToken(), JsonUtilByFsJson.beanToJson(gogirlToken));
+        redisTemplate.opsForValue().set(gogirlToken.getToken(), JsonUtilByFsJson.beanToJson(gogirlToken), 1, TimeUnit.DAYS);
     }
 
     @Override

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

@@ -233,6 +233,8 @@ public class OrderServe implements Serializable {
     private BigDecimal leisurePrice;
 
 
+
+
     public void addDiscountPrice(BigDecimal discountPrice) {
         this.discountPrice = this.discountPrice.add(discountPrice);
         this.payPrice = this.payPrice.subtract(discountPrice);

src/main/java/com/gogirl/infrastructure/mapper/product/serve/BaseProduceMapper.java

@@ -36,4 +36,9 @@ public interface BaseProduceMapper extends BaseMapper<BaseProduce> {
                                         @Param("featuresId") Integer featuresId,
                                         @Param("serveTypeId") Integer serveTypeId,
                                         @Param("sort") Integer sort);
+
+    /**
+     * 同步款式服务类型id
+     */
+    void syncProduceServeTypeId();
 }

src/main/java/com/gogirl/shared/admin/AchievementsPersonaResult.java

@@ -71,4 +71,9 @@ public class AchievementsPersonaResult {
     private BigDecimal shop_item_val;//0.0000;
     private BigDecimal shop_item_score;//100.0000;
     private BigDecimal shop_item_proportion;//0.2000
+
+    private String activate_a_card_val_str;
+    private String praise_val_str;
+    private String service_time_val_str;
+
 }

src/main/resources/application-prod.yml

@@ -91,7 +91,7 @@ gogirl:
   #评论延迟时间
   test-paper-time: 1440
   #后台后端接口访问地址
-  admin-backend-url: http://admin.begogirls.com:7712/api/ReportTable/GetTechnicianPageApi
+  admin-backend-url: http://admin.begogirls.com:7712/api/ReportTable/GetTechnicianPage
   #后台接口地址
   admin-backend-achievements-url: http://admin.begogirls.com:7712/api/salary/AchievementsPersonaResultPageApi
   #企业微信预约消息推送

src/main/resources/mapper/product/BaseProduceMapper.xml

@@ -69,6 +69,13 @@
     <sql id="bpSql">
         bp.id, bp.name, bp.picture_path picturePath, bp.type, bp.label, bp.shop_sort shopSort, bp.req_grade reqQrade, bp.status, bp.remark, bp.details, bs.id serveId, bs.name serveName
     </sql>
+    <update id="syncProduceServeTypeId">
+        update base_produce t1
+            LEFT JOIN base_serve t2 on t1.service_id = t2.id
+        set t1.serve_type_id = t2.type_id
+        where t1.serve_type_id is null
+          and t2.id is not null
+    </update>
 
     <select id="getProduceForDetail" resultMap="produceResultMap">
         select