Commit cc6d5651 by huluobin

update

parent 067af822
...@@ -213,7 +213,7 @@ public class Schedule { ...@@ -213,7 +213,7 @@ public class Schedule {
} }
//如果店铺id不为空 //如果店铺id不为空
if (cbrt != null && cbrt.getDepartmentId() == null) { if (cbrt != null && cbrt.getDepartmentId() != null) {
customerBalanceRecord.setDepartmentId(cbrt.getDepartmentId()); customerBalanceRecord.setDepartmentId(cbrt.getDepartmentId());
} }
......
...@@ -116,6 +116,7 @@ public class AdminFeignTest { ...@@ -116,6 +116,7 @@ public class AdminFeignTest {
.sord("asc") .sord("asc")
//在职 //在职
.status(1) .status(1)
.api_brand_id(1)
.build(); .build();
request.setDate_utc(Lists.newArrayList("2020-09-20T15:00:00.000Z", "2020-09-20T16:00:00.000Z")); request.setDate_utc(Lists.newArrayList("2020-09-20T15:00:00.000Z", "2020-09-20T16:00:00.000Z"));
AdminResult<AdminPage<AdminTechnicianScoreResp>> result = adminFeign.getTechnicianPage(request); AdminResult<AdminPage<AdminTechnicianScoreResp>> result = adminFeign.getTechnicianPage(request);
...@@ -128,13 +129,14 @@ public class AdminFeignTest { ...@@ -128,13 +129,14 @@ public class AdminFeignTest {
AchievementsPersonaResultPageApiRequest request = AchievementsPersonaResultPageApiRequest.builder() AchievementsPersonaResultPageApiRequest request = AchievementsPersonaResultPageApiRequest.builder()
.page(1) .page(1)
.year(calendar.get(Calendar.YEAR)) .year(calendar.get(Calendar.YEAR))
.month(calendar.get(Calendar.MONTH) + 1) .month(9)
.status(1) .status(1)
.page(1) .page(1)
.rows(30) .rows(30)
.api_brand_id(1)
.sidx("") .sidx("")
.sord("desc") .sord("desc")
.technician_id(127) // .technician_id(127)
.build(); .build();
AdminResult<AdminPage<AchievementsPersonaResult>> result = adminFeign.achievementsPersonaResultPageApi(request); AdminResult<AdminPage<AchievementsPersonaResult>> result = adminFeign.achievementsPersonaResultPageApi(request);
......
package com.gogirl.infrastructure.schedule;
import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2020/10/19 10:22 下午
*/
@ActiveProfiles("prod")
@RunWith(SpringRunner.class)
@SpringBootTest
@Slf4j
public class ScheduleTest {
@Autowired
Schedule schedule;
@Test
public void setChargeReferees() {
for (int i = 7; i < 10; i++) {
schedule.setChargeReferees("2020-10-0" + i);
}
for (int i = 10; i < 20; i++) {
schedule.setChargeReferees("2020-10-" + i);
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment