Procházet zdrojové kódy

* 商品详情接口bug修复

libo před 4 roky
rodič
revize
cf2e05fd8c

+ 7 - 0
src/main/java/com/tdba/cxb/ares/api/controller/UserController.java

@@ -16,6 +16,9 @@ import org.springframework.web.bind.annotation.RequestParam;
16
 import javax.annotation.Resource;
16
 import javax.annotation.Resource;
17
 
17
 
18
 import java.time.LocalDate;
18
 import java.time.LocalDate;
19
+import java.time.LocalDateTime;
20
+import java.time.ZoneOffset;
21
+import java.time.ZonedDateTime;
19
 
22
 
20
 import static com.tdba.cxb.ares.api.model.TDBAResponseBuilder.buildSuccess;
23
 import static com.tdba.cxb.ares.api.model.TDBAResponseBuilder.buildSuccess;
21
 
24
 
@@ -74,4 +77,8 @@ public class UserController {
74
     public TDBAResponse bind_add(@RequestBody @Validated BindUserAdd param, BaseUser baseUser){
77
     public TDBAResponse bind_add(@RequestBody @Validated BindUserAdd param, BaseUser baseUser){
75
         return buildSuccess("");
78
         return buildSuccess("");
76
     }
79
     }
80
+
81
+    public static void main(String[] args) {
82
+        System.out.println(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8)));
83
+    }
77
 }
84
 }

+ 6 - 6
src/main/java/com/tdba/cxb/ares/api/repository/UserMapper.java

@@ -25,15 +25,15 @@ public interface UserMapper {
25
     List<UserDto> selectByTimeRegion(@Param("beginTime")LocalDateTime beginTime,
25
     List<UserDto> selectByTimeRegion(@Param("beginTime")LocalDateTime beginTime,
26
                                      @Param("endTime")LocalDateTime endTime);
26
                                      @Param("endTime")LocalDateTime endTime);
27
 
27
 
28
-    List<UserDto> selectDacang(@Param("beginTime")LocalDateTime beginTime,
29
-                               @Param("endTime")LocalDateTime endTime);
28
+    List<UserDto> selectDacang(@Param("beginTime")Long beginTime,
29
+                               @Param("endTime")Long endTime);
30
 
30
 
31
     List<UserDto> selectMerchant(@Param("beginTime")LocalDateTime beginTime,
31
     List<UserDto> selectMerchant(@Param("beginTime")LocalDateTime beginTime,
32
                                @Param("endTime")LocalDateTime endTime);
32
                                @Param("endTime")LocalDateTime endTime);
33
 
33
 
34
-    List<UserDto> selectChannel(@Param("beginTime")LocalDateTime beginTime,
35
-                               @Param("endTime")LocalDateTime endTime);
34
+    List<UserDto> selectChannel(@Param("beginTime")Long beginTime,
35
+                               @Param("endTime")Long endTime);
36
 
36
 
37
-    List<UserDto> selectAgent(@Param("beginTime")LocalDateTime beginTime,
38
-                               @Param("endTime")LocalDateTime endTime);
37
+    List<UserDto> selectAgent(@Param("beginTime")Long beginTime,
38
+                               @Param("endTime")Long endTime);
39
 }
39
 }

+ 4 - 3
src/main/java/com/tdba/cxb/ares/api/service/UserService.java

@@ -17,6 +17,7 @@ import javax.annotation.Resource;
17
 import java.time.LocalDate;
17
 import java.time.LocalDate;
18
 import java.time.LocalDateTime;
18
 import java.time.LocalDateTime;
19
 import java.time.LocalTime;
19
 import java.time.LocalTime;
20
+import java.time.ZoneOffset;
20
 import java.util.ArrayList;
21
 import java.util.ArrayList;
21
 import java.util.List;
22
 import java.util.List;
22
 
23
 
@@ -119,7 +120,7 @@ public class UserService {
119
      */
120
      */
120
     public void resolverDacang(LocalDate localDate){
121
     public void resolverDacang(LocalDate localDate){
121
         LocalDateTime currentTime = LocalDateTime.now();
122
         LocalDateTime currentTime = LocalDateTime.now();
122
-        List<UserDto> userList = userMapper.selectDacang(LocalDateTime.of(localDate, LocalTime.MIN), LocalDateTime.of(localDate, LocalTime.MAX));
123
+        List<UserDto> userList = userMapper.selectDacang(LocalDateTime.of(localDate, LocalTime.MIN).toEpochSecond(ZoneOffset.ofHours(8)), LocalDateTime.of(localDate, LocalTime.MAX).toEpochSecond(ZoneOffset.ofHours(8)));
123
         List<UserCount> resultList = new ArrayList<>();
124
         List<UserCount> resultList = new ArrayList<>();
124
         userList.stream().forEach(row -> {
125
         userList.stream().forEach(row -> {
125
             if(0 < row.getNum()) {
126
             if(0 < row.getNum()) {
@@ -189,7 +190,7 @@ public class UserService {
189
      */
190
      */
190
     public void resolverChannel(LocalDate localDate){
191
     public void resolverChannel(LocalDate localDate){
191
         LocalDateTime currentTime = LocalDateTime.now();
192
         LocalDateTime currentTime = LocalDateTime.now();
192
-        List<UserDto> userList = userMapper.selectChannel(LocalDateTime.of(localDate, LocalTime.MIN), LocalDateTime.of(localDate, LocalTime.MAX));
193
+        List<UserDto> userList = userMapper.selectChannel(LocalDateTime.of(localDate, LocalTime.MIN).toEpochSecond(ZoneOffset.ofHours(8)), LocalDateTime.of(localDate, LocalTime.MAX).toEpochSecond(ZoneOffset.ofHours(8)));
193
         List<UserCount> resultList = new ArrayList<>();
194
         List<UserCount> resultList = new ArrayList<>();
194
         userList.stream().forEach(row -> {
195
         userList.stream().forEach(row -> {
195
             if(0 < row.getNum()) {
196
             if(0 < row.getNum()) {
@@ -224,7 +225,7 @@ public class UserService {
224
      */
225
      */
225
     public void resolverAgent(LocalDate localDate){
226
     public void resolverAgent(LocalDate localDate){
226
         LocalDateTime currentTime = LocalDateTime.now();
227
         LocalDateTime currentTime = LocalDateTime.now();
227
-        List<UserDto> userList = userMapper.selectAgent(LocalDateTime.of(localDate, LocalTime.MIN), LocalDateTime.of(localDate, LocalTime.MAX));
228
+        List<UserDto> userList = userMapper.selectAgent(LocalDateTime.of(localDate, LocalTime.MIN).toEpochSecond(ZoneOffset.ofHours(8)), LocalDateTime.of(localDate, LocalTime.MAX).toEpochSecond(ZoneOffset.ofHours(8)));
228
         List<UserCount> resultList = new ArrayList<>();
229
         List<UserCount> resultList = new ArrayList<>();
229
         userList.stream().forEach(row -> {
230
         userList.stream().forEach(row -> {
230
             if(0 < row.getNum()) {
231
             if(0 < row.getNum()) {