Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2

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

@@ -4,6 +4,7 @@ import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.admin.biz.*;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
 import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
@@ -13,12 +14,14 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
+import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.feign.OrderFeign;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -32,13 +35,15 @@ import javax.ws.rs.GET;
 import java.util.List;
 import java.util.Map;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+
 /**
  * @author keliii
  */
 @RestController
 @RequestMapping("app/user")
 @Slf4j
-public class AppUserController extends CommonBaseController {
+public class AppUserController extends CommonBaseController{
 
     @Autowired
     AppUserBiz appUserBiz;
@@ -148,7 +153,7 @@ public class AppUserController extends CommonBaseController {
             UserMemberVo memberVo=userMemberBiz.getMemberInfoByUserId(userid);
             if(memberVo!=null){
                 BeanUtils.copyProperties(userDTO,memberVo);
-//                userDTO.setPayCount(orderFeign.baseOrderEntityList(new BaseOrder()));
+                userDTO.setPayCount(orderFeign.baseOrderCount(SYS_TRUE, "1,4,5,6,7", 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

@@ -19,6 +19,6 @@ import java.util.Set;
  */
 @FeignClient(name = "order")
 public interface OrderFeign {
-    @GetMapping("/baseOrder/entityList")
-    public ObjectRestResponse<List<BaseOrder>> baseOrderEntityList(@RequestParam("entity") Map<String, Object> entity);
+    @GetMapping("/baseOrder/count")
+    public ObjectRestResponse<Integer> baseOrderCount(@RequestParam("hasMemberRight") Integer hasMemberRight,@RequestParam("multiStatus") String multiStatus, @RequestParam("userId") Integer userId);
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/QueryOrderDTO.java

@@ -25,7 +25,8 @@ public class QueryOrderDTO extends PageParam {
             "3--待付款\n" +
             "4--待出行\n" +
             "5--出行中（进行中）\n" +
-            "6--已完成")
+            "6--已完成"+
+            "7--定損中")
     private Integer status;
 
     private String multiStatus;

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

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -48,12 +49,16 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
@@ -155,12 +160,27 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         return new ObjectRestResponse<>().data(pages);
     }
 
-    @ApiOperation("根据参数查询，等于")
-    @RequestMapping(value = "/entityList",method = RequestMethod.GET)
+    @ApiOperation("查询个数")
+    @RequestMapping(value = "/count",method = RequestMethod.GET)
     @ResponseBody
-    public ObjectRestResponse<List<BaseOrder>> entityList(BaseOrder entity){
+    public ObjectRestResponse<Integer> entityList(Integer hasMemberRight, String multiStatus, Integer userId){
         //查询列表数据
-        return ObjectRestResponse.succ(baseOrderBiz.selectList(entity));
+        WeekendSqls<BaseOrder> weekendSqls = WeekendSqls.<BaseOrder>custom();
+        if(null != hasMemberRight) {
+            weekendSqls.andEqualTo(BaseOrder::getHasMemberRight, hasMemberRight);
+        }
+        if(null != multiStatus) {
+            weekendSqls.andIn(BaseOrder::getStatus,
+                    StrUtil.splitTrim(multiStatus, ",")
+                            .parallelStream().map(v -> Integer.valueOf(v)).collect(Collectors.toList()));
+        }
+        if(null != userId) {
+            weekendSqls.andEqualTo(BaseOrder::getUserId, userId);
+        }
+//                null;
+        return ObjectRestResponse.succ(baseOrderBiz
+                .selectCountByExample( new Example.Builder(BaseOrder.class)
+                        .where(weekendSqls).build()));
     }
 
     @ApiOperation("订单详情")

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -42,6 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -177,11 +178,26 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
         Query query = new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
+        if(vehicleBookRecordQueryVo.getStatus() == 2) {
+            removeStatus2(pageDataVO.getData());
+        }
         getupKeeps(pageDataVO.getData());
         return RestResponse.suc(pageDataVO);
     }
 
-    public List<VehicleBookRecordVo> getupKeeps(List<VehicleBookRecordVo> vehicleBookRecordVos) {
+   public void removeStatus2(List<VehicleBookRecordVo> list) {
+       Iterator<VehicleBookRecordVo> iterator = list.iterator();
+       while (iterator.hasNext()) {
+           if(iterator.next().getVehicleDepartureLogVo() == null) {
+               iterator.remove();
+           }
+       }
+
+   }
+   /**
+    * 获取随身物品
+    */
+   public List<VehicleBookRecordVo> getupKeeps(List<VehicleBookRecordVo> vehicleBookRecordVos) {
         for(VehicleBookRecordVo vehicleBookRecordVo : vehicleBookRecordVos) {
             if(vehicleBookRecordVo.getBookType() == BookType.MAINTAIN.getCode()) {//获取 保养项目
                if(StringUtils.isNotBlank(vehicleBookRecordVo.getUpkeepIds())) {