后台访问请求头

src/main/java/com/gogirl/domain/store/career/Career.java

@@ -10,6 +10,7 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @TableName("career")
@@ -58,28 +59,28 @@ public class Career {
     private Integer totalBalanceCardNum;
 
     @ApiModelProperty("客户好评率")
-    private Double monthPraisePercent;
+    private BigDecimal monthPraisePercent;
 
     @ApiModelProperty("复购率")
-    private Double monthRepurchasePercent;
+    private BigDecimal monthRepurchasePercent;
 
     @ApiModelProperty("信息录入完整度")
-    private Double monthInfoPercent;
+    private BigDecimal monthInfoPercent;
 
     @ApiModelProperty("考勤准时率")
-    private Double monthAttendancePercent;
+    private BigDecimal monthAttendancePercent;
 
     @ApiModelProperty("客户好评率")
-    private Double totalPraisePercent;
+    private BigDecimal totalPraisePercent;
 
     @ApiModelProperty("复购率")
-    private Double totalRepurchasePercent;
+    private BigDecimal totalRepurchasePercent;
 
     @ApiModelProperty("信息录入完整度")
-    private Double totalInfoPercent;
+    private BigDecimal totalInfoPercent;
 
     @ApiModelProperty("考勤准时率")
-    private Double totalAttendancePercent;
+    private BigDecimal totalAttendancePercent;
 
 
     @ApiModelProperty("美甲师评分")

src/main/java/com/gogirl/dto/admin/GetTechnicianPageRequest.java

@@ -3,7 +3,6 @@ package com.gogirl.dto.admin;
 import lombok.Builder;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
@@ -39,8 +38,14 @@ public class GetTechnicianPageRequest {
     private String sord;
 
 
-    private List<LocalDateTime> date_utc;
+    /**
+     * 时间区间
+     */
+    private List<String> date_utc;
 
+    /**
+     * 美甲师id
+     */
     private Integer technician_id;
 
 

src/main/java/com/gogirl/infrastructure/schedule/Schedule.java

@@ -26,6 +26,7 @@ import com.gogirl.dto.admin.AdminPage;
 import com.gogirl.dto.admin.AdminResult;
 import com.gogirl.dto.admin.AdminTechnicianScore;
 import com.gogirl.dto.admin.GetTechnicianPageRequest;
+import com.gogirl.infrastructure.common.util.JsonUtilByJackson;
 import com.gogirl.infrastructure.common.util.ListUtil;
 import com.gogirl.infrastructure.config.property.GogirlProperties;
 import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper;
@@ -383,12 +384,12 @@ public class Schedule {
                     .sord("asc")
                     //在职
                     .status(1)
-                    .date_utc(Lists.newArrayList(LocalDateTime.of(LocalDate.of(2020, 4, 1), LocalTime.of(0, 0)), LocalDateTime.now()))
+                    .date_utc(Lists.newArrayList(LocalDateTime.of(LocalDate.of(2020, 4, 1), LocalTime.of(0, 0)).toString(), LocalDateTime.now().toString()))
                     .technician_id(storeTechnician.getId())
                     .build();
 
             HttpEntity<GetTechnicianPageRequest> monthHttpEntity = new HttpEntity<>(monthRequest, headers);
-
+            log.debug(JsonUtilByJackson.writeValueAsString(monthRequest));
             AdminTechnicianScore allAdminResult = restTemplate.exchange(gogirlProperties.getAdminBackendUrl(), HttpMethod.POST, monthHttpEntity, responseBodyType)
                     .getBody()
                     .getData()
@@ -422,22 +423,22 @@ public class Schedule {
             //考勤准时
             career.setMonthAttendancePercent(null);
             //信息录入完整度
-            career.setMonthInfoPercent(monthAdminResult.getAvg_data_integrity().doubleValue());
+            career.setMonthInfoPercent(monthAdminResult.getAvg_data_integrity());
 
             //当月订单总数
             Integer monthOrderNum = careerMapper.queryMonthOrderNum(storeTechnician.getId(), month);
             career.setMonthOrderNum(monthOrderNum);
 
             //客户好评率
-            career.setMonthPraisePercent(monthAdminResult.getPraise_proportion().doubleValue());
+            career.setMonthPraisePercent(monthAdminResult.getPraise_proportion());
 
             //当月复购率
             //复购率
             Integer monthRepurchaseNum = careerMapper.queryMonthAgainOrderNum(storeTechnician.getId(), month);
             if (monthOrderNum != null && monthOrderNum != 0) {
-                career.setMonthRepurchasePercent((double) monthRepurchaseNum / monthOrderNum);
+//                career.setMonthRepurchasePercent((double) monthRepurchaseNum / monthOrderNum);
             }
-            career.setMonthRepurchasePercent(monthAdminResult.getRepeat_purchase_client_roportion().doubleValue());
+            career.setMonthRepurchasePercent(monthAdminResult.getRepeat_purchase_client_roportion());
 
             //当月服务客户总数
             Integer monthServeCustomerNum = careerMapper.queryMonthServeCustomerNum(storeTechnician.getId(), month);
@@ -447,7 +448,7 @@ public class Schedule {
             career.setMonthServeNum(monthAdminResult.getTotal_service_count());
 
             //信息录入完整度
-            career.setMonthInfoPercent(monthAdminResult.getAvg_data_integrity().doubleValue());
+            career.setMonthInfoPercent(monthAdminResult.getAvg_data_integrity());
 
             //总考勤准时率
             career.setTotalAttendancePercent(null);
@@ -459,7 +460,7 @@ public class Schedule {
             career.setTotalBalanceCardNum(allAdminResult.getCard_count());
 
             //信息录入完整度
-            career.setTotalInfoPercent(allAdminResult.getAvg_data_integrity().doubleValue());
+            career.setTotalInfoPercent(allAdminResult.getAvg_data_integrity());
 
             //订单总数
             Integer totalOrderNum = careerMapper.queryTotalOrderNum(storeTechnician.getId(), month);
@@ -469,17 +470,17 @@ public class Schedule {
             Double totalPraisePercent = careerMapper.queryTotalPraisePercent(storeTechnician.getId());
 
             //总好评率
-            career.setTotalPraisePercent(allAdminResult.getPraise_proportion().doubleValue());
+            career.setTotalPraisePercent(allAdminResult.getPraise_proportion());
 
             //总考勤准时比率
-            career.setTotalAttendancePercent(storeTechnician.getInformationIntegrity());
+            career.setTotalAttendancePercent(null);
 
             //复购率
             Integer totalRepurchaseNum = careerMapper.queryTotalAgainOrderNum(storeTechnician.getId(), month);
             if (totalOrderNum != null && totalOrderNum != 0) {
-                career.setTotalRepurchasePercent((double) totalRepurchaseNum / totalOrderNum);
+//                career.setTotalRepurchasePercent((double) totalRepurchaseNum / totalOrderNum);
             }
-            career.setTotalRepurchasePercent(allAdminResult.getRepeat_purchase_client_roportion().doubleValue());
+            career.setTotalRepurchasePercent(allAdminResult.getRepeat_purchase_client_roportion());
 
             //服务客户总数
             Integer totalServeCustomerNum = careerMapper.queryTotalServeCustomerNum(storeTechnician.getId(), month);

src/main/resources/application-pre.yml

@@ -80,7 +80,7 @@ gogirl:
   #门店上班时间
   start-time: "10:00:00"
   #评论延迟时间
-  test-paper-time: 1440
+  test-paper-time: 1
   #后台后端接口访问地址
   admin-backend-url: http://test.admin.begogirls.com:7712/api/ReportTable/GetTechnicianPage
 wx: