Merge remote-tracking branch 'origin/base-modify' into base-modify

# Conflicts:
#	xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ActivityBm.java
#	xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java

@@ -56,6 +56,7 @@ public class DailyVehicleOrderStatistics extends DailyOrderStatistics {
     @Column(name = "return_gmv")
     private BigDecimal returnGmv;
 
+
     /**
      *  违约总额
      */
@@ -68,4 +69,5 @@ public class DailyVehicleOrderStatistics extends DailyOrderStatistics {
     @Column(name = "total_expenditure")
     private BigDecimal totalExpenditure;
 
+
 }

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/entity/ActivityBm.java

@@ -62,7 +62,6 @@ public class ActivityBm {
     private Long updTime;
 
 
-
     @Column(name = "is_del")
     @ApiModelProperty("是否删除：0-正常；1-删除")
     private Integer isDel;

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java

@@ -40,26 +40,26 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
             criteria.andLike("title", String.format("%%%s%%", query.getTitle().trim()));
         }
         if (query.getStartTime() != null) {
-            criteria.andLike("startTime", query.getStartTime() / 1000 + "%");
+            criteria.andLike("startTime", query.getStartTime()/(1000*60*60)+"%");
         }
         if (query.getStatus() != null) {
             criteria.andEqualTo("status", query.getStatus());
         }
 
-
         if (query.getType() != null && AccessType.PUBLIC.getCode().equals(query.getType())) {
             criteria.andEqualTo("isPublish", PUBLISHED);
         }
         exa.orderBy("rank").asc().orderBy("startTime").desc();
 
-        if (AccessType.PUBLIC.getCode().equals(query.getType())) {
-            return mapper.selectByExample(exa);
-        }
+//        if (AccessType.PUBLIC.getCode().equals(query.getType())) {
+////            return mapper.selectByExample(exa);
+////        }
 
 
         PageHelper.startPage(query.getPage(), query.getLimit());
         List<Activity> activities = mapper.selectByExample(exa);
         return new PageInfo<Activity>(activities);
+
     }
 
     @Transactional(rollbackFor = Exception.class)

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/config/WebConfiguration.java

@@ -2,7 +2,7 @@ package com.xxfc.platform.summit.config;
 
 
 import com.github.wxiaoqi.security.common.handler.GlobalExceptionHandler;
-import com.xxfc.platform.summit.interceptor.WeChatH5LoginInterceoptor;
+import com.xxfc.platform.summit.interceptor.WeChatH5LoginInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -27,8 +27,8 @@ public class WebConfiguration implements WebMvcConfigurer {
     }
 
     @Bean
-    WeChatH5LoginInterceoptor  getWeChatH5LoginRestInterceptor() {
-        return new WeChatH5LoginInterceoptor();
+    WeChatH5LoginInterceptor getWeChatH5LoginRestInterceptor() {
+        return new WeChatH5LoginInterceptor();
     }
 
     /**
@@ -38,7 +38,7 @@ public class WebConfiguration implements WebMvcConfigurer {
     private ArrayList<String> getIncludePathPatterns() {
         ArrayList<String> list = new ArrayList<>();
         String[] urls = {
-                "/activity/**"
+                "/auth/activity/**"
         };
         Collections.addAll(list, urls);
         return list;

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityController.java

@@ -5,6 +5,8 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.summit.biz.ActivityBiz;
 import com.xxfc.platform.summit.entity.Activity;
 import com.xxfc.platform.summit.pojo.ActivityQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -12,16 +14,19 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/activity")
+@Api(tags = "峰会")
 public class ActivityController extends BaseController<ActivityBiz, Activity> {
 
 
     @PostMapping("/app/unauth/list")
+    @ApiOperation(value = "峰会列表",notes = "峰会列表")
     public ObjectRestResponse getList(@RequestBody ActivityQuery query ){
         return ObjectRestResponse.succ(baseBiz.getList(query));
     }
 
     @Override
     @PutMapping ("/update")
+    @ApiOperation(value = "修改",notes = "修改")
     public ObjectRestResponse update(@RequestBody Activity activity ){
         if (baseBiz.update(activity)) {
             return ObjectRestResponse.succ();
@@ -31,6 +36,7 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
 
     @Override
     @PostMapping("/add")
+    @ApiOperation(value = "添加",notes = "添加")
     public ObjectRestResponse add(@RequestBody Activity activity ){
         if (baseBiz.add(activity)) {
             return ObjectRestResponse.succ();

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/interceptor/WeChatH5LoginInterceoptor.java → xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/interceptor/WeChatH5LoginInterceptor.java

@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
  *
  */
 @Slf4j
-public class WeChatH5LoginInterceoptor extends HandlerInterceptorAdapter {
+public class WeChatH5LoginInterceptor extends HandlerInterceptorAdapter {
 
 
 	@Autowired