Merge branch 'dev' into master_activity-hf

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/WalletDetailListDTO.java

@@ -58,4 +58,10 @@ public class WalletDetailListDTO {
     @ApiModelProperty(value = "操作时间", hidden = true )
     private Long crtTime;
 
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "来源人")
+    private String sourceUserName;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java

 package com.github.wxiaoqi.security.admin.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 
 /**
  * 会员等级表
@@ -76,5 +79,8 @@ public class BaseUserMemberLevel implements Serializable {
 	@ApiModelProperty(value = "赠送免费天数")
 	private Integer number;
 
+	@Column(name = "big_icon")
+	@ApiModelProperty(value = "大图标")
+	private String bigIcon;
 
 }

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

@@ -83,6 +83,7 @@ public class AppUserDTO {
 	private String memberName;
 	//图标
 	private String icon;
+	private String bigIcon;
 	private Integer memberNo;
 	private Long cardLeave;
 	private Integer isBind;

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/WalletDetailAdminVo.java

@@ -49,6 +49,13 @@ public class WalletDetailAdminVo {
     @ApiModelProperty(value = "操作时间", hidden = true )
     private Long crtTime;
 
+    @ApiModelProperty(value = "来源")
     private String sourceName;
 
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+
+    @ApiModelProperty(value = "来源人")
+    private String sourceUserName;
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java

@@ -4,10 +4,8 @@ import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO;
 import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDataFindDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberSaveDTO;
-import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
-import com.github.wxiaoqi.security.admin.entity.UserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberExportMapper;
 import com.github.wxiaoqi.security.admin.vo.BaseUserMemberExportVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserMemberLevelBiz.java

@@ -2,9 +2,9 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
-import com.github.wxiaoqi.security.admin.entity.UserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -51,4 +51,11 @@ public class UserMemberLevelBiz extends BaseBiz<BaseUserMemberLevelMapper,BaseUs
        }
        return levelAndDiscountMap;
     }
+
+    public void updateMemberBaseInfo(BaseUserMemberLevel baseUserMemberLevel) {
+        int affectRows = mapper.updateByPrimaryKeySelective(baseUserMemberLevel);
+        if (affectRows==0){
+            throw new BaseException("更新会员等级失败");
+        }
+    }
 }

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

@@ -153,6 +153,7 @@ public class AppUserController extends CommonBaseController{
                 if (memberLevel!=null){
                     String icon=memberLevel.getIcon();
                     userDTO.setIcon(icon);
+                    userDTO.setBigIcon(memberLevel.getBigIcon());
                 }
             }
         }

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

@@ -74,4 +74,9 @@ public class MemberLevelController extends BaseController<UserMemberLevelBiz, Ba
         return ObjectRestResponse.succ();
     }
 
+    @PutMapping("/update")
+    public ObjectRestResponse<Void> updateMemberBaseInfo(@RequestBody BaseUserMemberLevel baseUserMemberLevel){
+        getBaseBiz().updateMemberBaseInfo(baseUserMemberLevel);
+        return ObjectRestResponse.succ();
+    }
 }

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

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -113,8 +113,7 @@
         base_user_member_level ml
         on
         ml.level = b.member_level
-        where
-        ml.isdel=0
+        where ml.isdel = 0
         ) m
         on
         l.id = m.user_id

ace-modules/ace-admin/src/main/resources/mapper/MyWalletDetailMapper.xml

@@ -18,7 +18,9 @@
 	ausw.price,
 	ausw.extract,
 	ausw.waiting,
-	ausw.title
+	ausw.title,
+	ausw.order_no,
+	ausw.sourceUserName
 FROM
 	(select id,user_id,source,amount,cono,itype,activity_id,activity_name,`crt_time` FROM `my_wallet_detail` <if test="sourceType != null">
 		WHERE `source`=#{sourceType}
@@ -29,7 +31,7 @@ FROM
 		INNER JOIN (SELECT userid,nickname,realname FROM `app_user_detail`<if test="userName != null and userName != ''">
 		WHERE `nickname`=#{userName} OR `realname`=#{userName}
 	</if>) AS `aud` ON aud.userid = aul.id
-	LEFT JOIN (SELECT DISTINCT order_id,id,price,extract,waiting,title FROM `app_user_selling_water`) AS `ausw` ON ausw.order_id = wd.cono
+	LEFT JOIN (SELECT DISTINCT order_id,au.id,order_no,IFNULL(d.realname,d.nickname) AS `sourceUserName`,price,extract,waiting,title FROM `app_user_selling_water` AS `au` INNER JOIN `app_user_detail` AS `d` ON d.userid=au.source_id) AS `ausw` ON ausw.order_id = wd.cono
 		 ORDER	BY `crtTime` DESC
     </select>
 

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/CustomerServiceBiz.java

@@ -11,6 +11,7 @@ import com.xxfc.platform.im.entity.CustomerService;
 import com.xxfc.platform.im.mapper.CustomerServiceMapper;
 import com.xxfc.platform.im.vo.CustomerServiceVO;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,14 +55,14 @@ public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper, CustomerS
         CustomerService customerService = new CustomerService();
         BeanUtils.copyProperties(customerServiceDTO, customerService);
 
-         if (Objects.isNull(customerServiceDTO.getId())){
+        if (Objects.isNull(customerServiceDTO.getId())) {
             customerService.setCreateTime(Instant.now().toEpochMilli());
             customerService.setName(String.format("%s%s", NICK_PRE_NAME, customerServiceDTO.getTelphone()));
             customerService.setIsDel(false);
-             customerService.setPassword(INIT_PASSWORD);
+            customerService.setPassword(StringUtils.isEmpty(customerServiceDTO.getPassword()) ? INIT_PASSWORD : customerServiceDTO.getPassword().trim().length() > 0 ? customerServiceDTO.getPassword() : INIT_PASSWORD);
             Map<String, Object> imMap = new HashMap<>(2);
             imMap.put("telephone", customerServiceDTO.getTelphone());
-             imMap.put("password", INIT_PASSWORD);
+            imMap.put("password", DigestUtils.md5Hex(customerService.getPassword()));
             imMap.put("nickname", customerService.getName());
             BaseResponse imResponse = userBiz.register(imMap);
             String imResult = imResponse.getMessage();
@@ -73,10 +74,10 @@ public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper, CustomerS
             }
             customerService.setImUserId((Integer) userId);
             mapper.insertSelective(customerService);
-         }else {
+        } else {
             customerService.setUpdateTime(Instant.now().toEpochMilli());
-             if (!StringUtils.isEmpty(customerServiceDTO.getPassword())){
-                 userBiz.updatePasswordByPhone(customerServiceDTO.getTelphone(),customerServiceDTO.getPassword());
+            if (!StringUtils.isEmpty(customerServiceDTO.getPassword())) {
+                userBiz.updatePasswordByPhone(customerServiceDTO.getTelphone(), customerServiceDTO.getPassword());
             }
             mapper.updateByPrimaryKeySelective(customerService);
         }
@@ -121,12 +122,12 @@ public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper, CustomerS
     public void updatePasswordByPhone(String telphone, String password) {
         Example example = new Example(CustomerService.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("telphone",telphone);
+        criteria.andEqualTo("telphone", telphone);
 
         CustomerService customerService = new CustomerService();
-        customerService.setPassword(password);
+        customerService.setPassword(DigestUtils.md5Hex(password));
         customerService.setUpdateTime(Instant.now().toEpochMilli());
-        mapper.updateByExampleSelective(customerService,example);
+        mapper.updateByExampleSelective(customerService, example);
     }
 
     public PageDataVO<CustomerServiceVO> findCustomerServiceWithPage(Integer page, Integer limit) {
@@ -134,11 +135,11 @@ public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper, CustomerS
 
         Example example = new Example(CustomerService.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andEqualTo("isDel",false);
+        criteria.andEqualTo("isDel", false);
 
-      PageDataVO<CustomerService> pageDataVO = PageDataVO.pageInfo(page,limit,()->mapper.selectByExample(example));
+        PageDataVO<CustomerService> pageDataVO = PageDataVO.pageInfo(page, limit, () -> mapper.selectByExample(example));
         List<CustomerService> data = pageDataVO.getData();
-        if (CollectionUtils.isEmpty(data)){
+        if (CollectionUtils.isEmpty(data)) {
             return dataVO;
         }
 
@@ -146,7 +147,7 @@ public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper, CustomerS
         CustomerServiceVO customerServiceVO;
         for (CustomerService customerService : data) {
             customerServiceVO = new CustomerServiceVO();
-            BeanUtils.copyProperties(customerService,customerServiceVO);
+            BeanUtils.copyProperties(customerService, customerServiceVO);
             customerServiceVOS.add(customerServiceVO);
         }
 
@@ -161,7 +162,7 @@ public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper, CustomerS
     public CustomerServiceDTO findCustomerServiceById(Long id) {
         CustomerServiceDTO customerServiceDTO = new CustomerServiceDTO();
         CustomerService customerService = mapper.selectByPrimaryKey(id);
-        BeanUtils.copyProperties(customerService,customerServiceDTO);
+        BeanUtils.copyProperties(customerService, customerServiceDTO);
         return customerServiceDTO;
     }
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/Utils/OrderDateUtils.java

+package com.xxfc.platform.order.Utils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class OrderDateUtils {
+
+    public static String getFirstDayOfMonth(int year, int month) {
+        String monthStr = String.valueOf(month);
+        return year + "-" + monthStr + "-" + "01";
+    }
+
+    /**
+     *  get the last date of given month and year
+     *  @param year
+     *  @param month
+     *  @return
+     *     
+     */
+
+
+    public static  String getLastDayOfMonth(int year, int month) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.YEAR, year);
+        calendar.set(Calendar.MONTH, month - 1);
+        calendar.set(Calendar.DATE, 1);
+        calendar.add(Calendar.MONTH, 1);
+        calendar.add(Calendar.DAY_OF_YEAR, -1);
+        return calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-" +
+                calendar.get(Calendar.DAY_OF_MONTH);
+    }
+
+    /**
+     *  get Calendar of given year
+     *  @param year
+     *  @return
+     *     
+     */
+
+
+    private static Calendar getCalendarFormYear(int year) {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+        cal.set(Calendar.YEAR, year);
+        return cal;
+    }
+
+    /**
+     *  get start date of given week no of a year
+     *  @param year
+     *  @param weekNo
+     *  @return
+     *     
+     */
+
+
+    public static  String getStartDayOfWeekNo(int year, int weekNo) {
+        Calendar cal = getCalendarFormYear(year);
+        cal.set(Calendar.WEEK_OF_YEAR, weekNo);
+        return cal.get(Calendar.YEAR) + "-" + (cal.get(Calendar.MONTH) + 1) + "-" +
+                cal.get(Calendar.DAY_OF_MONTH);
+
+    }
+
+    /**
+     *  get the end day of given week no of a year.
+     *  @param year
+     *  @param weekNo
+     *  @return
+     *     
+     */
+    public static String getEndDayOfWeekNo(int year, int weekNo) {
+        Calendar cal = getCalendarFormYear(year);
+        cal.set(Calendar.WEEK_OF_YEAR, weekNo);
+        cal.add(Calendar.DAY_OF_WEEK, 6);
+        return cal.get(Calendar.YEAR) + "-" + (cal.get(Calendar.MONTH) + 1) + "-" +
+                cal.get(Calendar.DAY_OF_MONTH);
+    }
+
+    public static String timeStampConversionToString(Long time) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        Date date = new Date(time);
+        return simpleDateFormat.format(date);
+    }
+
+    public static Long ConvertingStringsToTimestamps(String time) throws ParseException {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        return simpleDateFormat.parse(time).getTime();
+    }
+
+    public static Integer getTodayOfWeek() {
+        Calendar cal = Calendar.getInstance();
+        cal.setFirstDayOfWeek(Calendar.MONDAY);
+        cal.setTimeInMillis(System.currentTimeMillis());
+        return cal.get(Calendar.WEEK_OF_YEAR);
+    }
+
+    public static Integer getTodayOfMonth() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTimeInMillis(System.currentTimeMillis());
+        return cal.get(Calendar.MONTH)+1;
+    }
+
+    public static Integer getThisYear() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTimeInMillis(System.currentTimeMillis());
+        return cal.get(Calendar.YEAR);
+    }
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderInquiryType.java

+package com.xxfc.platform.order.contant.enumerate;
+
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+
+public enum OrderInquiryType {
+    DAY(1,"按天分类"),WEEK(2,"按周分类"),MONTH(3,"按月分类");
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    OrderInquiryType(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

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

@@ -57,12 +57,15 @@ public class DailyVehicleOrderStatistics extends DailyOrderStatistics {
     private BigDecimal returnGmv;
 
 
+
+
 //    /**
 //     * 取消订单扣款总额
 //     */
 //    @Column(name = "penal_sum")
 //    private BigDecimal penalSum;
 
+
     /**
      *  违约总额
      */

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

+package com.xxfc.platform.order.entity;
+
+import com.xxfc.platform.order.pojo.Member;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class MembersOrder {
+
+    /**
+     * 时间段按日(yyyy-MM-dd)/周(yyyy-ww) /月(yyyy-MM)
+     */
+    private String period;
+
+    List<Member> members;
+
+
+}

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

@@ -21,7 +21,7 @@ public class OrderStatistics {
     /**
      * 历史交总金额
      */
-    @ApiModelProperty(value = "历史交总金额")
+    @ApiModelProperty(value = "历史交易总金额")
     private BigDecimal totalGmv;
 
     /**

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

 package com.xxfc.platform.order.pojo;
 
 import lombok.Data;
+import lombok.ToString;
 
 import java.math.BigDecimal;
 
@@ -11,7 +12,7 @@ public class HomePageOrderData {
      */
     private BigDecimal totalOrders;
     /**
-     * 为退还押金总额
+     * 未退还退还押金总额
      */
     private BigDecimal totalOutstandingDeposit;
 
@@ -20,4 +21,13 @@ public class HomePageOrderData {
      */
     private BigDecimal additionalIndemnity;
 
+
+    @Override
+    public String toString() {
+        return "HomePageOrderData{" +
+                "totalOrders=" + totalOrders +
+                ", totalOutstandingDeposit=" + totalOutstandingDeposit +
+                ", additionalIndemnity=" + additionalIndemnity +
+                '}';
+    }
 }

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

+package com.xxfc.platform.order.pojo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 每日、每周或每月不同会员的总数据
+ * @author Administrator
+ */
+@Data
+public class Member {
+    /**
+     * 金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 会员等级
+     */
+    private Integer level;
+
+    /**
+     * 购买次数
+     */
+    private Integer number;
+
+    /**
+     * 会员名
+     */
+    private String memberName;
+
+}

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

+package com.xxfc.platform.order.pojo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 每日、每周、每月会员购买数据
+ * @author Administrator
+ */
+@Data
+public class MembersOrderDto {
+
+    /**
+     * 时间段
+     */
+    private String timeSlot;
+
+    /**
+     * 时间段总数据
+     *
+     */
+    private BigDecimal totalPayment;
+
+    /**
+     * 时间段内不同会员数据
+     */
+    private List<Member> members;
+
+
+}

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

+package com.xxfc.platform.order.pojo;
+
+import lombok.Data;
+
+/**
+ * 会员订单统计条件
+ * @author Administrator
+ */
+@Data
+public class   OrderQuery {
+
+    private  Integer page=1;
+    private  Integer limit=10;
+
+    /**
+     * 查询开始时间
+     */
+    private  Long startTime;
+
+    /**
+     * 查询结束时间
+     */
+    private  Long endTime;
+    /**
+     * 1.按每日统计,2.按每周统计,3.按每月统计
+     */
+    private  Integer type=1;
+
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

 package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -8,12 +9,14 @@ import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 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.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.google.gson.JsonObject;
 import com.xxfc.platform.activity.feign.ActivityFeign;
@@ -39,6 +42,7 @@ import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
+import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
@@ -53,12 +57,10 @@ import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
@@ -72,7 +74,7 @@ import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
  */
 @Service
 @Slf4j
-public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
+public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements UserRestInterface {
 
     @Autowired
     OrderMemberDetailBiz orderMemberDetailBiz;
@@ -332,6 +334,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         dedDetailDTO.setStatusName(detailName);
     }
 
+    /**
+     * 获取驾驶人驾照
+     * @param orderPageVo
+     */
     public void getUserLicense(OrderPageVO orderPageVo) {
         OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
         orderVehicleCrosstownDto.setOrderId(orderPageVo.getId());
@@ -360,6 +366,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
     }
 
+    /**
+     *  获取驾驶人信息
+     * @param orderPageVo
+     */
     public void  getDriverInfo(OrderPageVO orderPageVo) {
         List<VehicleUserLicense> vehicleUserLicenses = Lists.newArrayList();
         String myDriverIds = orderPageVo.getOrderRentVehicleDetail().getMyDriverIds();
@@ -387,7 +397,57 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         orderPageVo.setVehicleUserLicenses(vehicleUserLicenses);
     }
 
+    public ObjectRestResponse save(OrderRentVehicleDetail orderRentVehicleDetail) {
+        if (orderRentVehicleDetail == null || orderRentVehicleDetail.getId() == null) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        log.info("更新订单还车地点》》》 orderRentVehicleDetail = {}", orderRentVehicleDetail.toString());
+        UserDTO userDTO = getAdminUserInfo();
+        if (userDTO == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+        }
 
+        StringBuilder stringBuilder = new StringBuilder();
+        OrderRentVehicleDetail oldValue = orderRentVehicleBiz.selectById(orderRentVehicleDetail.getId());
+        if(oldValue == null) {
+            return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
+        }
+        stringBuilder.append("修改订单和预定记录还车公司成功, 订单ID:");
+        stringBuilder.append( oldValue.getOrderId());
+        stringBuilder.append("; 原还车公司ID: ");
+        stringBuilder.append(oldValue.getEndCompanyId());
+        stringBuilder.append("; 更新后还车公司ID: ");
+        stringBuilder.append(orderRentVehicleDetail.getEndCompanyId());
+        stringBuilder.append("; 操作人ID：");
+        stringBuilder.append(userDTO.getId());
+        stringBuilder.append("; 操作人账号：");
+        stringBuilder.append(userDTO.getUsername());
+        //添加修改记录实体
+        BookRecordUpdateLog bookRecordUpdateLog = new BookRecordUpdateLog();
+        bookRecordUpdateLog.setBookRecordId(oldValue.getBookRecordId());
+        bookRecordUpdateLog.setOldRetCompanyId(oldValue.getEndCompanyId());
+        bookRecordUpdateLog.setNewRetCompanyId(orderRentVehicleDetail.getEndCompanyId());
+        bookRecordUpdateLog.setOperaterId(userDTO.getId());
+        bookRecordUpdateLog.setOperaterName(userDTO.getName());
+        bookRecordUpdateLog.setOrderId(oldValue.getOrderId());
+        bookRecordUpdateLog.setCreateTime(new Date());
+        BeanUtil.copyProperties(orderRentVehicleDetail, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+        oldValue.setEndCompanyId(orderRentVehicleDetail.getEndCompanyId());
+        orderRentVehicleBiz.updateSelectiveByIdRe(oldValue);
+        ObjectRestResponse objectRestResponse = vehicleFeign.update(bookRecordUpdateLog);
+        if (objectRestResponse!= null && objectRestResponse.getRel()) {
+            log.info(stringBuilder.toString());
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createFailedResult(1355, "修改失败！");
+    }
+
+
+    /**
+     * 获取订单详情，包含驾驶人信息，违约金等信息
+     * @param no
+     * @return
+     */
     public ObjectRestResponse<OrderPageVO> getOrderDetail(String no) {
         OrderPageVO orderPageVo = mapper.getOrderDetail(no);
         if (orderPageVo == null) {
@@ -641,6 +701,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         return query;
     }
 
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
     /**
      * 订单查询类
      */

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyMembersOrderStatisticsBiz.java

@@ -2,17 +2,17 @@ package com.xxfc.platform.order.biz;
 
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
+import com.xxfc.platform.order.entity.MembersOrder;
 import com.xxfc.platform.order.entity.OrderAccount;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.mapper.DailyMembersOrderStatisticsMapper;
+import com.xxfc.platform.order.pojo.OrderQuery;
 import com.xxfc.platform.order.pojo.account.OrderAccountDTO;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,12 +21,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 每日购买会员订单统计
@@ -64,17 +64,45 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
                     orderStatistics.setBranchCompanyId(OMPANY_ID);
                     orderStatistics.setOneDay(accountList.get(0).getOneDay());
                 }
+                log.info("Members:统计完成");
+                if (JudgmentOfExistence(orderStatistics)) {
                 insertSelectiveRe(orderStatistics);
+                } else {
+                    mapper.updateByExampleSelective(orderStatistics, Example.builder(DailyMembersOrderStatistics.class)
+                            .where(WeekendSqls.<DailyMembersOrderStatistics>custom()
+                                    .andEqualTo(DailyMembersOrderStatistics::getOneDay, orderStatistics.getOneDay())
+                                    .andEqualTo(DailyMembersOrderStatistics::getBranchCompanyId, orderStatistics.getBranchCompanyId()))
+                            .build());
+
+                }
+                log.info("Members:保存成功");
             }
 
             return true;
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            e.printStackTrace();
+            log.error("Members:"+ e.getMessage());
+
             return false;
         }
     }
 
+    /**
+     * 添加前查询是否存在这条数据
+     * @param orderStatistic
+     * @return
+     */
+    private boolean JudgmentOfExistence(DailyMembersOrderStatistics orderStatistic) {
+        List<DailyMembersOrderStatistics> statistics = selectByExample(Example.builder(DailyMembersOrderStatistics.class)
+                .where(WeekendSqls.<DailyMembersOrderStatistics>custom()
+                        .andEqualTo(DailyMembersOrderStatistics::getOneDay, orderStatistic.getOneDay())
+                        .andEqualTo(DailyMembersOrderStatistics::getBranchCompanyId, orderStatistic.getBranchCompanyId()))
+                .build());
+        if (CollectionUtils.isNotEmpty(statistics)) {
+            return false;
+        }
+        return true;
+    }
     /**
      * 获取押金和
      *
@@ -120,4 +148,13 @@ public class DailyMembersOrderStatisticsBiz extends BaseBiz<DailyMembersOrderSta
     public OrderStatistics findAll(Integer companyId) {
         return mapper.monthOrderTotal(companyId);
     }
+
+    /**
+     * 根据时间按年月日分组
+     * @param query
+     * @return
+     */
+    public List<MembersOrder> getMemberOrderStatistics(OrderQuery query) {
+       return mapper.getMemberOrderStatistics(query);
+    }
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyOrderStatisticsBiz.java

@@ -25,16 +25,17 @@ public class DailyOrderStatisticsBiz extends BaseBiz<DailyOrderStatisticsMapper,
     @Autowired
     private DailyMembersOrderStatisticsBiz membersStatisticsBiz;
 
-    @Scheduled(cron = "0 0 2 * * ?")
+    @Scheduled(cron = "0 0 0/1 * * ?")
     public boolean statisticalOrder(){
         boolean vehicleFlag = vehicleStatisticsBiz.saveDailyVehicleOrderRecord();
         boolean travelFlag = travelStatisticsBiz.saveDailyTravelOrderRecord();
         boolean membersFlag= membersStatisticsBiz.saveDailyMembersOrderRecord();
         if (vehicleFlag&&travelFlag&&membersFlag){
+
             log.info("----statisticalOrder:成功-----");
             return true;
         }
-        log.info("----statisticalOrder:失败-----");
+        log.info("statisticalOrder:失败!(vehicleFlag="+vehicleFlag+"/travelFlag="+travelFlag+"membersFlag="+membersFlag+")");
         return false;
     }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyTravelOrderStatisticsBiz.java

@@ -7,12 +7,10 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.xxfc.platform.order.contant.enumerate.AccountTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.DeductionTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
-import com.xxfc.platform.order.entity.DailyTravelOrderStatistics;
-import com.xxfc.platform.order.entity.OrderAccount;
-import com.xxfc.platform.order.entity.OrderStatistics;
+import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.DailyTravelOrderStatisticsMapper;
 import com.xxfc.platform.order.pojo.account.OrderAccountDTO;
 import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
@@ -27,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -113,19 +112,47 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
         try {
             //获取每日订单统计
             List<DailyTravelOrderStatistics> orderStatistics = getDailyTravelOrderStatistics();
+            log.info("Travel:统计完成");
             if (CollectionUtils.isNotEmpty(orderStatistics)) {
                 for (DailyTravelOrderStatistics orderStatistic : orderStatistics) {
-                    //保存统计
+                    if (JudgmentOfExistence(orderStatistic)) {
+
                         insertSelectiveRe(orderStatistic);
+                    } else {
+                        mapper.updateByExampleSelective(orderStatistic, Example.builder(DailyTravelOrderStatistics.class)
+                                .where(WeekendSqls.<DailyTravelOrderStatistics>custom()
+                                        .andEqualTo(DailyTravelOrderStatistics::getOneDay, orderStatistic.getOneDay())
+                                        .andEqualTo(DailyTravelOrderStatistics::getBranchCompanyId, orderStatistic.getBranchCompanyId()))
+                                .build());
+
                     }
                 }
+            }
+            log.info("Travel:保存成功");
             return true;
         } catch (Exception e) {
-            log.error(e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            log.error("Travel:"+e.getMessage());
             return false;
         }
     }
 
+    /**
+     * 添加前查询是否存在这条数据
+     * @param orderStatistic
+     * @return
+     */
+    private boolean JudgmentOfExistence(DailyTravelOrderStatistics orderStatistic) {
+        List<DailyTravelOrderStatistics> statistics = selectByExample(Example.builder(DailyTravelOrderStatistics.class)
+                .where(WeekendSqls.<DailyTravelOrderStatistics>custom()
+                        .andEqualTo(DailyTravelOrderStatistics::getOneDay, orderStatistic.getOneDay())
+                        .andEqualTo(DailyTravelOrderStatistics::getBranchCompanyId, orderStatistic.getBranchCompanyId()))
+                .build());
+        if (CollectionUtils.isNotEmpty(statistics)) {
+            return false;
+        }
+        return true;
+    }
     private List<DailyTravelOrderStatistics> getDailyTravelOrderStatistics() {
         //获取当天所有订单账目
         List<OrderAccountDTO> accountList = accountBiz.getOrderAccountByOrderType(OrderTypeEnum.TOUR.getCode(), day);
@@ -154,7 +181,7 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
                     List<OrderAccountDTO> list = typeMap.get(orderAccountDTO.getAccountType());
                     if (list == null) {
                         list = new ArrayList<>();
-                        companyIdmap.put(orderAccountDTO.getAccountType(), list);
+                        typeMap.put(orderAccountDTO.getAccountType(), list);
                     }
                     list.add(orderAccountDTO);
                 }
@@ -194,7 +221,7 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
     private void refundAndDeductions(Map<Integer, List<OrderAccountDTO>> map, DailyTravelOrderStatistics orderStatistics) {
         ArrayList<OrderAccountDTO> arrayList = Lists.newArrayList();
         for (Integer key : map.keySet()) {
-            if (!key.equals(RefundTypeEnum.ORDER_FUND.getCode())) {
+            if (!key.equals(AccountTypeEnum.IN_ORDER_PAY.getCode())) {
                 arrayList.addAll(map.get(key));
             }
         }
@@ -207,10 +234,8 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
                     add(DeductionTypeEnum.VIOLATE_CANCEL.getCode());
                 }});
                 orderStatistics.setDefaultMoney(bigDecimal);
-
                 //订单退还总额
                 orderStatistics.setReturnGmv(orderStatistics.getGmv().subtract(bigDecimal));
-
             }
         }
     }
@@ -219,7 +244,7 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
     
     private DailyTravelOrderStatistics getGmvAndSecurityDeposit(Map<Integer, List<OrderAccountDTO>> map) {
         DailyTravelOrderStatistics orderStatistics = new DailyTravelOrderStatistics();
-        List<OrderAccountDTO> orderAccountDTOS = map.get(RefundTypeEnum.ORDER_FUND.getCode());
+        List<OrderAccountDTO> orderAccountDTOS = map.get(AccountTypeEnum.IN_ORDER_PAY.getCode());
 
         if (CollectionUtils.isNotEmpty(orderAccountDTOS)) {
             ArrayList<OrderAccountDetail> orderAccountDetails = getOrderAccountDetail(orderAccountDTOS);
@@ -273,9 +298,7 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
      */
     private List<OrderAccountDeduction> gettDeductions(ArrayList<OrderAccountDetail> orderAccountDetails) {
         ArrayList<OrderAccountDeduction> arrayList = Lists.newArrayList();
-        for (OrderAccountDetail orderAccountDetail : orderAccountDetails) {
-            arrayList.addAll(orderAccountDetail.getDeductions());
-        }
+        orderAccountDetails.parallelStream().map(OrderAccountDetail::getDeductions).forEach(e->arrayList.addAll(e));
         return arrayList;
     }
 
@@ -283,14 +306,14 @@ public class DailyTravelOrderStatisticsBiz extends BaseBiz<DailyTravelOrderStati
     /**
      * 根据type获取对应的金额总和
      *
-     * @param OrderAccountDeduction
+     * @param list
      * @param type                  金额类型
      * @return
      */
-    private BigDecimal get(List<OrderAccountDeduction> OrderAccountDeduction, List<Integer> type) {
-        return OrderAccountDeduction.parallelStream()
-                .filter(el -> el.getType().equals(type))
-                .map(com.xxfc.platform.order.pojo.account.OrderAccountDeduction::getAmount)
+    private BigDecimal get(List<OrderAccountDeduction> list, List<Integer> type) {
+        return list.parallelStream()
+                .filter(el ->type.contains(el.getType()))
+                .map(OrderAccountDeduction::getAmount)
                 .reduce(BigDecimal.ZERO,BigDecimal::add);
 
     }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/DailyVehicleOrderStatisticsBiz.java

@@ -4,9 +4,10 @@ import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.xxfc.platform.order.contant.enumerate.AccountTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.DeductionTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
+import com.xxfc.platform.order.entity.DailyOrderStatistics;
 import com.xxfc.platform.order.entity.DailyVehicleOrderStatistics;
 import com.xxfc.platform.order.entity.OrderAccount;
 import com.xxfc.platform.order.entity.OrderStatistics;
@@ -22,6 +23,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import tk.mybatis.mapper.common.example.UpdateByExampleSelectiveMapper;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -207,15 +212,15 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
     /**
      * 根据type获取对应的金额总和
      *
-     * @param OrderAccountDeduction
+     * @param list
      * @param types 金额类型
      * @return
      */
-    private BigDecimal get(List<OrderAccountDeduction> OrderAccountDeduction, List<Integer> types) {
-        return OrderAccountDeduction.parallelStream()
-                .filter(el -> types.contains(el))
-                .map(com.xxfc.platform.order.pojo.account.OrderAccountDeduction::getAmount)
-                .reduce(BigDecimal.ZERO,BigDecimal::add);
+    private BigDecimal get(List<OrderAccountDeduction> list, List<Integer> types) {
+        return list.parallelStream()
+                .filter(el -> types.contains(el.getType()))
+                .map(OrderAccountDeduction::getAmount)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
 
     }
 
@@ -237,30 +242,55 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
 
     /**
      * 统计订单并保存到数据库当中
+     *
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
     public boolean saveDailyVehicleOrderRecord() {
-
         try {
             //获取每日订单统计
             List<DailyVehicleOrderStatistics> orderStatistics = getDailyVehicleOrderRecord();
+            log.info("Vehicle:统计完成");
             if (CollectionUtils.isNotEmpty(orderStatistics)) {
                 for (DailyVehicleOrderStatistics orderStatistic : orderStatistics) {
                     //保存统计
+                    if (JudgmentOfExistence(orderStatistic)) {
+
                         insertSelectiveRe(orderStatistic);
+                    } else {
+                        mapper.updateByExampleSelective(orderStatistic, Example.builder(DailyVehicleOrderStatistics.class)
+                                .where(WeekendSqls.<DailyVehicleOrderStatistics>custom()
+                                        .andEqualTo(DailyVehicleOrderStatistics::getOneDay, orderStatistic.getOneDay())
+                                        .andEqualTo(DailyVehicleOrderStatistics::getBranchCompanyId, orderStatistic.getBranchCompanyId()))
+                                .build());
+
                     }
                 }
-
+            }
+            log.info("Vehicle:保存成功");
             return true;
         } catch (Exception e) {
-            log.error(e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            log.error("Vehicle:" + e.getMessage());
+            return false;
+        }
+    }
+
+    private boolean JudgmentOfExistence(DailyVehicleOrderStatistics orderStatistic) {
+        List<DailyVehicleOrderStatistics> statistics = selectByExample(Example.builder(DailyVehicleOrderStatistics.class)
+                .where(WeekendSqls.<DailyVehicleOrderStatistics>custom()
+                        .andEqualTo(DailyVehicleOrderStatistics::getOneDay, orderStatistic.getOneDay())
+                        .andEqualTo(DailyVehicleOrderStatistics::getBranchCompanyId, orderStatistic.getBranchCompanyId()))
+                .build());
+        if (CollectionUtils.isNotEmpty(statistics)) {
             return false;
         }
+        return true;
     }
 
     /**
      * 获取所有分公司每日统计记录
+     *
      * @return
      */
     private List<DailyVehicleOrderStatistics> getDailyVehicleOrderRecord() {
@@ -292,7 +322,7 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
                     List<OrderAccountDTO> list = typeMap.get(orderAccountDTO.getAccountType());
                     if (list == null) {
                         list = new ArrayList<>();
-                        companyIdmap.put(orderAccountDTO.getAccountType(), list);
+                        typeMap.put(orderAccountDTO.getAccountType(), list);
 
                     }
                     list.add(orderAccountDTO);
@@ -318,6 +348,7 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
 
     /**
      * 获取该分公司的统计数据
+     *
      * @param map
      * @return
      */
@@ -339,7 +370,7 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
     private void refundAndDeductions(Map<Integer, List<OrderAccountDTO>> map, DailyVehicleOrderStatistics orderStatistics) {
         ArrayList<OrderAccountDTO> arrayList = Lists.newArrayList();
         for (Integer key : map.keySet()) {
-            if (!key.equals(RefundTypeEnum.ORDER_FUND.getCode())) {
+            if (!key.equals(AccountTypeEnum.IN_ORDER_PAY.getCode())) {
                 arrayList.addAll(map.get(key));
             }
         }
@@ -354,22 +385,22 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
                 orderStatistics.setRefundSecurityDeposit(refundSecurityDeposit);
                 List<OrderAccountDeduction> OrderAccountDeductions = gettDeductions(orderAccountDetail);
                 //获取违章总额
-                orderStatistics.setViolationMoney(get(OrderAccountDeductions, new ArrayList<Integer>(){{
+                orderStatistics.setViolationMoney(get(OrderAccountDeductions, new ArrayList<Integer>() {{
                     add(DeductionTypeEnum.VIOLATE_TRAFFIC_DEDUCT.getCode());
                 }}));
                 //获取损坏赔偿总额
-                orderStatistics.setCompensation(get(OrderAccountDeductions,new ArrayList<Integer>(){{
+                orderStatistics.setCompensation(get(OrderAccountDeductions, new ArrayList<Integer>() {{
                     add(DeductionTypeEnum.DAMAGES.getCode());
-                }} ));
+                }}));
                 //获取违约总额
                 ArrayList<Integer> types = Lists.newArrayList();
                 types.add(DeductionTypeEnum.VIOLATE_ADVANCE.getCode());
                 types.add(DeductionTypeEnum.VIOLATE_CANCEL.getCode());
                 types.add(DeductionTypeEnum.VIOLATE_DELAY.getCode());
-                orderStatistics.setDefaultMoney(get(OrderAccountDeductions,types));
+                orderStatistics.setDefaultMoney(get(OrderAccountDeductions, types));
 
                 //消费金额
-                orderStatistics.setTotalExpenditure(get(OrderAccountDeductions,new ArrayList<Integer>(){{
+                orderStatistics.setTotalExpenditure(get(OrderAccountDeductions, new ArrayList<Integer>() {{
                     add(DeductionTypeEnum.CONSUME.getCode());
                 }}));
             }
@@ -384,7 +415,7 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
      */
     private DailyVehicleOrderStatistics getGmvAndSecurityDeposit(Map<Integer, List<OrderAccountDTO>> map) {
         DailyVehicleOrderStatistics orderStatistics = new DailyVehicleOrderStatistics();
-        List<OrderAccountDTO> orderAccountDTOS = map.get(RefundTypeEnum.ORDER_FUND.getCode());
+        List<OrderAccountDTO> orderAccountDTOS = map.get(AccountTypeEnum.IN_ORDER_PAY.getCode());
 
         if (CollectionUtils.isNotEmpty(orderAccountDTOS)) {
             ArrayList<OrderAccountDetail> orderAccountDetails = getOrderAccountDetail(orderAccountDTOS);
@@ -434,9 +465,7 @@ public class DailyVehicleOrderStatisticsBiz extends BaseBiz<DailyVehicleOrderSta
      */
     private List<OrderAccountDeduction> gettDeductions(ArrayList<OrderAccountDetail> orderAccountDetails) {
         ArrayList<OrderAccountDeduction> arrayList = Lists.newArrayList();
-        for (OrderAccountDetail orderAccountDetail : orderAccountDetails) {
-            arrayList.addAll(orderAccountDetail.getDeductions());
-        }
+        orderAccountDetails.parallelStream().map(OrderAccountDetail::getDeductions).forEach(e -> arrayList.addAll(e));
         return arrayList;
     }
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -384,6 +384,12 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章预备金："+ illegalReserve.toString();
             refundDesc += handleDedRefundDesc;
             refundDesc += ")";
+
+            //还车扣除款 剩余的 钱，再减去违章预备金
+            oad.getDeductions().add(
+                    initDeduction(illegalReserve, "违章保证金", DeductionTypeEnum.VIOLATE_TRAFFIC_KEEP, OrderAccountDeduction.ORIGIN_DEPOSIT)
+            );
+
             refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode(), AccountTypeEnum.OUT_PART_DEPOSIT, oad);
 
             //修改押金退还记录状态
@@ -417,11 +423,6 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             updateBaseOrder.setExtraAmount(inProgressVO.getExtraAmount());
             baseOrderBiz.updateSelectiveByIdReT(updateBaseOrder, Boolean.TRUE);
 
-            //还车扣除款 剩余的 钱，再减去违章预备金
-            oad.getDeductions().add(
-                    initDeduction(illegalReserve, "违章保证金", DeductionTypeEnum.VIOLATE_TRAFFIC_KEEP, OrderAccountDeduction.ORIGIN_DEPOSIT)
-            );
-
             //生成额外的费用明细
             csv.setConsumeAmount(inProgressVO.getConsumeAmount());
             csv.setModelAmount(orderItem.getUnitPrice());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -172,7 +172,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
-            boolean flag = getTodayTime(orderRentVehicleDetail.getEndTime());
+            boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime());
             if (!flag) {
                 return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期");
             }
@@ -433,9 +433,16 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     public boolean getTodayTime(Long time) {
         long current = System.currentTimeMillis();
-        if (current <= (time / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset()) + 24 * 60 * 60 * 1000 - 1) {
+        if (current <= (getDayStart(time) + 24 * 60 * 60 * 1000 - 1) && current >= getDayStart(time)) {
             return true;
         }
         return false;
     }
+
+    public static Long getDayStart(Long time) {
+        long current = time;
+        long zero = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
+        return zero;
+    }
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java

 package com.xxfc.platform.order.biz.inner;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -10,11 +12,10 @@ import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.app.feign.ConfigFeign;
 import com.xxfc.platform.order.biz.OrderAccountBiz;
 import com.xxfc.platform.order.biz.OrderRefundBiz;
-import com.xxfc.platform.order.contant.enumerate.AccountTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.entity.Dictionary;
@@ -425,9 +426,24 @@ public class OrderMsgBiz {
                     setOrderId(baseOrder.getId());
                     setAccountType(AccountTypeEnum.OUT_PART_DEPOSIT.getCode());
                 }});
-                originalAmount = orvd.getDeposit();
-                violateAmount = orderAccount.getDeductAmount();
+
+                OrderAccountDetail oad = JSONUtil.toBean(orderAccount.getAccountDetail(), OrderAccountDetail.class);
+                        //BeanUtil.toBean(orderAccount.getAccountDetail(), OrderAccountDetail.class);
+                OrderAccountDeduction trafficDeduction = new OrderAccountDeduction() {{
+                    setAmount(BigDecimal.ZERO);
+                }};
+                //违章保证金
+                for(OrderAccountDeduction deductionTemp : oad.getDeductions()) {
+                    if(deductionTemp.getType().equals(DeductionTypeEnum.VIOLATE_TRAFFIC_KEEP.getCode())) {
+                        trafficDeduction = deductionTemp;
+                    }
+                }
+                //（原押金 - 违章保证金 ）+ 订单退款金额
+                originalAmount = oad.getOriginDepositAmount().subtract(trafficDeduction.getAmount()).add(oad.getOrderAmount());
+                //退款金额
                 refundAmount = orderAccount.getAccountAmount();
+                // 扣款 = originalAmount - refundAmount
+                violateAmount = originalAmount.subtract(refundAmount);
                 residueAmount = orvd.getReturnPayResidue();
             }else if(RefundStatusEnum.REFUND_DEPOSIT.getCode().equals(baseOrder.getRefundStatus())){
                 smstype = SmsTemplateDTO.REFUND_B;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/DailyMembersOrderStatisticsMapper.java

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.DailyMembersOrderStatistics;
+import com.xxfc.platform.order.entity.MembersOrder;
 import com.xxfc.platform.order.entity.OrderStatistics;
+import com.xxfc.platform.order.pojo.OrderQuery;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -18,4 +20,7 @@ public interface DailyMembersOrderStatisticsMapper extends Mapper<DailyMembersOr
 
     OrderStatistics monthOrderTotal(@Param("companyId") Integer companyId);
 
+
+
+    List<MembersOrder> getMemberOrderStatistics(OrderQuery query);
 }

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

@@ -359,6 +359,13 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return ObjectRestResponse.succ();
     }
 
+    @PostMapping("/updateEndCompany")
+    @ResponseBody
+    public ObjectRestResponse updateEndCompany(@RequestBody OrderRentVehicleDetail orderRentVehicleDetail) {
+        return baseOrderBiz.save(orderRentVehicleDetail);
+    }
+
+
     @Data
     public static class ChangeVehicleDTO {
         String no;

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

 package com.xxfc.platform.order.rest.background;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.google.common.collect.Lists;
 import com.xxfc.platform.order.biz.DailyMembersOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.DailyTravelOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.DailyVehicleOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.OrderStatisticsBiz;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.pojo.HomePageOrderData;
+import com.xxfc.platform.order.pojo.MembersOrderDto;
+import com.xxfc.platform.order.pojo.OrderQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.lang.reflect.Array;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author Administrator
@@ -33,6 +52,9 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
 
     @Autowired
     private UserAuthConfig userAuthConfig;
+
+    @Autowired
+    private HttpServletResponse response;
     /**
      * 租车订单
      */
@@ -56,7 +78,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
     /**
      * 数据权限
      */
-    private final  Integer DATA_AUTHORITY=1;
+    private final Integer DATA_AUTHORITY = 1;
 
     @Autowired
     private DailyVehicleOrderStatisticsBiz vehicleBiz;
@@ -68,6 +90,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
     @Autowired
     private DailyMembersOrderStatisticsBiz membersBiz;
 
+
     @ApiOperation("获取订单统计数据")
     @GetMapping("/findAll/{type}")
     public ObjectRestResponse findAll(@PathVariable Integer type) {
@@ -83,36 +106,44 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
             UserDTO user = userDTOObjectRestResponse.getData();
 
             Integer companyId = user.getCompanyId();
-            if (DATA_AUTHORITY.equals(user.getDataAll())){
-                companyId=null;
+            if (DATA_AUTHORITY.equals(user.getDataAll())) {
+                companyId = null;
             }
 
+            //只统计租车订单
             if (TYPE_VEHICLE.equals(type)) {
                 OrderStatistics vehicle = vehicleBiz.findAll(companyId);
-                return ObjectRestResponse.succ(new HomePageOrderData(){{
+                return ObjectRestResponse.succ(new HomePageOrderData() {{
                     setTotalOrders(vehicle.getTotalGmv().subtract(vehicle.getTotalReturnGmv()));
                     setAdditionalIndemnity(vehicle.getTotalCompensation()
                             .add(vehicle.getTotalForfeit())
                             .add(vehicle.getTotalDefaultMoney())
                             .add(vehicle.getTotalExpenditure().subtract(vehicle.getTotalGmv().subtract(vehicle.getTotalReturnGmv())))
                     );
+                    setTotalOutstandingDeposit(vehicle.getTotalSecurityDeposit()
+                            .subtract(vehicle.getTotalRefundSecurityDeposit())
+                            .subtract(getAdditionalIndemnity()));
                 }});
             }
+            //只统计会租车订单
             if (TYPE_TOUR.equals(type)) {
                 OrderStatistics tour = TravelBiz.findAll(companyId);
-                return ObjectRestResponse.succ(new HomePageOrderData(){{
+                return ObjectRestResponse.succ(new HomePageOrderData() {{
                     setTotalOrders(tour.getTotalGmv().subtract(tour.getTotalReturnGmv()));
                     setAdditionalIndemnity(tour.getTotalDefaultMoney());
                 }});
+
             }
+            //只统计会员定案
             if (TYPE_MEMBER.equals(type)) {
                 OrderStatistics member = membersBiz.findAll(companyId);
-                return ObjectRestResponse.succ(new HomePageOrderData(){{
+                return ObjectRestResponse.succ(new HomePageOrderData() {{
                     setTotalOrders(member.getTotalGmv());
 
                 }});
             }
 
+            //所有订单
             if (TYPE_TOTAL.equals(type)) {
                 return ObjectRestResponse.succ(baseBiz.getTotalOrder(companyId));
             }
@@ -125,5 +156,43 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
 
     }
 
+    @PostMapping("/order")
+    @ApiOperation(value = "会员统计")
+    public ObjectRestResponse<List<MembersOrderDto>> getMemberOrderStatisticsData(@RequestBody OrderQuery query) throws ParseException {
+
+        //获取会员等级信息
+        List<BaseUserMemberLevel> memberLevels = userFeign.levels();
+        //获取会员订单统计信息
+        return ObjectRestResponse.succ(baseBiz.getMemberOrderStatistics(memberLevels, query));
+    }
+
 
+    @PostMapping("/excel")
+    @ApiOperation(value = "下载excel表")
+    public void downloadExcel(@RequestBody OrderQuery query) throws Exception {
+
+        // 通过工具类创建writer，默认创建xls格式
+        ExcelWriter writer = ExcelUtil.getWriter(true);
+        List<BaseUserMemberLevel> memberLevels = userFeign.levels();
+        List<MembersOrderDto> list = baseBiz.getMemberOrderStatistics(memberLevels, query);
+        List<HashMap<Object, Object>> rows = baseBiz.getRows(list, memberLevels);
+
+        // 一次性写出内容，使用默认样式，强制输出标题
+        writer.write(rows, true);
+        //out为OutputStream，需要写出到的目标流
+
+        //response为HttpServletResponse对象
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
+        response.setHeader("Content-Disposition", "attachment;filename=hwddtj.xls");
+        ServletOutputStream out = response.getOutputStream();
+
+        writer.flush(out, true);
+        // 关闭writer，释放内存
+        writer.close();
+        //此处记得关闭输出Servlet流
+        IoUtil.close(out);
+
+
+    }
 }

xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml

@@ -38,4 +38,55 @@
     <!--        DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),interval 1 day),'%Y-%c')-->
 
     <!--    </select>-->
+
+    <select id="getMemberOrderStatistics" parameterType="com.xxfc.platform.order.pojo.OrderQuery"
+            resultMap="order">
+        SELECT
+        <if test="type==2">
+            DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%x-%v') AS period,
+        </if>
+        <if test="type==3">
+            DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%m') AS period,
+        </if>
+        <if test="type==1">
+            date( FROM_UNIXTIME( a.account_time / 1000 ) ) AS period,
+        </if>
+        count( a.id ) AS number,
+        SUM( a.account_amount ) AS amount,
+        d.member_level AS level
+        FROM
+        order_account a
+        LEFT JOIN base_order b ON a.order_id = b.id
+        LEFT JOIN order_member_detail d ON d.order_id = b.id
+        WHERE
+        a.account_status = 1
+        AND a.account_type = 101
+        AND b.type = 3
+        <if test="startTime != null">
+            AND a.crt_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND a.crt_time &lt;= #{endTime}
+        </if>
+        GROUP BY
+        <if test="type==2">
+            DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%x-%v'),
+        </if>
+        <if test="type==3">
+            DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%m'),
+        </if>
+
+        <if test="type==1">
+            date( FROM_UNIXTIME( a.account_time / 1000 ) ),
+        </if>
+        d.member_level
+    </select>
+    <resultMap id="order" type="com.xxfc.platform.order.entity.MembersOrder">
+        <result column="period" property="period"></result>
+        <collection property="members" ofType="com.xxfc.platform.order.pojo.Member">
+            <result column="number" property="number"></result>
+            <result column="amount" property="amount"></result>
+            <result column="level" property="level"></result>
+        </collection>
+    </resultMap>
 </mapper>
\ No newline at end of file

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

+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.order.OrderApplication;
 import com.xxfc.platform.order.biz.DailyOrderStatisticsBiz;
+import com.xxfc.platform.order.biz.OrderStatisticsBiz;
+import com.xxfc.platform.order.pojo.HomePageOrderData;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +26,9 @@ public class ServiceTest {
     @Autowired
     private DailyOrderStatisticsBiz dailyOrderStatisticsBiz;
 
+    @Autowired
+    private OrderStatisticsBiz statisticsBiz;
+
 
     @Test
     public void testSchedu(){
@@ -26,4 +36,10 @@ public class ServiceTest {
          dailyOrderStatisticsBiz.statisticalOrder();
     }
 
+    @Test
+    public void test(){
+        HomePageOrderData totalOrder = statisticsBiz.getTotalOrder(null);
+        System.out.println(totalOrder);
+
+    }
 }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -184,7 +184,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         criteria.andEqualTo("isShow", 1);
         //位置
         criteria.andIn("location", Arrays.asList(location, 0));
-        criteria.andGreaterThan("endTime", Instant.now().toEpochMilli());
+    //    criteria.andGreaterThan("endTime", Instant.now().toEpochMilli());
 
         List<SummitActivity> summitActivities = mapper.selectByExample(example);
 

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/SummitActivityController.java

@@ -55,7 +55,7 @@ public class SummitActivityController {
     @GetMapping("/list")
     public ObjectRestResponse<PageDataVO<SummitActivityVo>> findSummitActivityWithPage(@RequestParam(value = "page", defaultValue = "1", required = false) Integer page,
                                                                                       @RequestParam(value = "limit", defaultValue = "6", required = false) Integer limit,
-                                                                                      @RequestParam(value = "location", defaultValue = "0", required = false) Integer location,
+                                                                                      @RequestParam(value = "location", defaultValue = "1", required = false) Integer location,
                                                                                        @RequestParam(value = "title",required = false) String title) {
         PageDataVO<SummitActivityVo> pageDataVO = summitActivityBiz.findSummitActivityWithPage(page, limit,location,title);
         return ObjectRestResponse.succ(pageDataVO);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BookRecordUpdateLog.java

+package com.xxfc.platform.vehicle.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+import javax.persistence.*;
+
+@Data
+@Table(name = "book_record_update_log")
+public class BookRecordUpdateLog {
+    @Id
+    private Integer id;
+
+    /**
+     * 订单ID
+     */
+    @Column(name = "order_id")
+    private Integer orderId;
+
+    /**
+     * 预定记录ID
+     */
+    @Column(name = "book_record_id")
+    private Long bookRecordId;
+
+    /**
+     * 原还车公司ID
+     */
+    @Column(name = "old_ret_company_id")
+    private Integer oldRetCompanyId;
+
+    /**
+     * 新还车公司ID
+     */
+    @Column(name = "new_ret_company_id")
+    private Integer newRetCompanyId;
+
+    /**
+     * 操作人ID
+     */
+    @Column(name = "operater_id")
+    private Integer operaterId;
+
+    /**
+     * 操作人姓名
+     */
+    @Column(name = "operater_name")
+    private String operaterName;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleCountRecord.java

@@ -72,6 +72,16 @@ public class VehicleCountRecord {
     )
     private Date countDate;
 
+    /**
+     * 无效数据数量（超过还车时间后还未出车的数据）
+     */
+    @Column(name = "no_use_num")
+    private Integer noUseNum;
+
+    @Column(name = "cancel_num")
+    private Integer cancelNum;
+
+
     @Transient
     private String startTime;
 

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

@@ -10,6 +10,7 @@ import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
 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.*;
 
@@ -163,4 +164,8 @@ public interface VehicleFeign {
 
     @GetMapping("/vehicleInfo/findVehicleIds")
     List<String> findbyPlateNumberAndVehicleCod(@RequestParam(value = "plateNumber") String plateNumber,@RequestParam(value = "vehicleCode") String vehicleCode);
+
+    @RequestMapping(value = "/vehicleInfo/bookRecord/update", method = RequestMethod.POST)
+    public ObjectRestResponse update(@RequestBody BookRecordUpdateLog bookRecordUpdateLog);
+
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/DepartureLogVo.java

+package com.xxfc.platform.vehicle.pojo;
+
+import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
+import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
+import lombok.Data;
+
+@Data
+public class DepartureLogVo extends VehicleDepartureLog {
+    VehicleBookRecord vehicleBookRecord;
+}

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

+package com.xxfc.platform.vehicle.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
+import com.xxfc.platform.vehicle.mapper.BookRecordUpdateLogMapper;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BookRecordUpdateLogBiz extends BaseBiz<BookRecordUpdateLogMapper, BookRecordUpdateLog> {
+
+    public ObjectRestResponse save(BookRecordUpdateLog bookRecordUpdateLog) {
+        BookRecordUpdateLog oldValue = mapper.selectOne(bookRecordUpdateLog);
+        if (oldValue != null) {
+            return ObjectRestResponse.succ();
+        }
+        insertSelectiveRe(bookRecordUpdateLog);
+        return ObjectRestResponse.succ();
+    }
+
+}

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

@@ -78,6 +78,9 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     @Autowired
     VehicleDepartureService vehicleDepartureService;
 
+    @Autowired
+    BookRecordUpdateLogBiz bookRecordUpdateLogBiz;
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -324,6 +327,21 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         return vehicleBookRecordVos;
     }
 
+    public ObjectRestResponse update(BookRecordUpdateLog bookRecordUpdateLog) {
+        VehicleBookRecord vehicleBookRecord = selectById(bookRecordUpdateLog.getBookRecordId());
+        if(vehicleBookRecord != null) {
+            vehicleBookRecord.setRetCompany(bookRecordUpdateLog.getNewRetCompanyId());
+            int a = updateSelectiveByIdRe(vehicleBookRecord);
+            log.info(vehicleBookRecord.toString());
+            if(a <= 0) {
+                return ObjectRestResponse.createDefaultFail();
+            }
+            return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
+        } else {
+            return  ObjectRestResponse.createFailedResult(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());
+        }
+    }
+
     public ObjectRestResponse<List<VehicleBookRecordVo>> selectByIds(List<Long> ids) {
         Map<String, Object> map = new HashMap<>();
         map.put("ids", ids);
@@ -644,6 +662,10 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
 
     }
 
+    public List<VehicleBookRecordVo> selectAllCancelBookRecord(Map<String, Object> param) {
+        return mapper.selectAllCancelBookRecord(param);
+    }
+
 
     public PageDataVO<VehicleRecordInfoVo> getListByParam(VehiclePlanDto vehiclePlanDto) {
         Query query = new Query(vehiclePlanDto);

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

@@ -12,6 +12,7 @@ import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
 import com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleMapper;
+import com.xxfc.platform.vehicle.pojo.DepartureLogVo;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureStatisticDataVo;
 import lombok.extern.slf4j.Slf4j;
@@ -24,6 +25,7 @@ import tk.mybatis.mapper.weekend.WeekendSqls;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Service
 @Slf4j
@@ -103,6 +105,9 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
 
     }
 
+    public Integer selectAllDepartureLog(Map<String, Object> param) {
+        return mapper.selectAllDepartureLog(param);
+    }
 
     public ObjectRestResponse findOne(Integer vid) throws Exception {
         Example exm = Example.builder(VehicleDepartureLog.class)

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

@@ -55,7 +55,6 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
         try {
             PageDataVO<VehicleModelVo> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),
                     vmqc.getLimit(), () -> mapper.findVehicleModelPage(vmqc));
-
             return ObjectRestResponse.succ(mPageDataVO);
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -10,9 +10,13 @@ import com.xxfc.platform.vehicle.mapper.VehicleUserReserveMapper;
 import com.xxfc.platform.vehicle.pojo.dto.VehicleUserReserveDTO;
 import com.xxfc.platform.vehicle.pojo.vo.VehicleUserReserveVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.List;
 
 
 @Service
@@ -30,7 +34,24 @@ public class VehicleUserReserveBiz extends BaseBiz<VehicleUserReserveMapper, Veh
         if (reserveDTO.getLimit()!=null&&reserveDTO.getLimit()>0){
             limit=reserveDTO.getLimit();
         }
-        return  ObjectRestResponse.succ(PageDataVO.pageInfo(page, limit, ()->mapper.getList(reserveDTO,userId)));
+
+        PageDataVO<VehicleUserReserveVo> dataVO = PageDataVO.pageInfo(page, limit, () -> mapper.getList(reserveDTO, userId));
+        if (CollectionUtils.isEmpty(dataVO.getData())){
+             dataVO.setData(Collections.EMPTY_LIST);
+             dataVO.setPageNum(reserveDTO.getPage());
+             dataVO.setPageSize(reserveDTO.getLimit());
+            return ObjectRestResponse.succ(dataVO);
+        }
+        List<VehicleUserReserveVo> data = dataVO.getData();
+        for (VehicleUserReserveVo userReserveVo : data) {
+            String vehiclePic = userReserveVo.getVehiclePic();
+            if (StringUtils.isNotEmpty(vehiclePic)){
+                String[] imgs = vehiclePic.split(",");
+                userReserveVo.setVehiclePic(imgs[0]);
+            }
+        }
+        dataVO.setData(data);
+        return  ObjectRestResponse.succ(dataVO);
     }
 
     //新增预定

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/BookRecordUpdateLogMapper.java

+package com.xxfc.platform.vehicle.mapper;
+
+import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface BookRecordUpdateLogMapper extends Mapper<BookRecordUpdateLog> {
+}
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java

@@ -43,4 +43,6 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
     public List<VehicleBookRecordVo> selectAllBookRecord(Map<String, Object> param);
 
     public List<VehicleBookRecordVo> selectByIds(Map<String, Object> param);
+
+    public List<VehicleBookRecordVo> selectAllCancelBookRecord(Map<String, Object> param);
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleCountRecordMapper.java

@@ -10,4 +10,5 @@ public interface VehicleCountRecordMapper extends Mapper<VehicleCountRecord> {
     List<VehicleCountRecord> countDepartureVehicle(VehicleCountRecord vehicleCountRecord);
 
     List<VehicleCountRecord> selectByTypeAndTime(Map<String, Object> param);
+    List<VehicleCountRecord> selectByTime(Map<String, Object> param);
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleDepartureLogMapper.java

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
+import com.xxfc.platform.vehicle.pojo.DepartureLogVo;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLog>, Mapper<VehicleDepartureLog> {
 
@@ -32,4 +34,5 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
     String selectDayByVehicleId(String vehicleId);
 
     VehicleDepartureLogVo selectByBookRecordId(Long bookRecordId);
+    Integer selectAllDepartureLog(Map<String, Object> param);
 }

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

+package com.xxfc.platform.vehicle.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.vehicle.biz.BookRecordUpdateLogBiz;
+import com.xxfc.platform.vehicle.entity.BookRecordUpdateLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/bookRecord")
+public class BookRecordUpdateLogController {
+
+    @Autowired
+    BookRecordUpdateLogBiz bookRecordUpdateLogBiz;
+
+    @PostMapping(value = "/update")
+    public ObjectRestResponse save(@RequestBody BookRecordUpdateLog bookRecordUpdateLog) {
+        return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
+    }
+}

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

@@ -20,9 +20,7 @@ import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.Vehicle;
-import com.xxfc.platform.vehicle.entity.VehicleBookInfo;
+import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.jobhandler.VehicleJobHandler;
 import com.xxfc.platform.vehicle.pojo.*;
 import com.xxfc.platform.vehicle.pojo.dto.VehiclePlanDto;
@@ -38,6 +36,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -76,6 +75,10 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @Autowired
     BranchCompanyBiz branchCompanyBiz;
 
+    @Autowired
+    BookRecordUpdateLogBiz bookRecordUpdateLogBiz;
+
+
     public UserFeign getUserFeign() {
         return userFeign;
     }
@@ -304,6 +307,35 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
 
     }
 
+    @RequestMapping(value = "/bookRecord/update", method = RequestMethod.POST)
+    @ApiOperation(value = "修改预定记录还车地点")
+    public ObjectRestResponse update(@RequestBody BookRecordUpdateLog bookRecordUpdateLog){
+        return vehicleBookRecordBiz.update(bookRecordUpdateLog);
+    }
+
+    @RequestMapping(value = "/bookRecord/updateById", method = RequestMethod.POST)
+    @ApiOperation(value = "修改预定记录还车地点")
+    public ObjectRestResponse updateById(@RequestBody VehicleBookRecord vehicleBookRecord){
+        VehicleBookRecord oldValue = vehicleBookRecordBiz.selectById(vehicleBookRecord.getId());
+        UserDTO userDTO = getAdminUserInfo();
+        if (userDTO == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+        }
+        if(oldValue != null) {
+            oldValue.setRetCompany(vehicleBookRecord.getRetCompany());
+            BookRecordUpdateLog bookRecordUpdateLog = new BookRecordUpdateLog();
+            bookRecordUpdateLog.setBookRecordId(vehicleBookRecord.getId());
+            bookRecordUpdateLog.setOldRetCompanyId(vehicleBookRecord.getRetCompany());
+            bookRecordUpdateLog.setNewRetCompanyId(vehicleBookRecord.getRetCompany());
+            bookRecordUpdateLog.setOperaterId(userDTO.getId());
+            bookRecordUpdateLog.setOperaterName(userDTO.getName());
+            bookRecordUpdateLog.setCreateTime(new Date());
+            vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
+            return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
+        } else {
+            return  ObjectRestResponse.createFailedResult(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());
+        }
+    }
 
     @RequestMapping(value = "/bookedRecord", method = RequestMethod.GET)
     @ApiOperation(value = "获取多个预定记录")

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

@@ -30,7 +30,7 @@ public class VehicleCountRecordController {
     @GetMapping("/app/unauth/get")
     @ResponseBody
     public ObjectRestResponse getByTypeAndDate(VehicleCountRecord vehicleCountRecord) {
-        return vehicleCountRecordBiz.countDepartureVehicle(vehicleCountRecord);
+        return vehicleCountRecordBiz.selectByTime(vehicleCountRecord);
     }
 
     @PostMapping("/app/unauth/export")
@@ -43,4 +43,10 @@ public class VehicleCountRecordController {
     public void download(ExcelParamDto excelParamDto, HttpServletRequest request,HttpServletResponse response) {
         DownloadUtil.downloadFile(excelParamDto.getPath(), "export.xls", response,request);
     }
+
+    @GetMapping("/app/unauth/selectByTime")
+    public ObjectRestResponse selectByTime(VehicleCountRecord vehicleCountRecord) {
+        return vehicleCountRecordBiz.selectByTime(vehicleCountRecord);
+    }
+
 }

xx-vehicle/xx-vehicle-server/src/main/resources/builder/generatorConfig.xml

@@ -37,7 +37,7 @@
 <!--        </table>-->
 <!--        <table tableName="branch_company_stock_info" domainObjectName="BranchCompanyStockInfo"></table>-->
 <!--        <table tableName="branch_company_stock_apply_info" domainObjectName="BranchCompanyStockApplyInfo"></table>-->
-        <table tableName="vehicle_count_record" domainObjectName="VehicleCountRecord"></table>
+        <table tableName="book_record_update_log" domainObjectName="BookRecordUpdateLog"></table>
 <!--        <table tableName="vehicle_upkeep_log" domainObjectName="VehicleUpkeepLog"></table>-->
     </context>
 </generatorConfiguration>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.xxfc.platform.vehicle.mapper.BookRecordUpdateLogMapper" >
+
+</mapper>
\ No newline at end of file

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

@@ -526,6 +526,17 @@
             and v1.book_end_date between #{startTime} and #{endTime}
         </if>
     </select>
+
+    <!--获取所有已取消的预定记录-->
+    <select id="selectAllCancelBookRecord" resultMap="searchBookRecord" parameterType="Map">
+        select v1.* from vehicle_book_record v1
+        where v1.status in (4,6)
+        <if test="startTime != null">
+            and v1.book_start_date &lt; #{startTime} and v1.book_end_date &gt; #{endTime}
+        </if>
+        and book_user != -2
+    </select>
+
     <select id="selectByIds" resultMap="searchBookRecord" parameterType="Map">
         select v1.* from vehicle_book_record v1
         where v1.status not in (4,6,7,3)

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

@@ -35,4 +35,12 @@
     order by id DESC
   </select>
 
+  <select id="selectByTime" parameterType = "Map" resultType="com.xxfc.platform.vehicle.entity.VehicleCountRecord">
+    select * from vehicle_count_record
+    where count_date &gt;= #{startTime} and count_date &lt;= #{endTime}
+    <if test="type != null">
+      and type = #{type}
+    </if>
+    order by id DESC
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -2,7 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper" >
 
-
+    <resultMap id="searchBookRecord" type="com.xxfc.platform.vehicle.pojo.DepartureLogVo">
+        <result column="book_record_id" property="bookRecordId" jdbcType="INTEGER" javaType="java.lang.Integer"/>
+        <association property="vehicleBookRecord" column="id"
+                     select="com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper.selectOne"/>
+    </resultMap>
     <select id="selectLastByVehicleId" resultType="com.xxfc.platform.vehicle.entity.VehicleDepartureLog">
         select * from vehicle_departure_log
         where vehicle_id = #{vehicleId}
@@ -30,7 +34,55 @@
         where vehicle_departure_log.book_record_id = #{id}
         order by create_time desc
     </select>
+    <select id="selectAllDepartureLog" resultType="java.lang.Integer" parameterType="Map">
+        SELECT
+            count(*)
+        FROM
+        vehicle_departure_log v1
+        LEFT JOIN vehicle_book_record v2 on v1.book_record_id = v2.id
+        <where>
+            <if test="startTime != null and status == 1">
+                and (v1.departure_time between #{startTime} and #{endTime})
+            </if>
+            <if test="startTime != null and status == 2">
+                and (v1.arrival_time between #{startTime} and #{endTime})
+            </if>
+            <!--正常出车-->
+            <if test="startTime != null and status == 1 and type == 1">
+                and (v2.book_start_date between #{startTime} and #{endTime})
+            </if>
+            <!--提前出车-->
+            <if test="endTime != null and status == 1 and type == 2">
+                and v2.book_start_date &gt;= #{endTime}
+            </if>
+            <!--延期出车-->
+            <if test="startTime != null and status == 1 and type == 3">
+                and v2.book_start_date &lt;= #{startTime}
+            </if>
 
+            <!--正常还车-->
+            <if test="startTime != null and status == 2 and type == 1">
+                and (v2.book_start_date between #{startTime} and #{endTime})
+            </if>
+            <!--提前还车-->
+            <if test="endTime != null and status == 2 and type == 2">
+                and v2.book_start_date &gt;= #{endTime}
+            </if>
+            <!--延期还车-->
+            <if test="startTime != null and status == 2 and type == 3">
+                and v2.book_start_date &lt;= #{startTime}
+            </if>
+
+            <!--统计客户用车-->
+            <if test="bookUser != null">
+                and v2.book_user = #{bookUser}
+            </if>
+            <if test="bookUser == null">
+                and v2.book_user != -2
+            </if>
+        </where>
+
+    </select>
     <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
         select vehicle_departure_log.*,vehicle.number_plate,
         /* IFNULL(DATEDIFF(vehicle_departure_log.arrival_time,vehicle_departure_log.departure_time),0)*/

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

@@ -17,16 +17,16 @@
         r.addr_city AS addrCity,
         r.city_name AS cityName,
         r.company_id AS companyId,
-        CONCAT(bct.province_name,bct.city_name,bct.town_name,bct.addr_detail) AS `companyAddress`,
+        CONCAT(IFNULL(bct.province_name," "),IFNULL(bct.city_name," "),IFNULL(bct.town_name," "),IFNULL(bct.addr_detail," ")) AS `companyAddress`,
         r.arrival_companyId AS arrivalCompanyId,
-        CONCAT(bcr.province_name,bcr.city_name,bcr.town_name,bcr.addr_detail) AS `arrivalcompanyAddress`,
+        CONCAT(IFNULL(bcr.province_name," "),IFNULL(bcr.city_name," "),IFNULL(bcr.town_name," "),IFNULL(bcr.addr_detail," ")) AS `arrivalcompanyAddress`,
         bct.NAME AS `companyName`,
         bcr.NAME AS `arrivalCompanyName`,
         r.crt_time AS crtTime,
         r.upd_time AS updTime,
         r.`status`,
         m.`name` AS modelName,
-        m.`cover_pic` AS `vehiclePic`
+        m.`picture` AS `vehiclePic`
         FROM
         vehicle_user_reserve r
         LEFT JOIN vehicle_model m ON r.mode_id = m.id