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

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -153,7 +153,7 @@ public class AppUserController extends CommonBaseController{
             UserMemberVo memberVo=userMemberBiz.getMemberInfoByUserId(userid);
             if(memberVo!=null){
                 BeanUtils.copyProperties(userDTO,memberVo);
-                userDTO.setPayCount(orderFeign.baseOrderCount(SYS_TRUE, "1,4,5,6,7", userid).getData());
+                userDTO.setPayCount(orderFeign.baseOrderCount(SYS_TRUE, "1,4,5,6,7", null, userid).getData());
                 Integer level=memberVo.getMemberLevel();
                 BaseUserMemberLevel memberLevel=userMemberLevelBiz.getLevel(level);
                 if (memberLevel!=null){

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

@@ -20,5 +20,5 @@ import java.util.Set;
 @FeignClient(name = "xx-order")
 public interface OrderFeign {
     @GetMapping("/baseOrder/count")
-    public ObjectRestResponse<Integer> baseOrderCount(@RequestParam("hasMemberRight") Integer hasMemberRight,@RequestParam("multiStatus") String multiStatus, @RequestParam("userId") Integer userId);
+    public ObjectRestResponse<Integer> baseOrderCount(@RequestParam("hasMemberRight") Integer hasMemberRight, @RequestParam("multiStatus") String multiStatus, @RequestParam("multiTypes") String multiTypes, @RequestParam("userId") Integer userId);
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -164,7 +164,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @RequestMapping(value = "/count",method = RequestMethod.GET)
     @ResponseBody
     @IgnoreUserToken
-    public ObjectRestResponse<Integer> entityList(Integer hasMemberRight, String multiStatus, Integer userId){
+    public ObjectRestResponse<Integer> entityList(Integer hasMemberRight, String multiStatus, String multiTypes, Integer userId){
         //查询列表数据
         WeekendSqls<BaseOrder> weekendSqls = WeekendSqls.<BaseOrder>custom();
         if(null != hasMemberRight) {
@@ -175,6 +175,11 @@ public class BaseOrderController extends CommonBaseController implements UserRes
                     StrUtil.splitTrim(multiStatus, ",")
                             .parallelStream().map(v -> Integer.valueOf(v)).collect(Collectors.toList()));
         }
+        if(null != multiTypes) {
+            weekendSqls.andIn(BaseOrder::getType,
+                    StrUtil.splitTrim(multiTypes, ",")
+                            .parallelStream().map(v -> Integer.valueOf(v)).collect(Collectors.toList()));
+        }
         if(null != userId) {
             weekendSqls.andEqualTo(BaseOrder::getUserId, userId);
         }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -544,25 +544,28 @@
         <!-- union 所有车型 -->
         <if test="startCompanyId != null or parkBranchCompanyId != null ">
             union
-            (select id as model_id,
-            <choose>
-                <when test="startCompanyId != null">
-                    #{startCompanyId} as company_id,
-                </when>
-                <otherwise>
-                    #{parkBranchCompanyId} as company_id,
-                </otherwise>
-            </choose>
+            (select vm.id as model_id, bc.id as company_id
             <if test=" catas != null ">
-                null as catas,
+                ,null as catas
             </if>
             <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
-                0 as hasVehicle,
+                ,0 as hasVehicle
             </if>
             <if test="lon != null and lat != null">
-                0 as distance
+                <!-- 处理距离 -->
+                ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
             </if>
-            from vehicle_model where vehicle_model.isdel = 0)
+            from vehicle_model vm
+                left join branch_company bc on
+                <choose>
+                    <when test="startCompanyId != null">
+                        bc.id = #{startCompanyId}
+                    </when>
+                    <otherwise>
+                        bc.id = #{parkBranchCompanyId}
+                    </otherwise>
+                </choose>
+            where vm.isdel = 0)
         </if>
         <if test="lon != null and lat != null">
             order by