Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

.gitignore

@@ -10,7 +10,9 @@ ace-modules/ace-tool/src/main/resources/application-dev.yml
 **/src/test
 **/logs
 xx-order/xx-order-server/logs/**
+xx-order/xx-order-server/src/test/java/**
 *.log
 logs/**
 /src/main/test/**
 
+

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.feign;
 
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -130,12 +131,15 @@ public interface UserFeign {
     @GetMapping("/app/user/finduserIdsByphones")
     Map<String, Integer> findAppusersByUserNames(@RequestParam(value = "phones") List<String> phones);
 
+    @GetMapping("/member/user")
+    BaseUserMember findBaseUserMemberByUserId(@RequestParam(value = "userId") Integer userId);
+
+
     @GetMapping("/wallet/withdraw_do")
     public ObjectRestResponse<Void> withDrawprocess(@RequestParam(value = "orderNo") String orderNo,
                                                     @RequestParam(value = "cono",required = false) String cono,
                                                     @RequestParam(value = "reason",required = false) String reason,
-                                                    @RequestParam(value = "isSuccess") Boolean isSuccess);
 
-    @GetMapping("/member/user")
-    BaseUserMember findBaseUserMemberByUserId(@RequestParam(value = "userId") Integer userId);
+
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/BaseOrderStatisticsJobHandler.java

@@ -57,12 +57,14 @@ public class BaseOrderStatisticsJobHandler extends IJobHandler {
             }
             log.info("获取到当前需要执行的日期,距离当前时间的天数集合" + arrayList);
             XxlJobLogger.log("获取到当前需要执行的日期,距离当前时间的天数集合" + arrayList);
+            DateTime now = DateTime.now();
+
             for (Integer day : arrayList) {
                 boolean flag = statisticsBiz.statisticalOrder(day);
-                log.info("执行状态:" + day+"="+flag);
-                XxlJobLogger.log("执行状态:" + day+"="+flag);
+                DateTime dateTime = now.plusDays(-day);
+                log.info("执行状态:" + dateTime.toString("yyyy-MM-dd")+"="+flag);
+                XxlJobLogger.log("执行状态:" + dateTime.toString("yyyy-MM-dd")+"="+flag);
             }
-
             return new ReturnT<>(ReturnT.SUCCESS_CODE,"执行成功");
         } catch (Exception e) {
             XxlJobLogger.log(e);
@@ -102,10 +104,11 @@ public class BaseOrderStatisticsJobHandler extends IJobHandler {
             maxDate=currentTime;
         }
 
-        //距离今天的最小天数差
-        int minDay = (int) ((currentTime-minDate)/(24*60*60*1000));
+
         //距离今天的最大天数差
-        int maxDay = (int) ((currentTime-maxDate)/(24*60*60*1000));
+        int maxDay = (int) ((currentTime-minDate)/(24*60*60*1000));
+        //距离今天的最小天数差
+        int minDay = (int) ((currentTime-maxDate)/(24*60*60*1000));
 
 
         return getListByMinDayAndMaxDay(minDay,maxDay);
@@ -121,7 +124,7 @@ public class BaseOrderStatisticsJobHandler extends IJobHandler {
 
     private ArrayList<Integer> getListByMinDayAndMaxDay(int minDay,int maxDay){
         ArrayList<Integer> arrayList = Lists.newArrayList();
-        for (int day=maxDay;day<=maxDay;day++){
+        for (int day=maxDay;day>=minDay;day--){
             arrayList.add(day);
         }
         return arrayList;

xx-order/xx-order-server/src/test/java/ServiceTest.java

@@ -75,7 +75,7 @@ public class ServiceTest {
 
     @Test
     public void handlerTeset()  {
-        handler.execute("2019-10-12");
+        handler.execute("2019-08-15");
     }
 
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -11,7 +11,6 @@ import com.xxfc.platform.vehicle.pojo.dto.VehicleModelCalendarPriceDTO;
 import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -77,6 +76,10 @@ public interface VehicleFeign {
             @RequestParam(value = "dataCompany") String dataCompany,
             @RequestParam(value = "dataZone") String dataZone);
 
+    //获取分公司列表
+    @GetMapping("/company/base/app/unauth/companyId")
+    public BranchCompany companyId(@RequestParam(value = "name") String name);
+
     @GetMapping("/branchCompany/entityList")
     public ObjectRestResponse<List<BranchCompany>> branchCompanyEntityList(@RequestParam("entity") Map<String, Object> entity);
 
@@ -180,6 +183,7 @@ public interface VehicleFeign {
 
     /**
      * 车型日历价格
+     *
      * @param startDate
      * @param endDate
      * @param vehicleModelId

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -412,7 +412,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
                     companyList.clear();
                     companyList.add(vehiclePlanDto.getParkBranchCompanyId());
                 } else {
-                    return ObjectRestResponse.succ();
+                    return ObjectRestResponse.succ(Maps.newHashMap());
                 }
             }
         }
@@ -422,7 +422,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
                     companyList.clear();
                     companyList.add(vehiclePlanDto.getSubordinateBranch());
                 } else {
-                    return ObjectRestResponse.succ();
+                    return ObjectRestResponse.succ(Maps.newHashMap());
                 }
             }
         }
@@ -437,7 +437,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
          Map<String, Object> map = Maps.newHashMap();
          map.put("vehicleWarningMsgs",vehicleWarningMsgs);
          map.put("vehicleAndModelInfoVo",pageDataVO);
-        map.put("vehicleCountVos",vehicleCountVos);
+         map.put("vehicleCountVos",vehicleCountVos);
         return ObjectRestResponse.succ(map);
     }