Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

ace-auth/ace-auth-client/src/main/java/com/github/wxiaoqi/security/auth/client/jwt/ServiceAuthUtil.java

@@ -12,7 +12,6 @@ import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.SignatureException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -50,7 +49,6 @@ public class ServiceAuthUtil{
 
     @Scheduled(cron = "0/30 * * * * ?")
     public void refreshAllowedClient() {
-        log.debug("refresh allowedClient.....");
         BaseResponse resp = serviceAuthFeign.getAllowedClient(serviceAuthConfig.getClientId(), serviceAuthConfig.getClientSecret());
         if (resp.getStatus() == 200) {
             ObjectRestResponse<List<String>> allowedClient = (ObjectRestResponse<List<String>>) resp;

ace-common/src/main/java/com/ace/cache/parser/impl/DefaultKeyGenerator.java

@@ -9,11 +9,12 @@ import com.ace.cache.constants.CacheScope;
 import com.ace.cache.parser.IKeyGenerator;
 import com.ace.cache.parser.IUserKeyGenerator;
 import com.ace.cache.utils.ReflectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
 @Service
 public class DefaultKeyGenerator extends IKeyGenerator {

ace-common/src/main/java/com/github/wxiaoqi/security/common/config/global/GlobalBasicConfiguration.java

@@ -25,7 +25,7 @@ public class GlobalBasicConfiguration implements ApplicationRunner{
 		showApplicationProperties("Redis连接端口: ", "spring.redis.port");
 		showApplicationProperties("rabbitmq连接主机", "spring.rabbitmq.host");
 		showApplicationProperties("rabbitmq连接虚拟机", "spring.rabbitmq.virtual-host");
-}
+	}
 
 	public static void showApplicationProperties(String key, String value) {
 		if(env != null) {

ace-modules/ace-interface/src/main/java/com/github/wxiaoqi/security/api/vo/config/HeaderConfig.java

@@ -20,17 +20,17 @@ public class HeaderConfig implements RequestInterceptor {
     @Override
     public void apply(RequestTemplate template) {
         RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-        if (requestAttributes instanceof ServletRequestAttributes){
+        if (requestAttributes instanceof ServletRequestAttributes) {
             ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
             HttpServletRequest request = servletRequestAttributes.getRequest();
             //请求头设置
             Enumeration<String> headerNames = request.getHeaderNames();
-            if (headerNames!=null){
-                while (headerNames.hasMoreElements()){
+            if (headerNames != null) {
+                while (headerNames.hasMoreElements()) {
                     String headerName = headerNames.nextElement();
                     String headerValue = request.getHeader(headerName);
-                    if("Authorization".equals(headerName)) {
-                        template.header(headerName,headerValue);
+                    if ("Authorization".equals(headerName) || "authorization".equals(headerName)) {
+                        template.header("Authorization", headerValue);
                     }
                 }
             }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/IntegralUserRecordBiz.java

@@ -64,15 +64,15 @@ public class IntegralUserRecordBiz extends BaseBiz<IntegralUserRecordMapper, Int
         IntegralRule oldValue = ruleObjectRestResponse.getData();
         if (integralUserRecord.getPoint() == null) {
             Integer point = 0;
-            if(oldValue.getPoint() == 0) {//没有基础分需要计算分数
+            if (oldValue.getPoint() == 0) {//没有基础分需要计算分数
                 //Integer amount = Integer.parseInt(new BigDecimal(integralUserRecord.getAmount()).divide(new BigDecimal("100"), 0, BigDecimal.ROUND_DOWN).toString());
                 Integer amount = Integer.parseInt(integralUserRecord.getAmount());
                 JSONObject jsonObject = JSONObject.parseObject(oldValue.getOtherRule());
                 log.info("查询的其他规则json信息：jsonObject = {}", jsonObject);
-                if(jsonObject ==  null) {
+                if (jsonObject == null) {
                     point = ruleObjectRestResponse.getData().getPoint();
                 } else {
-                    point = jsonObject.getInteger("rule") == null? 0 * amount: jsonObject.getInteger("rule") * amount;
+                    point = jsonObject.getInteger("rule") == null ? 0 * amount : jsonObject.getInteger("rule") * amount;
                 }
 
             } else {
@@ -101,7 +101,7 @@ public class IntegralUserRecordBiz extends BaseBiz<IntegralUserRecordMapper, Int
             }
         }
         insertSelective(integralUserRecord.getIntegralUserRecord());
-        if(oldValue != null) {
+        if (oldValue != null) {
             getUserRecordStatus(integralUserRecord, oldValue.getPeriod(), oldValue.getNumber());
         }
         return ObjectRestResponse.succ();
@@ -160,9 +160,9 @@ public class IntegralUserRecordBiz extends BaseBiz<IntegralUserRecordMapper, Int
     }
 
 
-
     /**
      * //判断用户获取积分是否达标
+     *
      * @param integralUserRecordDto 积分记录实体
      * @param period                周期
      *                              number  周期内可获得积分的次数
@@ -172,7 +172,7 @@ public class IntegralUserRecordBiz extends BaseBiz<IntegralUserRecordMapper, Int
         IntegralUserStatus integralUserStatus = new IntegralUserStatus();
         integralUserStatus.setUserId(integralUserRecordDto.getUserId());
         integralUserStatus.setIntegralRuleCode(integralUserRecordDto.getIntegralRuleCode());
-        if(period == IntegralRulePeriod.DAY.getCode()) {//按天
+        if (period == IntegralRulePeriod.DAY.getCode()) {//按天
             integralUserRecordDto.setStartTime(IntegralToolsUtils.getDayStart());
             integralUserRecordDto.setEndTime(IntegralToolsUtils.getDayStart() + 24 * 60 * 60 * 1000);
             Integer count = mapper.countByUserAndCode(integralUserRecordDto);

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/feign/ConfigFeign.java

@@ -4,18 +4,23 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.app.entity.vo.WithDrawRuleVo;
 import org.springframework.cloud.openfeign.FeignClient;
-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.RequestMethod;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * Created by ace on 2017/9/15.
  */
 @FeignClient("xx-app")
 public interface ConfigFeign {
+
+    /**
+     * 客服
+     */
+    public static final int TYPE_CUS_SER = 400;
+
     @RequestMapping(value = "/cofig/app/unauth/types",method = RequestMethod.GET)
-    ObjectRestResponse<Cofig> getAllByType(String types);
+    ObjectRestResponse<List<Cofig>> getAllByType(@RequestParam("types") String types);
 
      @GetMapping("/cofig/app/unauth/withdraw_rule")
      WithDrawRuleVo getWithDrawRule();

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

+package com.xxfc.platform.order.contant.enumerate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DepositRefundStatus {
+    INITIATEREFUND(1,"发起退还"),
+    REFUNDARRIVAL(2,"退还到账"),
+    VIOLATIONARRIVAL (3,"违章到账"),
+    FIXLOSS(4,"定损中"),
+    FIXLOSSREFUND(5,"定损押金退还"),
+    FIXLOSSREFUNDARRIVAL(6,"定损押金已到账"),
+    ;
+
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
+
+    DepositRefundStatus(Integer code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public static Boolean exists(Integer code){
+        return codeAndDesc.containsKey(code);
+    }
+}

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

+package com.xxfc.platform.order.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+
+@Table(name = "deposit_refund_record")
+@Data
+public class DepositRefundRecord {
+    @Id
+    private Integer id;
+
+    /**
+     * 定损状态：1、押金退还已经发起，2、押金退还已到账，3、违章押金已到账，4、定损中，5、完成定损退还剩余押金，6、剩余押金退还到账，
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "crt_time")
+    private Long crtTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "upd_time")
+    private Long updTime;
+
+    /**
+     * 交还车记录ID
+     */
+    @Column(name = "crosstown_id")
+    private Integer crosstownId;
+
+    /**
+     * 退换押金
+     */
+    private BigDecimal amount;
+
+    /**
+     * 剩余押金
+     */
+    private BigDecimal restAmount;
+
+    /**
+     * 总共押金
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 是否显示
+     */
+    private Boolean isshow;
+    /**
+     * 是否完成
+     */
+    private Boolean iscomplete;
+
+    /**
+     * 违章记录
+     */
+    @Transient
+    OrderViolation orderViolation;
+    @Transient
+    Long rentDepositAutoRefundTime;
+}
\ No newline at end of file

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

@@ -106,7 +106,7 @@ public class OrderVehicleCrosstown {
     private String dedDetail;
 
     /**
-     *  1、交车， 2、还车
+     *  1、交车， 2、还车, 3、定损还车
      */
     private Integer type;
 

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

+package com.xxfc.platform.order.pojo;
+
+public class DepositeRefundRecordVo {
+
+}

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

@@ -12,6 +12,11 @@ public class OrderAccompanyDTO {
      */
     private Integer id;
 
+    /**
+     * 物品类型
+     */
+    private Integer type;
+
     /**
      * 物品名称
      */

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

@@ -6,7 +6,6 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 
 @Data
 public class OrderPageVO extends BaseOrder {
@@ -26,6 +25,11 @@ public class OrderPageVO extends BaseOrder {
      */
     private String username;
 
+    /**
+     * 是否是用户匹配公司
+     */
+    private boolean userCompanyStatus = false;
+
     /**
      * 车牌
      */

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

 package com.xxfc.platform.order.pojo.order;
 
+import com.xxfc.platform.order.entity.DepositRefundRecord;
 import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class OrderVehicleCrosstownDto extends OrderVehicleCrosstown {
     String userLicenses;
@@ -30,4 +33,5 @@ public class OrderVehicleCrosstownDto extends OrderVehicleCrosstown {
 
     private String username;
 
+    List<DepositRefundRecord> depositRefundRecord;
 }

xx-order/xx-order-server/pom.xml

@@ -26,6 +26,13 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.xxfc.platform</groupId>
+            <artifactId>xx-app-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>

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.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 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.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.util.IntervalUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 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.entity.*;
 import com.xxfc.platform.order.mapper.BaseOrderMapper;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
@@ -30,37 +27,36 @@ import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
-import com.xxfc.platform.universal.vo.OrderRefundVo;
 import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.jexl2.MapContext;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
-import static com.xxfc.platform.universal.constant.DictionaryKey.*;
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
- *
- *
  * @author zjw
  * @email nishijjo@qq.com
  * @date 2019-05-15 21:30:33
  */
 @Service
 @Slf4j
-public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
+public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
 
     @Autowired
     OrderMemberDetailBiz orderMemberDetailBiz;
@@ -72,7 +68,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     OrderRentVehicleBiz orderRentVehicleBiz;
 
     @Autowired
-    OrderVehicalCrosstownBiz orderVehicalCrosstownBiz;
+    OrderVehicleCrosstownBiz orderVehicleCrosstownBiz;
 
     @Autowired
     OrderUserLicenseBiz orderUserLicenseBiz;
@@ -104,108 +100,178 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     @Autowired
     ActivityFeign activityFeign;
 
-    public List<OrderPageVO> pageByParm(Map<String, Object> paramMap){
+    public List<OrderPageVO> pageByParm(Map<String, Object> paramMap) {
         return mapper.pageByParm(paramMap);
     }
 
-    public List<OrderListVo> listOrder(Map<String, Object> paramMap){
+    public List<OrderListVo> listOrder(Map<String, Object> paramMap) {
 
         return mapper.listOrder(paramMap);
     }
-    public List<OrderPageVO> getRentVehicle (Map<String, Object> paramMap) {
+
+    public List<OrderPageVO> getRentVehicle(Map<String, Object> paramMap) {
         return mapper.getRentVehicle(paramMap);
     }
-    public List<OrderPageVO> getTourList (Map<String, Object> paramMap) {
+
+    public List<OrderPageVO> getTourList(Map<String, Object> paramMap) {
         return mapper.getTourList(paramMap);
     }
 
     /**
      * 获取订单详情
+     *
      * @param no
      * @return
      */
-    public ObjectRestResponse<OrderPageVO> getOrderDetail(String no) {
-
+    public ObjectRestResponse<OrderPageVO> getOrderDetail(String no, UserDTO userDTO) {
         OrderPageVO orderPageVo = mapper.getOrderDetail(no);
-        if(orderPageVo == null) {
+        if (orderPageVo == null) {
             return ObjectRestResponse.createFailedResult(3501, "订单不存在");
         }
-     if(orderPageVo.getOrderRentVehicleDetail() != null) {
-        if(orderPageVo.getStatus() == 4) { //未交车
-           List<VehicleUserLicense> vehicleUserLicenses = Lists.newArrayList();
+        if(orderPageVo.getStatus() <= 3 && orderPageVo.getStatus() != 2 && orderPageVo.getStatus() != -1) {
+            return ObjectRestResponse.createFailedResult(3501, "订单不存在");
+        }
+        List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+        List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
 
+        if (orderPageVo.getOrderRentVehicleDetail() != null) {
+            if (!companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId()) && !companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
+                return ObjectRestResponse.createFailedResult(2563, "您无权限查看此订单！");
+            }
+            if(userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
+                orderPageVo.setUserCompanyStatus(true);
+            }
+            if (orderPageVo.getStatus() == 4) { //未交车
                 boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
-            if(!flag) {
+                if (!flag) {
                     return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
                 }
+
+            } else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
+                getDriverInfo(orderPageVo);
+                getUserLicense(orderPageVo);
+            }
+
+            RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVo.getOrderRentVehicleDetail().getVehicleId());
+            if (restResponse.getData() != null) {
+                orderPageVo.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
+            }
+        } else if (orderPageVo.getOrderTourDetail() != null) {
+            List<Integer> ids = Lists.newArrayList();
+            if (orderPageVo.getOrderTourDetail().getTourUserIds().contains(",")) {
+                String[] strings = orderPageVo.getOrderTourDetail().getTourUserIds().split(",");
+                for (int i = 0; i < strings.length; i++) {
+                    ids.add(Integer.parseInt(StringUtils.isNotBlank(strings[i]) ? strings[i] : "0"));
+                }
+            } else {
+                ids.add(Integer.parseInt(orderPageVo.getOrderTourDetail().getTourUserIds()));
+            }
+            List<AppUserVo> list = userFeign.getByUserIds(ids).getData();
+            orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? null : list);
+        }
+        //设置保留金
+        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+        orderPageVo.setIllegalReserve(illegalReserve);
+        orderPageVo.setItems(orderItemBiz.selectList(new OrderItem(){{
+            setOrderId(orderPageVo.getId());
+        }}));
+        return ObjectRestResponse.succ(orderPageVo);
+    }
+
+    public void getUserLicense(OrderPageVO orderPageVo) {
+        OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
+        orderVehicleCrosstownDto.setOrderId(orderPageVo.getId());
+        orderVehicleCrosstownDto.setOrderNo(orderPageVo.getNo());
+        List<OrderVehicleCrosstownDto> orderVehicleCrosstowns = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
+        if (orderVehicleCrosstowns != null && orderVehicleCrosstowns.size() > 0) {
+            List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(orderVehicleCrosstowns.get(0).getUserLicenseId()).getData();
+            if (orderUserLicenses != null && orderUserLicenses.size() > 0) {
+                orderVehicleCrosstownDto.setLicenseIdCard(orderUserLicenses.get(0).getLicenseIdCard());
+                orderVehicleCrosstownDto.setLicenseImg(orderUserLicenses.get(0).getLicenseImg());
+                orderVehicleCrosstownDto.setLicenseName(orderUserLicenses.get(0).getLicenseName());
+                orderVehicleCrosstownDto.setLicensePhone(orderUserLicenses.get(0).getLicensePhone());
+            }
+
+        }
+        orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
+    }
+
+    public void  getDriverInfo(OrderPageVO orderPageVo) {
+        List<VehicleUserLicense> vehicleUserLicenses = Lists.newArrayList();
         String myDriverIds = orderPageVo.getOrderRentVehicleDetail().getMyDriverIds();
-           if(StringUtils.isNotBlank(myDriverIds)) {
-               if(myDriverIds.contains(",")) {
+        if (StringUtils.isNotBlank(myDriverIds)) {
+            if (myDriverIds.contains(",")) {
                 String[] ids = myDriverIds.split(",");
-                   try{
+                try {
                     //目前暂定一个驾驶人，后期需要更改再此更改
                     RestResponse<VehicleUserLicense> restResponse = vehicleFeign.getOne(Integer.parseInt(ids[0]));
                     log.info(restResponse.getMessage());
-                       if(restResponse.getData() != null) {
+                    if (restResponse.getData() != null) {
                         vehicleUserLicenses.add(restResponse.getData());
                     }
-                   }catch (Exception e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             } else {
                 try {
                     vehicleUserLicenses.add(vehicleFeign.getOne(Integer.parseInt(myDriverIds.trim())).getData());
-                   }catch (Exception e){
+                } catch (Exception e) {
                     e.printStackTrace();
                 }
             }
         }
         orderPageVo.setVehicleUserLicenses(vehicleUserLicenses);
-       } else if(orderPageVo.getStatus() >= 5) {//出行中 已交车
-            OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
-            orderVehicleCrosstownDto.setOrderId(orderPageVo.getId());
-            orderVehicleCrosstownDto.setOrderNo(orderPageVo.getNo());
-            List<OrderVehicleCrosstownDto> orderVehicleCrosstowns = orderVehicalCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
-            if(orderVehicleCrosstowns != null && orderVehicleCrosstowns.size() > 0) {
-                List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(orderVehicleCrosstowns.get(0).getUserLicenseId()).getData();
-                if(orderUserLicenses != null && orderUserLicenses.size() > 0) {
-                    orderVehicleCrosstownDto.setLicenseIdCard(orderUserLicenses.get(0).getLicenseIdCard());
-                    orderVehicleCrosstownDto.setLicenseImg(orderUserLicenses.get(0).getLicenseImg());
-                    orderVehicleCrosstownDto.setLicenseName(orderUserLicenses.get(0).getLicenseName());
-                    orderVehicleCrosstownDto.setLicensePhone(orderUserLicenses.get(0).getLicensePhone());
     }
 
+
+    public ObjectRestResponse<OrderPageVO> getOrderDetail(String no) {
+        OrderPageVO orderPageVo = mapper.getOrderDetail(no);
+        if (orderPageVo == null) {
+            return ObjectRestResponse.createFailedResult(3501, "订单不存在");
         }
-            orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
+        if (orderPageVo.getOrderRentVehicleDetail() != null) {
+            if (orderPageVo.getStatus() == 4) { //未交车
+                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
+                if (!flag) {
+                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
+                }
+                getDriverInfo(orderPageVo);
+            } else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
+                getDriverInfo(orderPageVo);
+                getUserLicense(orderPageVo);
             }
-
             RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVo.getOrderRentVehicleDetail().getVehicleId());
-            if(restResponse.getData() != null) {
+            if (restResponse.getData() != null) {
                 orderPageVo.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
             }
-        } else if(orderPageVo.getOrderTourDetail() != null) {
+        } else if (orderPageVo.getOrderTourDetail() != null) {
             List<Integer> ids = Lists.newArrayList();
-            if(orderPageVo.getOrderTourDetail().getTourUserIds().contains(",")) {
+            if (orderPageVo.getOrderTourDetail().getTourUserIds().contains(",")) {
                 String[] strings = orderPageVo.getOrderTourDetail().getTourUserIds().split(",");
                 for (int i = 0; i < strings.length; i++) {
-                    ids.add(Integer.parseInt(StringUtils.isNotBlank(strings[i])? strings[i] : "0"));
+                    ids.add(Integer.parseInt(StringUtils.isNotBlank(strings[i]) ? strings[i] : "0"));
                 }
 
             } else {
                 ids.add(Integer.parseInt(orderPageVo.getOrderTourDetail().getTourUserIds()));
             }
             List<AppUserVo> list = userFeign.getByUserIds(ids).getData();
-            orderPageVo.getOrderTourDetail().setUserVoList(list);
+            orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? null : list);
         }
         //设置保留金
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ILLEGAL_RESERVE).getDetail());
+        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
         orderPageVo.setIllegalReserve(illegalReserve);
+        orderPageVo.setItems(orderItemBiz.selectList(new OrderItem(){{
+            setOrderId(orderPageVo.getId());
+        }}));
         return ObjectRestResponse.succ(orderPageVo);
     }
 
     /**
      * 支付回调处理
+     *
      * @param orderNo
      * @param tradeNo
      */
@@ -229,10 +295,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
             }};
 
             //如果是会员订单，则触发会员效益
-            if(OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
+            if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
                 //直接设置订单完成
                 updateOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-                omd = orderMemberDetailBiz.selectOne(new OrderMemberDetail(){{
+                omd = orderMemberDetailBiz.selectOne(new OrderMemberDetail() {{
                     setOrderId(baseOrder.getId());
                 }});
 
@@ -247,22 +313,22 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                 userMemberDTO.setDiscount(omd.getRebate());
 
                 ObjectRestResponse orr = userFeign.buyMember(userMemberDTO);
-                log.info("orr.getStatus() : " + orr.getStatus() );
-            }else if(OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
+                log.info("orr.getStatus() : " + orr.getStatus());
+            } else if (OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
                 updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
-                orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail(){{
+                orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail() {{
                     setOrderId(baseOrder.getId());
                 }});
                 //车辆预定审核通过
 
                 //确认免费天数
-                if(orvd.getFreeDays() > 0) {
+                if (orvd.getFreeDays() > 0) {
                     userFeign.memberDays(baseOrder.getUserId(), orvd.getFreeDays(), UserFeign.MEMBER_DAYS_CONFIRM);
                 }
 
-            }else if(OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
+            } else if (OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
                 updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
-                otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
+                otd = orderTourDetailBiz.selectOne(new OrderTourDetail() {{
                     setOrderId(baseOrder.getId());
                 }});
 
@@ -271,7 +337,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
             }
             try {
                 this.updateSelectiveByIdRe(updateOrder);
-            }finally {
+            } finally {
                 AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
 
                 //处理App用户提醒短信的发送
@@ -280,7 +346,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                 //处理后台用户提醒短信的发送
                 orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_PAY);
                 sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_PAY);
-                if(OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
+                if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
                     sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_FINISH);
                 }
             }
@@ -297,7 +363,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
         orderMQDTO.setOrderMemberDetail(omd);
 
         //获取item
-        orderMQDTO.setItems(orderItemBiz.selectList(new OrderItem(){{
+        orderMQDTO.setItems(orderItemBiz.selectList(new OrderItem() {{
             setOrderId(baseOrder.getId());
         }}));
 
@@ -306,6 +372,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 
     /**
      * 更新（不成功抛异常）
+     *
      * @param baseOrder
      * @return
      */
@@ -315,16 +382,17 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 
     /**
      * 更新（不成功抛异常）
+     *
      * @param baseOrder
      * @return
      */
     public BaseOrder updateSelectiveByIdReT(BaseOrder baseOrder, boolean needVersion) {
-        if(needVersion) {
+        if (needVersion) {
             baseOrder.setVersion(selectById(baseOrder.getId()).getVersion());
         }
-        if(updateSelectiveByIdRe(baseOrder) > 0) {
+        if (updateSelectiveByIdRe(baseOrder) > 0) {
             return selectById(baseOrder.getId());
-        }else {
+        } else {
             throw new BaseException(ResultCode.DB_OPERATION_FAIL_CODE);
         }
     }
@@ -344,7 +412,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 
     public boolean getTodayTime(Long time) {
         Long startTime = getDayStart();
-        if(time >= startTime && time <= startTime + 24 * 60 * 60 * 1000 - 1) {
+        if (time >= startTime && time <= startTime + 24 * 60 * 60 * 1000 - 1) {
             return true;
         }
         return false;
@@ -352,7 +420,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
 
     public static Long getDayStart() {
         long current = System.currentTimeMillis();
-        long zero = current/(1000*3600*24)*(1000*3600*24) - TimeZone.getDefault().getRawOffset();
+        long zero = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
         return zero;
     }
 
@@ -372,12 +440,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                 default:
                     break;
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
     }
 
 
-
-
 }
\ No newline at end of file

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

+package com.xxfc.platform.order.biz;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.DepositRefundStatus;
+import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.order.mapper.DepositRefundRecordMapper;
+import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.ThirdFeign;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
+
+@Service
+@Slf4j
+public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapper, DepositRefundRecord> {
+
+    @Autowired
+    ThirdFeign thirdFeign;
+    @Autowired
+    BaseOrderBiz baseOrderBiz;
+    @Autowired
+    OrderRentVehicleBiz orderRentVehicleBiz;
+    @Autowired
+    OrderVehicleCrosstownBiz orderVehicleCrosstownBiz;
+
+    @Autowired
+    OrderViolationBiz orderViolationBiz;
+    /**
+     * 添加正常记录
+     */
+    @Transactional
+    public void saveNormalRecord(DepositRefundRecord depositRefundRecord) {
+        depositRefundRecord.setStatus(DepositRefundStatus.INITIATEREFUND.getCode());
+        depositRefundRecord.setIscomplete(true);
+        insertSelectiveRe(depositRefundRecord);
+        depositRefundRecord.setStatus(DepositRefundStatus.REFUNDARRIVAL.getCode());
+        depositRefundRecord.setIscomplete(false);
+        insertSelectiveRe(depositRefundRecord);
+        depositRefundRecord.setStatus(DepositRefundStatus.VIOLATIONARRIVAL.getCode());
+        depositRefundRecord.setRestAmount(getAmount());
+        insertSelectiveRe(depositRefundRecord);
+    }
+
+    /**
+     * 添加定损记录
+     * @param depositRefundRecord
+     */
+    @Transactional
+    public void saveFixLossRecord(DepositRefundRecord depositRefundRecord) {
+        depositRefundRecord.setStatus(DepositRefundStatus.FIXLOSS.getCode());
+        depositRefundRecord.setIscomplete(true);
+        insertSelectiveRe(depositRefundRecord);
+        depositRefundRecord.setIscomplete(false);
+        depositRefundRecord.setStatus(DepositRefundStatus.FIXLOSSREFUND.getCode());
+        insertSelectiveRe(depositRefundRecord);
+        depositRefundRecord.setStatus(DepositRefundStatus.FIXLOSSREFUNDARRIVAL.getCode());
+        insertSelectiveRe(depositRefundRecord);
+        depositRefundRecord.setStatus(DepositRefundStatus.VIOLATIONARRIVAL.getCode());
+        depositRefundRecord.setRestAmount(getAmount());
+        insertSelectiveRe(depositRefundRecord);
+    }
+
+    public DepositRefundRecord findByCrossIdAndStatus(Integer crossId, Integer status) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("crossId", crossId);
+        map.put("status", status);
+        return mapper.findByCrossIdAndStatus(map);
+    }
+
+    public List<DepositRefundRecord> selectByCrossId(Integer cross) {
+        List<DepositRefundRecord> list = mapper.selectByCrossId(cross);
+        for(DepositRefundRecord depositRefundRecord : list) {
+            if(depositRefundRecord.getIscomplete() == true && depositRefundRecord.getStatus() == DepositRefundStatus.VIOLATIONARRIVAL.getCode()) {//查询违章记录
+                OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectById(depositRefundRecord.getCrosstownId());
+                if(orderVehicleCrosstown != null) {
+                    BaseOrder baseOrder = baseOrderBiz.selectById(orderVehicleCrosstown.getOrderId());
+                    if(baseOrder != null) {
+                        OrderViolation orderViolation = orderViolationBiz.getOneByDetailId(baseOrder.getDetailId());
+                        depositRefundRecord.setOrderViolation(orderViolation);
+                    }
+                }
+            }
+            if(depositRefundRecord.getStatus() == DepositRefundStatus.VIOLATIONARRIVAL.getCode()) {
+                Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+                Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
+                depositRefundRecord.setRentDepositAutoRefundTime(depositRefundRecord.getCrtTime() + (rentDepositAutoRefundTime == null?0:rentDepositAutoRefundTime*60*60*1000));
+
+            }
+        }
+        return list;
+    }
+
+    public void saveViolationDeposit(OrderViolation orderViolation) {
+        log.info("添加违章押金记录：orderViolation = {}", orderViolation.toString());
+        String logInfo = "";
+        OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(orderViolation.getDetailId());
+        if(orderRentVehicleDetail != null) {
+            OrderVehicleCrosstownDto orderVehicleCrosstown = new OrderVehicleCrosstownDto();
+            orderVehicleCrosstown.setOrderId(orderRentVehicleDetail.getOrderId());
+            orderVehicleCrosstown.setType(CrosstownTypeEnum.ARRIVE.getCode());
+            OrderVehicleCrosstownDto orderVehicleCrosstownDto = orderVehicleCrosstownBiz.getByOrderId(orderVehicleCrosstown);
+            if(orderVehicleCrosstownDto != null) {
+                insertDeposit(orderVehicleCrosstownDto, orderViolation, logInfo);
+            } else {
+                orderVehicleCrosstown.setType(CrosstownTypeEnum.FIXED_LOSS.getCode());
+                OrderVehicleCrosstownDto depositCross = orderVehicleCrosstownBiz.getByOrderId(orderVehicleCrosstown);
+                insertDeposit(depositCross, orderViolation, logInfo);
+                logInfo = "还车记录不存在";
+            }
+        } else {
+            logInfo = "订单详情不存在";
+        }
+        log.info("添加违章押金记录失败：" + logInfo);
+    }
+
+    public BigDecimal getAmount() {
+        //设置保留金
+        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+        return illegalReserve;
+    }
+
+    public void insertDeposit(OrderVehicleCrosstownDto orderVehicleCrosstownDto, OrderViolation orderViolation,  String logInfo) {
+        DepositRefundRecord depositRefundRecord = findByCrossIdAndStatus(orderVehicleCrosstownDto.getId(), DepositRefundStatus.VIOLATIONARRIVAL.getCode());
+        if(depositRefundRecord != null) {
+            DepositRefundRecord newValue = new DepositRefundRecord();
+            BeanUtil.copyProperties(depositRefundRecord, newValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+            newValue.setAmount(orderViolation.getPrice());
+            newValue.setRestAmount(depositRefundRecord.getTotalAmount().subtract(orderViolation.getPrice()));//减去违章金之后的押金
+            newValue.setIscomplete(true);
+            newValue.setId(null);
+            insertSelectiveRe(newValue);
+            depositRefundRecord.setIsshow(false);
+            updateSelectiveByIdRe(depositRefundRecord);
+        } else {
+            logInfo = "押金记录不存在";
+        }
+    }
+
+}

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

@@ -3,7 +3,9 @@ package com.xxfc.platform.order.biz;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.util.IntervalUtil;
+import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
@@ -20,6 +22,7 @@ import com.xxfc.platform.order.mapper.OrderRefundMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -47,11 +50,17 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
     OrderRentVehicleBiz orderRentVehicleBiz;
 
     @Autowired
-    OrderVehicalCrosstownBiz crosstownBiz;
+    OrderVehicleCrosstownBiz crosstownBiz;
 
     @Autowired
     OrderViolationBiz orderViolationBiz;
 
+    @Autowired
+    OrderMsgBiz orderMsgBiz;
+
+    @Autowired
+    UserFeign userFeign;
+
     /**
      * 退还部分押金
      * @param orderMQDTO
@@ -76,6 +85,8 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
             }
             refundDesc += ")";
             refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode(), RefundTypeEnum.PART_DEPOSIT);
+
+            orderMsgBiz.handelMsgDeposit(orderMQDTO.getOrderRentVehicleDetail(), orderMQDTO, userFeign.userDetailById(orderMQDTO.getUserId()).getData());
         }
 //        else {
 //            //还车扣除款 剩余的 钱，再减去违章预备金
@@ -141,12 +152,12 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
         }
         //商品价格 - 优惠券减免的价格
         BigDecimal refundGoodsAmount = calculateRefund(originalRefundAmount, timeLag, dicParentKey, refundDescBuilder);
+        refundGoodsAmount = refundGoodsAmount.setScale(2, RoundingMode.HALF_UP);
 
         //退款金额
 //        BigDecimal refundAmount = depositAmount.add(refundGoodsAmount);
 //        originalRefundAmount = depositAmount.add(originalRefundAmount);
         BigDecimal refundAmount = refundGoodsAmount;
-        originalRefundAmount = originalRefundAmount.subtract(depositAmount);
 
         //退款子流程: 订单基础，退款描述，退款金额
         refundSubProcess(baseOrder, refundDescBuilder.toString(), originalRefundAmount, refundAmount, RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode());

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

@@ -28,11 +28,11 @@ public class OrderUserLicenseBiz extends BaseBiz<OrderUserLicenseMapper, OrderUs
         }
         OrderUserLicense oldValue = mapper.selectByLicenseIdCard(orderUserLicense.getLicenseIdCard());
         if(oldValue == null) {
-            mapper.insertSelective(orderUserLicense);
+           insertSelective(orderUserLicense);
             return ObjectRestResponse.succ(mapper.selectByLicenseIdCard(orderUserLicense.getLicenseIdCard()));
         }
         BeanUtil.copyProperties(orderUserLicense, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
-        mapper.updateByPrimaryKeySelective(oldValue);
+        updateSelectiveByIdRe(oldValue);
         return ObjectRestResponse.succ(mapper.selectByLicenseIdCard(oldValue.getLicenseIdCard()));
     }
 

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

 package com.xxfc.platform.order.biz;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 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.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.user.UserInfoBiz;
 import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.DepositRefundStatus;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
-import com.xxfc.platform.order.entity.BaseOrder;
-import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
-import com.xxfc.platform.order.entity.OrderUserLicense;
-import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
+import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.OrderVehicaleCrosstownMapper;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
+import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
+import com.xxfc.platform.universal.constant.DictionaryKey;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.VehicleArrivalVo;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.map.HashedMap;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
+
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 @Service
 @Slf4j
-public class OrderVehicalCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapper, OrderVehicleCrosstown> {
+public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapper, OrderVehicleCrosstown> {
 
     @Autowired
-    OrderVehicalCrosstownBiz orderVehicalCrosstownBiz;
+    OrderVehicleCrosstownBiz orderVehicleCrosstownBiz;
 
     @Autowired
     OrderUserLicenseBiz orderUserLicenseBiz;
-
+    @Autowired
+    ThirdFeign thirdFeign;
     @Autowired
     UserInfoBiz userInfoBiz;
     @Autowired
@@ -46,55 +60,115 @@ public class OrderVehicalCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     @Autowired
     private OrderRentVehicleBiz orderRentVehicleBiz;
 
+    @Autowired
+    private OrderDepositRefundRecordBiz orderDepositRefundRecordBiz;
+
     @Autowired
     BaseOrderBiz baseOrderBiz;
 
-    public OrderVehicleCrosstown get(Integer id){
+    public OrderVehicleCrosstown get(Integer id) {
         return selectById(id);
     }
 
     public List<OrderVehicleCrosstownDto> selectByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
+
+        List<OrderVehicleCrosstownDto> list = mapper.selectByOrderId(orderVehicleCrosstownDto);
+        for (OrderVehicleCrosstownDto value : list) {
+            updateCrossRecord(value);
+            List<DepositRefundRecord> depositRefundRecords = orderDepositRefundRecordBiz.selectByCrossId(value.getId());
+            value.setDepositRefundRecord(depositRefundRecords == null || depositRefundRecords.size() <= 0 ? null : depositRefundRecords);
+        }
+        return list;
+    }
+
+    public OrderVehicleCrosstownDto getByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
         List<OrderVehicleCrosstownDto> list = mapper.selectByOrderId(orderVehicleCrosstownDto);
-        for(OrderVehicleCrosstownDto value : list) {
+        return list != null && list.size() > 0 ? list.get(0) : null;
+    }
+
+    public void updateCrossRecord(OrderVehicleCrosstownDto value) {
         if (value.getOrperaterId() != null) {
             ObjectRestResponse<AppUserDTO> objectRestResponse = userFeign.userDetailById(value.getOrperaterId());
-                if(objectRestResponse.getData() != null) {
+            if (objectRestResponse.getData() != null) {
                 value.setUsername(objectRestResponse.getData().getNickname());
             }
         }
-            if(value.getUserLicenseId() != null) {
+        if (value.getUserLicenseId() != null) {
             List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(value.getUserLicenseId()).getData();
-                if(orderUserLicenses != null && orderUserLicenses.size() > 0) {
+            if (orderUserLicenses != null && orderUserLicenses.size() > 0) {
                 value.setLicenseIdCard(orderUserLicenses.get(0).getLicenseIdCard());
                 value.setLicenseImg(orderUserLicenses.get(0).getLicenseImg());
                 value.setLicenseName(orderUserLicenses.get(0).getLicenseName());
                 value.setLicensePhone(orderUserLicenses.get(0).getLicensePhone());
             }
         }
+    }
 
+
+    public ObjectRestResponse selectByOrderNo(String no) {
+        ObjectRestResponse<OrderPageVO> objectRestResponse = baseOrderBiz.getOrderDetail(no);
+        if (objectRestResponse.getData() == null) {
+            return ObjectRestResponse.createFailedResult(2379, "订单不存在");
         }
-        return list;
+        OrderPageVO orderPageVO = objectRestResponse.getData();
+        Map<String, Object> map = new HashedMap<>();
+        if (orderPageVO.getStatus() == OrderStatusEnum.ORDER_FINISH.getCode()) {//订单已完成
+            map.put("no", orderPageVO.getNo());
+            map.put("type", CrosstownTypeEnum.ARRIVE.getCode());
+        } else if (orderPageVO.getStatus() == OrderStatusEnum.ORDER_FIXED_LOSS.getCode()) {//订单定损中
+            map.put("no", orderPageVO.getNo());
+            map.put("type", CrosstownTypeEnum.FIXED_LOSS.getCode());
+        } else if (orderPageVO.getStatus() == OrderStatusEnum.ORDER_WAIT.getCode()) {//订单出行中
+            map.put("no", orderPageVO.getNo());
+            map.put("type", CrosstownTypeEnum.DEPARTURE.getCode());
+        } else {
+            return ObjectRestResponse.succ();
         }
+        OrderVehicleCrosstownDto orderVehicleCrosstownDto = mapper.selectByOrderNo(map);
+        updateCrossRecord(orderVehicleCrosstownDto);
+        List<DepositRefundRecord> list = orderDepositRefundRecordBiz.selectByCrossId(orderVehicleCrosstownDto.getId());
+        orderVehicleCrosstownDto.setDepositRefundRecord(list == null || list.size() <= 0 ? null : list);
+        return ObjectRestResponse.succ(orderVehicleCrosstownDto);
+    }
+
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ObjectRestResponse<OrderVehicleCrosstownDto> add(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
         log.info("添加的参数：orderVehicaleCrosstown = {}", orderVehicleCrosstownDto);
         UserDTO userDTO = userInfoBiz.getAdminUserInfo();
         if (userDTO == null) {
             return ObjectRestResponse.createFailedResult(508, "token is null or invalid");
         }
-        if (orderVehicleCrosstownDto == null || orderVehicleCrosstownDto.getOrderId() == null ) {
+        if (orderVehicleCrosstownDto == null || orderVehicleCrosstownDto.getOrderId() == null) {
             return ObjectRestResponse.createFailedResult(500, "参数为空！");
         }
         orderVehicleCrosstownDto.setOrperaterId(userDTO.getId());
         BaseOrder baseOrder = baseOrderBiz.selectById(orderVehicleCrosstownDto.getOrderId());
-        if(baseOrder == null) {
-            return ObjectRestResponse.createFailedResult(500,"订单不存在！");
+        if (baseOrder == null) {
+            return ObjectRestResponse.createFailedResult(500, "订单不存在！");
         }
+
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
+        if(baseOrder.getStatus() != -1) {
+            Vehicle vehicle = null;
+            RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
+            log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
+            if (restResponse.getData() != null) {
+                vehicle = restResponse.getData();
+            }
+            if (vehicle == null) {
+                return ObjectRestResponse.createFailedResult(500, "订单车辆不存在！");
+            }
+            //判断车辆公里数
+            if (orderVehicleCrosstownDto.getMileage() == null || orderVehicleCrosstownDto.getMileage() < vehicle.getMileageLastUpdate()) {
+                return ObjectRestResponse.createFailedResult(500, "请输入车辆仪表盘实际公里数！");
+            }
+        }
+
         //调用车辆管理的出车还车
         //出车
-        if(orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) { //交车
+        if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) { //交车
+
             VehicleDepartureVo vehicleDepartureVo = new VehicleDepartureVo();
             vehicleDepartureVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleDepartureVo.setDepartureBranchCompanyId(orderRentVehicleDetail.getStartCompanyId());
@@ -106,49 +180,120 @@ public class OrderVehicalCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleDepartureVo.setUserTel(userDTO.getTelPhone());
             vehicleDepartureVo.setCheckMan(orderVehicleCrosstownDto.getLicenseName());
             vehicleDepartureVo.setCheckManTel(orderVehicleCrosstownDto.getLicensePhone());
+            try {
                 vehicleFeign.departureBySmall(vehicleDepartureVo);
-        } else if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.ARRIVE.getCode()) { //还车
+            } catch (Exception e) {
+                e.printStackTrace();
+                return ObjectRestResponse.createFailedResult(500, e.getMessage());
+            }
+
+        } else if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.ARRIVE.getCode() || orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //还车
+
             VehicleArrivalVo vehicleArrivalVo = new VehicleArrivalVo();
             vehicleArrivalVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleArrivalVo.setArrivalBranchCompanyId(userDTO.getCompanyId());
             vehicleArrivalVo.setMileage(orderVehicleCrosstownDto.getMileage());
             vehicleArrivalVo.setRecycleMan(userDTO.getName());
             vehicleArrivalVo.setRecycleManTel(userDTO.getTelPhone());
+            try {
                 vehicleFeign.arrivalBySmall(vehicleArrivalVo);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return ObjectRestResponse.createFailedResult(500, e.getMessage());
+            }
+        }
+        Double cost = 0.0;
+        if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getDedDetail())) {
+            JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
+                if(jsonObject!= null) {
+                    cost += Double.parseDouble(jsonObject.getString("cost"));
+                }
             }
+        }
+        BigDecimal amount =  new BigDecimal(cost.toString()).divide(new BigDecimal("1"), 2, BigDecimal.ROUND_UP);
+        orderVehicleCrosstownDto.setDeductionCost(amount);
+       //扣除费用和备用金
+        orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(getAmount()).subtract(amount));
         //出车成功后修改订单状态
-        List<OrderVehicleCrosstownDto> oldValue = orderVehicalCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
-        if (oldValue .size() == 1) {
+        List<OrderVehicleCrosstownDto> oldValue = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
+        if (oldValue.size() == 1) {
+            BeanUtil.copyProperties(orderVehicleCrosstownDto, oldValue.get(0), CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+            getOrderLicense(orderVehicleCrosstownDto);
+            handleOrderStatus(baseOrder, orderRentVehicleDetail, oldValue.get(0));
+            updateSelectiveByIdRe(oldValue.get(0));
+            RestResponse<Vehicle> response = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
+            if (response.getData() != null) {
+                orderVehicleCrosstownDto.setVehicleNumberPlat(response.getData().getNumberPlate());
+            }
             return ObjectRestResponse.succ(oldValue.get(0));
-        } else if(oldValue .size() <= 0) {
+        } else if (oldValue.size() <= 0) {
             getOrderLicense(orderVehicleCrosstownDto);
-            orderVehicalCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
-            handleOrderStatus(baseOrder, orderRentVehicleDetail, orderVehicleCrosstownDto.getType());
-            RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
-            if(restResponse.getData() != null) {
-                orderVehicleCrosstownDto.setVehicleNumberPlat(restResponse.getData().getNumberPlate());
+
+            orderVehicleCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
+            OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectOne(orderVehicleCrosstownDto);
+            handleOrderStatus(baseOrder, orderRentVehicleDetail, orderVehicleCrosstown);
+            RestResponse<Vehicle> response = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
+            if (response.getData() != null) {
+                orderVehicleCrosstownDto.setVehicleNumberPlat(response.getData().getNumberPlate());
             }
             return ObjectRestResponse.succ(orderVehicleCrosstownDto);
         }
         return ObjectRestResponse.createDefaultFail();
     }
 
-    private void handleOrderStatus(BaseOrder baseOrder, OrderRentVehicleDetail orderRentVehicleDetail, Integer type) {
+    private void handleOrderStatus(BaseOrder baseOrder, OrderRentVehicleDetail orderRentVehicleDetail, OrderVehicleCrosstown orderVehicleCrosstown) {
         //交车完成 设置订单状态为出行中
+        BigDecimal totalAmount = new BigDecimal(0);
+        ObjectRestResponse<OrderPageVO> objectRestResponse = baseOrderBiz.getOrderDetail(baseOrder.getNo());
+        if (objectRestResponse.getData() != null && objectRestResponse.getData().getOrderRentVehicleDetail() != null) {
+            //总押金-保留金
+            totalAmount = objectRestResponse.getData().getOrderRentVehicleDetail().getDeposit().subtract(getAmount());
+        }
         if (baseOrder.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode()) {//交车
-            //判断是否是今日交车
             baseOrder.setStatus(OrderStatusEnum.ORDER_WAIT.getCode());
             baseOrderBiz.updateSelectiveById(baseOrder);
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_WAIT.getCode()) { //还车
-            if(type == CrosstownTypeEnum.ARRIVE.getCode()) {//不定损直接还车
+            if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.ARRIVE.getCode()) {//不定损直接还车
+                //添加非定损记录
+                DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
+                depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
+                depositRefundRecord.setRestAmount(orderVehicleCrosstown.getRestDeposit());
+                depositRefundRecord.setTotalAmount(totalAmount);
+                depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
+                orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
                 baseOrderBiz.updateSelectiveById(baseOrder);
                 baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
-            } else  if(type == CrosstownTypeEnum.FIXED_LOSS.getCode()){ //定损还车
+            } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //定损还车，添加定损记录
+                //添加定损记录
+                DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
+                depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
+                depositRefundRecord.setRestAmount(orderVehicleCrosstown.getRestDeposit());
+                depositRefundRecord.setTotalAmount(totalAmount);
+                depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
+                orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
                 baseOrderBiz.updateSelectiveById(baseOrder);
             }
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_FIXED_LOSS.getCode()) {//定损后还车
+            DepositRefundRecord depositRefundRecord = orderDepositRefundRecordBiz.findByCrossIdAndStatus(orderVehicleCrosstown.getId(), DepositRefundStatus.FIXLOSSREFUND.getCode());
+            if (depositRefundRecord != null) {
+                DepositRefundRecord newValue = new DepositRefundRecord();
+                BeanUtil.copyProperties(depositRefundRecord, newValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+                depositRefundRecord.setIsshow(false);
+                orderDepositRefundRecordBiz.updateSelectiveByIdRe(depositRefundRecord);
+                newValue.setIscomplete(true); //发起退款显示
+                newValue.setAmount(orderVehicleCrosstown.getDeductionCost());
+                newValue.setRestAmount(orderVehicleCrosstown.getRestDeposit());
+                newValue.setTotalAmount(totalAmount);
+                newValue.setCrosstownId(orderVehicleCrosstown.getId());
+                newValue.setId(null);
+                orderDepositRefundRecordBiz.insertSelectiveRe(newValue);
+            } else {
+                throw new BaseException("定损记录不存在！请联系客服");
+            }
             baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
             baseOrderBiz.updateSelectiveById(baseOrder);
             baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
@@ -156,14 +301,23 @@ public class OrderVehicalCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     }
 
     public void getOrderLicense(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
+        if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getLicenseIdCard())) {
             OrderUserLicense orderUserLicense = new OrderUserLicense();
             orderUserLicense.setLicenseIdCard(orderVehicleCrosstownDto.getLicenseIdCard());
             orderUserLicense.setLicenseImg(orderVehicleCrosstownDto.getLicenseImg());
             orderUserLicense.setLicenseName(orderVehicleCrosstownDto.getLicenseName());
             orderUserLicense.setLicensePhone(orderVehicleCrosstownDto.getLicensePhone());
-        if(orderUserLicense != null) {
+            if (orderUserLicense != null) {
                 Integer id = orderUserLicenseBiz.add(orderUserLicense).getData().getId();
                 orderVehicleCrosstownDto.setUserLicenseId(id + "");
             }
         }
+    }
+
+    public BigDecimal getAmount() {
+        //设置保留金
+        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+        return illegalReserve;
+    }
 }

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

@@ -7,7 +7,6 @@ import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.entity.OrderViolation;
 import com.xxfc.platform.order.mapper.OrderRentVehicleDetailMapper;
 import com.xxfc.platform.order.mapper.OrderViolationMapper;
-import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
@@ -24,14 +23,15 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-import tk.mybatis.mapper.common.Mapper;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-/**订单违章记录biz
+/**
+ * 订单违章记录biz
+ *
  * @author Administrator
  */
 @Service
@@ -47,8 +47,10 @@ public class OrderViolationBiz extends BaseBiz<OrderViolationMapper, OrderViolat
 
     @Autowired
     private RedisTemplate redisTemplate;
+
     /**
      * 保存违章记录
+     *
      * @param orderViolation
      */
     @Transactional(rollbackFor = Exception.class)
@@ -59,10 +61,10 @@ public class OrderViolationBiz extends BaseBiz<OrderViolationMapper, OrderViolat
         Map<String, Object> status = mapper.getOrderAndVehicleStatus(orderViolation.getDetailId());
         Integer orderStatus = (Integer) status.get("status");
         Integer refundStatus = (Integer) status.get("refundStatus");
-        if (orderStatus>=6||(refundStatus<=2&&refundStatus!=1)) {
-            mapper.insertSelective(orderViolation);
+        if (orderStatus >= 6 || (refundStatus <= 2 && refundStatus != 1)) {
+            insertSelective(orderViolation);
             detailMapper.updateByPrimaryKeySelective(orderRentVehicleDetail);
-        }else {
+        } else {
             throw new BaseException("The operation cannot be changed at this time");
         }
 
@@ -70,6 +72,7 @@ public class OrderViolationBiz extends BaseBiz<OrderViolationMapper, OrderViolat
 
     /**
      * 修改违章记录
+     *
      * @param orderViolation
      */
     @Transactional(rollbackFor = Exception.class)
@@ -77,9 +80,9 @@ public class OrderViolationBiz extends BaseBiz<OrderViolationMapper, OrderViolat
         Map<String, Object> status = mapper.getOrderAndVehicleStatus(orderViolation.getDetailId());
         Integer orderStatus = (Integer) status.get("status");
         Integer refundStatus = (Integer) status.get("refundStatus");
-        if (orderStatus>=6||(refundStatus<=2&&refundStatus!=1)) {
-            mapper.updateByPrimaryKeySelective(orderViolation);
-        }else {
+        if (orderStatus >= 6 || (refundStatus <= 2 && refundStatus != 1)) {
+            updateSelectiveByIdRe(orderViolation);
+        } else {
             throw new BaseException("The operation cannot be changed at this time");
         }
 
@@ -90,11 +93,11 @@ public class OrderViolationBiz extends BaseBiz<OrderViolationMapper, OrderViolat
         String dirPathToday = File.separator + now.toString(DEFAULT_DATE_TIME_FORMATTER);
         String redisNoKey = RedisKey.UPLOAD_FILE_NO_PREFIX + now.toString(DEFAULT_DATE_TIME_FORMATTER);
         Long no = redisTemplate.opsForValue().increment(redisNoKey);
-        if(no.equals(1L)){
-            redisTemplate.expire(redisNoKey,1, TimeUnit.DAYS);
+        if (no.equals(1L)) {
+            redisTemplate.expire(redisNoKey, 1, TimeUnit.DAYS);
         }
         String fileName = file.getOriginalFilename();
-        String realFileRelPath = dirPathToday + File.separator+no+fileName.substring(fileName.lastIndexOf("."));
+        String realFileRelPath = dirPathToday + File.separator + no + fileName.substring(fileName.lastIndexOf("."));
 
         String filePath = ovUpload + realFileRelPath;
 
@@ -105,18 +108,26 @@ public class OrderViolationBiz extends BaseBiz<OrderViolationMapper, OrderViolat
 
     /**
      * 下载行驶证图片
+     *
      * @param realFileRelPath
      * @return
      * @throws Exception
      */
-    public ResponseEntity<byte[]> downloadViolation(String realFileRelPath) throws Exception{
+    public ResponseEntity<byte[]> downloadViolation(String realFileRelPath) throws Exception {
         String filePath = ovUpload + realFileRelPath;
         File file = new File(filePath);//新建一个文件
         HttpHeaders headers = new HttpHeaders();//http头信息
         String downloadFileName = new String(file.getName());//设置编码
         headers.setContentDispositionFormData("attachment", downloadFileName);
         headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-        return new ResponseEntity<byte[]>(FileUtils.readFileToByteArray(file),headers, HttpStatus.CREATED);
+        return new ResponseEntity<byte[]>(FileUtils.readFileToByteArray(file), headers, HttpStatus.CREATED);
     }
 
+
+    /**
+     * 根据订单详情查询违章记录
+     */
+    public OrderViolation getOneByDetailId(Integer detailId) {
+        return mapper.getOneByDetailId(detailId);
+    }
 }

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

@@ -136,7 +136,8 @@ public class OrderCancelBiz {
                     try {
                         AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
                         //处理后台用户提醒短信的发送
-                        orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_CANCEL);
+//                        orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_CANCEL);
+                        orderMsgBiz.handelMsgCancel(orvd, otd, omd, baseOrder, appUserDTO);
                     }catch (Exception e) {
                         log.error(e.getMessage(), e);
                     }

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

@@ -3,22 +3,38 @@ package com.xxfc.platform.order.biz.inner;
 import cn.hutool.core.date.DateUtil;
 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;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.app.entity.Cofig;
+import com.xxfc.platform.app.feign.ConfigFeign;
+import com.xxfc.platform.order.biz.OrderRefundBiz;
 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.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderMemberDetail;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.entity.OrderTourDetail;
+import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.dto.SmsTemplateDTO;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.order.entity.OrderRefund;
 import com.xxfc.platform.universal.feign.ThirdFeign;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
  * 订单退款记录表
@@ -36,6 +52,10 @@ public class OrderMsgBiz {
     public static final int RENT_DELIVERY = 2;
     public static final int RENT_CANCEL = 3;
 
+    //参数
+    public static final String USER_N = "尊敬的客户";
+    public static final String USER_M = "尊贵的会员";
+
 
     @Autowired
     UserFeign userFeign;
@@ -46,6 +66,12 @@ public class OrderMsgBiz {
     @Autowired
     VehicleFeign vehicleFeign;
 
+    @Autowired
+    ConfigFeign configFeign;
+
+    @Autowired
+    OrderRefundBiz orderRefundBiz;
+
     /**
      * 处理App用户提醒短信的发送
      * @param orvd
@@ -175,6 +201,206 @@ public class OrderMsgBiz {
         }
     }
 
+    /**
+     * 支付订单处理提醒短信的发送
+     * @param orvd
+     * @param baseOrder
+     * @param appUserDTO
+     */
+    public void handelMsgPayNew(OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, AppUserDTO appUserDTO) {
+        try {
+            OrderTypeEnum orderTypeEnum = OrderTypeEnum.codeAndDesc.get(baseOrder.getType());
+            Integer smstype;
+            List<String> smsParams = new ArrayList<String>();
+            switch (orderTypeEnum) {
+                case RENT_VEHICLE:
+                    CompanyDetail startCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getStartCompanyId()).getData();
+                    CompanyDetail endCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getEndCompanyId()).getData();
+                    if(null != orvd.getStartCompanyId() && !SYS_FALSE.equals(orvd.getStartCompanyId())) {
+                        //使用免费天数
+                        if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
+                            smstype = SmsTemplateDTO.PAY_B;
+                        }else {
+                            smstype = SmsTemplateDTO.PAY_A;
+                        }
+                        sms2AppUser(orvd, otd, omd, baseOrder, appUserDTO, smstype, smsParams);
+
+                        //后台发送消息(客服)
+                        Cofig cofig = configFeign.getAllByType(ConfigFeign.TYPE_CUS_SER+ "").getData().get(0);
+                        smsParams.clear();
+                        sms2BgUser(cofig.getValue(), startCompanyDetail, endCompanyDetail, orvd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_C, smsParams);
+
+                        //后台发送消息(出车人)
+                        smsParams.clear();
+                        sms2BgUser(startCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_D, smsParams);
+
+                        //后台发送消息(收车人)
+                        smsParams.clear();
+                        sms2BgUser(endCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_E, smsParams);
+
+                    }else {
+                        log.error("通知短信异常，开始公司id 不存在或者为0 订单号：{}", baseOrder.getId());
+                    }
+                    break;
+                case TOUR:
+                    sms2AppUser(orvd, otd, omd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_F, smsParams);
+                    break;
+                case MEMBER:
+                    sms2AppUser(orvd, otd, omd, baseOrder, appUserDTO, SmsTemplateDTO.PAY_G, smsParams);
+                    break;
+                default:
+                    break;
+            }
+        }catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 取消订单处理提醒短信的发送
+     * @param orvd
+     * @param baseOrder
+     * @param appUserDTO
+     */
+    public void handelMsgCancel(OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, AppUserDTO appUserDTO) {
+        try {
+            OrderTypeEnum orderTypeEnum = OrderTypeEnum.codeAndDesc.get(baseOrder.getType());
+            Integer smstype;
+            List<String> smsParams = new ArrayList<String>();
+            switch (orderTypeEnum) {
+                case RENT_VEHICLE:
+                    CompanyDetail startCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getStartCompanyId()).getData();
+                    CompanyDetail endCompanyDetail = vehicleFeign.getCompanyDetail(orvd.getEndCompanyId()).getData();
+                    if(null != orvd.getEndCompanyId() && !SYS_FALSE.equals(orvd.getEndCompanyId())) {
+                        //查询订单退款记录
+                        OrderRefund orderRefund = orderRefundBiz.selectOne(new OrderRefund(){{
+                            setOrderId(baseOrder.getId());
+                            setRefundType(RefundTypeEnum.ORDER_FUND.getCode());
+                        }});
+
+                        //查询押金退款记录
+                        OrderRefund depositOrderRefund = orderRefundBiz.selectOne(new OrderRefund(){{
+                            setOrderId(baseOrder.getId());
+                            setRefundType(RefundTypeEnum.DEPOSIT.getCode());
+                        }});
+
+                        if(BigDecimal.ZERO.equals(orderRefund.getDeductAmount())) {
+                            //使用免费天数
+                            if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
+                                smstype = SmsTemplateDTO.CANCEL_B;
+                            }else {
+                                smstype = SmsTemplateDTO.CANCEL_A;
+                            }
+                        }else {
+                            //使用免费天数
+                            if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
+                                smstype = SmsTemplateDTO.CANCEL_D;
+                            }else {
+                                smstype = SmsTemplateDTO.CANCEL_C;
+                            }
+                        }
+
+                        //发送用户取消消息
+                        sms2RefundAppUser(BigDecimal.ZERO, orderRefund.getDeductAmount(), depositOrderRefund.getRefundAmount().add(orderRefund.getRefundAmount()), BigDecimal.ZERO, baseOrder, appUserDTO, smstype, smsParams);
+
+                        //后台发送消息(出车人)
+                        smsParams.clear();
+                        sms2BgUser(startCompanyDetail.getVehiceServicePhone(), startCompanyDetail, endCompanyDetail, orvd, baseOrder, appUserDTO, SmsTemplateDTO.CANCEL_E, smsParams);
+                    }else {
+                        log.error("通知后台客户短信异常，结束公司id 不存在或者为0 订单号：{}", baseOrder.getId());
+                    }
+                    break;
+                case TOUR:
+                    break;
+                case MEMBER:
+                    break;
+                default:
+                    break;
+            }
+        }catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 订单完成后处理押金提醒短信的发送
+     * @param baseOrder
+     * @param appUserDTO
+     */
+    public void handelMsgDeposit(OrderRentVehicleDetail orvd, BaseOrder baseOrder, AppUserDTO appUserDTO) {
+        try {
+            Integer smstype;
+            List<String> smsParams = new ArrayList<String>();
+            BigDecimal originalAmount;
+            BigDecimal violateAmount;
+            BigDecimal refundAmount;
+            BigDecimal residueAmount;
+            //查询订单退款记录
+            OrderRefund orderRefund;
+            if(RefundStatusEnum.RESIDUE_ILLEGAL.equals(baseOrder.getRefundStatus())) {
+                smstype = SmsTemplateDTO.REFUND_A;
+                orderRefund = orderRefundBiz.selectOne(new OrderRefund(){{
+                    setOrderId(baseOrder.getId());
+                    setRefundType(RefundTypeEnum.PART_DEPOSIT.getCode());
+                }});
+                originalAmount = orvd.getDeposit();
+                violateAmount = orderRefund.getDeductAmount();
+                refundAmount = orderRefund.getRefundAmount();
+                residueAmount = orvd.getReturnPayResidue();
+            }else if(RefundStatusEnum.REFUND_DEPOSIT.equals(baseOrder.getRefundStatus())){
+                smstype = SmsTemplateDTO.REFUND_B;
+                orderRefund = orderRefundBiz.selectOne(new OrderRefund(){{
+                    setOrderId(baseOrder.getId());
+                    setRefundType(RefundTypeEnum.RESIDUE_DEPOSIT.getCode());
+                }});
+                originalAmount = orderRefund.getOriginalRefundAmount();
+                violateAmount = orderRefund.getDeductAmount();
+                refundAmount = orderRefund.getRefundAmount();
+                residueAmount = BigDecimal.ZERO;
+            }else {
+                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, new HashSet<String>() {{
+                    add("当前退款状态不对，订单号："+ baseOrder.getNo());
+                }});
+            }
+
+            //发送用户押金信息退还消息
+            sms2RefundAppUser(originalAmount, violateAmount, refundAmount, residueAmount, baseOrder, appUserDTO, smstype, smsParams);
+        }catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+
+    private void sms2AppUser(OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, AppUserDTO appUserDTO, Integer smstype, List<String> smsParams) {
+        handelSmsParamApp(orvd, otd, omd, baseOrder, smsParams, appUserDTO, smstype);
+        SmsTemplateDTO smsTemplateDTO = new SmsTemplateDTO(){{
+            setPhoneNumbers(appUserDTO.getUsername());
+            setType(smstype);
+            setParams(smsParams.toArray(new String[smsParams.size()]));
+        }};
+        thirdFeign.sendTemplate(smsTemplateDTO);
+    }
+    private void sms2RefundAppUser(BigDecimal originalAmount, BigDecimal violateAmount, BigDecimal refundAmount, BigDecimal residueAmount, BaseOrder baseOrder, AppUserDTO appUserDTO, Integer smstype, List<String> smsParams) {
+        handelDepositSmsParamApp(originalAmount, violateAmount, refundAmount, residueAmount, baseOrder, smsParams, appUserDTO, smstype);
+        SmsTemplateDTO smsTemplateDTO = new SmsTemplateDTO(){{
+            setPhoneNumbers(appUserDTO.getUsername());
+            setType(smstype);
+            setParams(smsParams.toArray(new String[smsParams.size()]));
+        }};
+        thirdFeign.sendTemplate(smsTemplateDTO);
+    }
+
+
+    private void sms2BgUser(String phone,BranchCompany sCompany, BranchCompany eCompany, OrderRentVehicleDetail orvd, BaseOrder baseOrder, AppUserDTO appUserDTO, Integer smstype, List<String> smsParams) {
+        handelSmsParamBg(sCompany, eCompany, orvd, baseOrder, smsParams, appUserDTO, smstype);
+        SmsTemplateDTO smsTemplateDTO = new SmsTemplateDTO(){{
+            setPhoneNumbers(phone);
+            setType(smstype);
+            setParams(smsParams.toArray(new String[smsParams.size()]));
+        }};
+        thirdFeign.sendTemplate(smsTemplateDTO);
+    }
+
     private void handelSmsParam(OrderRentVehicleDetail orvd, BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int handelType) {
         if(RENT_DELIVERY == handelType) {
             smsParams.add(appUserDTO.getRealname());
@@ -194,4 +420,136 @@ public class OrderMsgBiz {
         }
     }
 
+    private void handelSmsParamApp(OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int paramHandelType) {
+        switch (paramHandelType) {
+            case SmsTemplateDTO.PAY_A :
+                if(0 < baseOrder.getMemberLevel() ) {
+                    smsParams.add(USER_M);
+                }else {
+                    smsParams.add(USER_N);
+                }
+                smsParams.add(baseOrder.getRealAmount().toString());
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
+                smsParams.add(orvd.getStartAddr());
+                break;
+            case SmsTemplateDTO.PAY_B :
+                smsParams.add(orvd.getFreeDays().toString());
+                smsParams.add(appUserDTO.getRentFreeDays().toString());
+                smsParams.add(baseOrder.getRealAmount().toString());
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
+                smsParams.add(orvd.getStartAddr());
+                break;
+            case SmsTemplateDTO.PAY_F :
+                smsParams.add(baseOrder.getName());
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(otd.getStartTime())));
+                smsParams.add(otd.getStartAddr());
+                break;
+            case SmsTemplateDTO.PAY_G :
+                smsParams.add(baseOrder.getRealAmount().toString());
+                smsParams.add(omd.getRentFreeNum().toString());
+                smsParams.add(appUserDTO.getRentFreeDays().toString());
+                break;
+            case SmsTemplateDTO.CANCEL_A :
+                if(0 < baseOrder.getMemberLevel() ) {
+                    smsParams.add(USER_M);
+                }else {
+                    smsParams.add(USER_N);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void handelDepositSmsParamApp(BigDecimal originalAmount, BigDecimal violateAmount, BigDecimal refundAmount, BigDecimal residueAmount,BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int paramHandelType) {
+        switch (paramHandelType) {
+            case SmsTemplateDTO.CANCEL_C :
+                if(0 < baseOrder.getMemberLevel() ) {
+                    smsParams.add(USER_M);
+                }else {
+                    smsParams.add(USER_N);
+                }
+                smsParams.add(violateAmount.toString());
+                smsParams.add(refundAmount.toString());
+                break;
+            case SmsTemplateDTO.CANCEL_D :
+                smsParams.add(violateAmount.toString());
+                smsParams.add(refundAmount.toString());
+                break;
+            case SmsTemplateDTO.REFUND_A:
+                Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+                Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
+                if(0 < baseOrder.getMemberLevel() ) {
+                    smsParams.add(USER_M);
+                }else {
+                    smsParams.add(USER_N);
+                }
+                smsParams.add(baseOrder.getNo());
+                smsParams.add(originalAmount.toString());
+                smsParams.add(violateAmount.toString());
+                smsParams.add(refundAmount.toString());
+                smsParams.add(residueAmount.toString());
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(baseOrder.getRefundTime() + Long.valueOf(rentDepositAutoRefundTime * 60 * 60 * 1000))));
+                break;
+            case SmsTemplateDTO.REFUND_B:
+                if(0 < baseOrder.getMemberLevel() ) {
+                    smsParams.add(USER_M);
+                }else {
+                    smsParams.add(USER_N);
+                }
+                smsParams.add(baseOrder.getNo());
+                smsParams.add(originalAmount.toString());
+                smsParams.add(violateAmount.toString());
+                smsParams.add(refundAmount.toString());
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void handelSmsParamBg(BranchCompany sCompany, BranchCompany eCompany, OrderRentVehicleDetail orvd, BaseOrder baseOrder, List<String> smsParams, AppUserDTO appUserDTO, int paramHandelType) {
+        switch (paramHandelType) {
+            case SmsTemplateDTO.PAY_C :
+                smsParams.add(appUserDTO.getRealname());
+                smsParams.add(appUserDTO.getUsername());
+                smsParams.add(baseOrder.getName());
+                smsParams.add(sCompany.getName());
+                smsParams.add(sCompany.getVehiceServicePhone());
+                smsParams.add(eCompany.getName());
+                smsParams.add(eCompany.getVehiceServicePhone());
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getEndTime())));
+                smsParams.add(orvd.getDayNum().toString());
+                break;
+            case SmsTemplateDTO.PAY_D :
+                smsParams.add(appUserDTO.getRealname());
+                smsParams.add(appUserDTO.getUsername());
+                smsParams.add(baseOrder.getName());
+                smsParams.add(sCompany.getName());
+                smsParams.add(eCompany.getName());
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getEndTime())));
+                smsParams.add(orvd.getDayNum().toString());
+                break;
+            case SmsTemplateDTO.PAY_E :
+                smsParams.add(appUserDTO.getRealname());
+                smsParams.add(appUserDTO.getUsername());
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
+                smsParams.add(sCompany.getName());
+                smsParams.add(baseOrder.getName());
+                break;
+            case SmsTemplateDTO.CANCEL_E :
+                smsParams.add(appUserDTO.getRealname());
+                smsParams.add(appUserDTO.getUsername());
+                smsParams.add(baseOrder.getName());
+                smsParams.add(sCompany.getName());
+                smsParams.add(eCompany.getName());
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getStartTime())));
+                smsParams.add(DateUtil.formatDateTime(DateUtil.date(orvd.getEndTime())));
+                smsParams.add(orvd.getDayNum().toString());
+                break;
+            default:
+                break;
+        }
+    }
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/FeignHeadConfiguration.java

@@ -44,7 +44,7 @@ public class FeignHeadConfiguration {
                             log.debug("添加自定义请求头key:" + name + ",value:" + value);
                             requestTemplate.header(name, value);
                         } else {
-                            log.debug("FeignHeadConfiguration", "非自定义请求头key:" + name + ",value:" + value + "不需要添加!");
+                            //log.debug("FeignHeadConfiguration", "非自定义请求头key:" + name + ",value:" + value + "不需要添加!");
                         }
                     }
                 } else {

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

@@ -57,7 +57,8 @@ public class WebConfiguration implements WebMvcConfigurer {
                 "/baseOrder/**",
                 "/orderTour/**",
                 "/orderMember/**",
-                "/orderRefund/**"
+                "/orderRefund/**",
+                "/orderVehicle/**"
         };
         Collections.addAll(list, urls);
         return list;

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

 package com.xxfc.platform.order.jobhandler;
 
-import cn.hutool.json.JSONUtil;
-import com.github.wxiaoqi.security.common.util.IntervalUtil;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.xxfc.platform.order.biz.*;
-import com.xxfc.platform.order.contant.enumerate.*;
+import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
+import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
+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.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
-import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
 import com.xxfc.platform.order.entity.OrderViolation;
-import com.xxfc.platform.order.pojo.DedDetailDTO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -46,7 +47,7 @@ public class RentDepositJobHandler extends IJobHandler {
     OrderRentVehicleBiz orderRentVehicleBiz;
 
     @Autowired
-    OrderVehicalCrosstownBiz crosstownBiz;
+    OrderVehicleCrosstownBiz crosstownBiz;
 
     @Autowired
     OrderViolationBiz orderViolationBiz;
@@ -54,25 +55,32 @@ public class RentDepositJobHandler extends IJobHandler {
     @Autowired
     OrderRefundBiz orderRefundBiz;
 
+    @Autowired
+    OrderMsgBiz orderMsgBiz;
+
     @Autowired
     ThirdFeign thirdFeign;
 
+    @Autowired
+    UserFeign userFeign;
+
     @Override
     public ReturnT<String> execute(String idLastNumInterval) throws Exception {
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
         Integer rentDepositAutoRefundTime = new Integer(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.RENT_DEPOSIT_AUTO_REFUND_TIME).getDetail());
 
         try {
-            for(int i = 0; i < 10; i++) {
-                if(IntervalUtil.staticIsInTheInterval(String.valueOf(i), idLastNumInterval)) {
+//            for(int i = 0; i < 10; i++) {
+//                if(IntervalUtil.staticIsInTheInterval(String.valueOf(i), idLastNumInterval)) {
                     //三十天
                     List<BaseOrder> lists = baseOrderBiz.selectByExample(new Example.Builder(BaseOrder.class)
                             //订单已完成的租车订单
                             .where(WeekendSqls.<BaseOrder>custom().andEqualTo(BaseOrder::getType, OrderTypeEnum.RENT_VEHICLE)
                                     .andEqualTo(BaseOrder::getStatus, OrderStatusEnum.ORDER_FINISH) //已完成的订单
                                     .andEqualTo(BaseOrder::getRefundStatus, RefundStatusEnum.RESIDUE_ILLEGAL) //已归还了部分押金
-                                    .andLessThanOrEqualTo(BaseOrder::getRefundTime, System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 60 * 1000))
-                                    .andLike(BaseOrder::getId, "%"+ i)).build());
+                                    .andLessThanOrEqualTo(BaseOrder::getRefundTime, System.currentTimeMillis() - (rentDepositAutoRefundTime * 60 * 1000))
+//                                    .andLike(BaseOrder::getId, "%"+ i)
+                            ).build());
 
                     //处理自动退剩余押金
                     for(BaseOrder baseOrder : lists) {
@@ -90,15 +98,15 @@ public class RentDepositJobHandler extends IJobHandler {
                         String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章扣款："+ refundAmont.toString();
                         refundDesc += ")";
                         orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
+                        orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
                     }
 
-                }
-            }
-            ReturnT returnT = new ReturnT(){{
-                setCode(100);
-                setMsg("成功");
-                setContent(idLastNumInterval);
-            }};
+//                }
+//            }
+            ReturnT returnT = new ReturnT();
+            returnT.setCode(100);
+            returnT.setMsg("成功");
+            returnT.setContent(idLastNumInterval);
             return returnT;
         } catch (Exception e) {
             XxlJobLogger.log(e);

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

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.DepositRefundRecord;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+public interface DepositRefundRecordMapper extends Mapper<DepositRefundRecord> {
+    DepositRefundRecord findByCrossIdAndStatus(Map<String, Object> map);
+    List<DepositRefundRecord> selectByCrossId(Integer crossId);
+}
\ No newline at end of file

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

@@ -5,9 +5,10 @@ import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 public interface OrderVehicaleCrosstownMapper extends Mapper<OrderVehicleCrosstown> {
 
     List<OrderVehicleCrosstownDto> selectByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto);
-
+    OrderVehicleCrosstownDto selectByOrderNo(Map<String, Object> map);
 }
\ No newline at end of file

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

@@ -12,4 +12,6 @@ import java.util.Map;
 public interface OrderViolationMapper extends Mapper<OrderViolation> {
 
     Map<String,Object> getOrderAndVehicleStatus(@Param("vId") Integer detailId);
+
+    OrderViolation getOneByDetailId(Integer detailId);
 }

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

@@ -157,7 +157,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @ApiOperation(value = "交还车租车订单列表")
     @IgnoreClientToken
     public ObjectRestResponse<List<OrderPageVO>> getVehicleList(BaseOrderController.QueryOrderList dto) {
-        log.info("请求参数：dto = {}", dto);
+        log.info("交还车租车订单列表请求参数：dto = {}", dto);
         if (dto.getStartTime() != null) {
             if (dto.getEndTime() == null) {
                 dto.setEndTime(new Date().getTime());
@@ -199,10 +199,14 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @IgnoreClientToken
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> getOrderDetail(String orderNo) {
+        UserDTO userDTO = getAdminUserInfo();
+        if (userDTO == null) {
+            return ObjectRestResponse.succ(new PageDataVO<>());
+        }
         if (StringUtils.isBlank(orderNo)) {
             return ObjectRestResponse.paramIsEmpty();
         }
-        return baseOrderBiz.getOrderDetail(orderNo);
+        return baseOrderBiz.getOrderDetail(orderNo, userDTO);
     }
 
 

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

@@ -3,11 +3,9 @@ package com.xxfc.platform.order.rest;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
-import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
@@ -18,25 +16,26 @@ import com.github.wxiaoqi.security.common.util.ClientUtil;
 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.xxfc.platform.order.biz.*;
+import com.xxfc.platform.order.biz.BaseOrderBiz;
+import com.xxfc.platform.order.biz.OrderItemBiz;
+import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
+import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
 import com.xxfc.platform.order.biz.inner.OrderCancelBiz;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderItem;
-import com.xxfc.platform.order.entity.OrderUserLicense;
 import com.xxfc.platform.order.mqhandler.RabbitProduct;
-import com.xxfc.platform.order.pojo.order.*;
+import com.xxfc.platform.order.pojo.order.CancelOrderDTO;
+import com.xxfc.platform.order.pojo.order.OrderAboutParamDTO;
+import com.xxfc.platform.order.pojo.order.OrderPageVO;
+import com.xxfc.platform.order.pojo.order.QueryOrderDTO;
 import com.xxfc.platform.order.pojo.pay.NotifyUrlDTO;
 import com.xxfc.platform.order.pojo.pay.OrderPayDTO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.universal.vo.OrderPayVo;
-import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -53,8 +52,8 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.List;
+import java.util.Map;
 
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
@@ -74,9 +73,6 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @Autowired
     OrderUserLicenseBiz orderUserLicenseBiz;
 
-    @Autowired
-    OrderVehicalCrosstownBiz orderVehicalCrosstownBiz;
-
     @Autowired
     OrderCancelBiz orderCancelBiz;
 

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

@@ -3,14 +3,13 @@ package com.xxfc.platform.order.rest;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
-import com.xxfc.platform.order.biz.OrderVehicalCrosstownBiz;
+import com.xxfc.platform.order.biz.OrderVehicleCrosstownBiz;
 import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -22,7 +21,7 @@ import java.util.List;
 public class OrderVehicleCrosstownController {
 
     @Autowired
-    OrderVehicalCrosstownBiz orderVehicalCrosstownBiz;
+    OrderVehicleCrosstownBiz orderVehicleCrosstownBiz;
 
     @Autowired
     OrderUserLicenseBiz orderUserLicenseBiz;
@@ -32,16 +31,15 @@ public class OrderVehicleCrosstownController {
 
     @PostMapping(value = "/add")
     @ApiOperation(value = "添加交还车记录")
-    @Transactional
     public ObjectRestResponse<OrderVehicleCrosstownDto> add(@RequestBody OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
 
-            return orderVehicalCrosstownBiz.add(orderVehicleCrosstownDto);
+            return orderVehicleCrosstownBiz.add(orderVehicleCrosstownDto);
     }
 
     @GetMapping(value = "/{id}")
     @ApiOperation(value = "查询记录信息")
     public ObjectRestResponse<OrderVehicleCrosstown> get(@PathVariable Integer id) {
-        return ObjectRestResponse.succ(orderVehicalCrosstownBiz.get(id));
+        return ObjectRestResponse.succ(orderVehicleCrosstownBiz.get(id));
     }
 
     @GetMapping(value = "/getByOrderId")
@@ -50,6 +48,15 @@ public class OrderVehicleCrosstownController {
         if (orderVehicleCrosstownDto == null) {
             return ObjectRestResponse.createFailedResult(500, "参数orderId为空");
         }
-        return ObjectRestResponse.succ(orderVehicalCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto));
+        return ObjectRestResponse.succ(orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto));
     }
+    @GetMapping(value = "/getByOrderNo")
+    @ApiOperation(value = "根据订单号返回交车和押金记录")
+    public ObjectRestResponse getByOrderNo(String no) {
+        if (no == null) {
+            return ObjectRestResponse.createFailedResult(500, "参数orderId为空");
+        }
+        return ObjectRestResponse.succ(orderVehicleCrosstownBiz.selectByOrderNo(no));
+    }
+
 }

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

@@ -3,12 +3,15 @@ package com.xxfc.platform.order.rest;
 
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 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.process.ResultCode;
+import com.xxfc.platform.order.biz.OrderDepositRefundRecordBiz;
 import com.xxfc.platform.order.biz.OrderViolationBiz;
 import com.xxfc.platform.order.entity.OrderViolation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.Assert;
@@ -19,7 +22,6 @@ import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigInteger;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -29,25 +31,21 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("orderViolation")
-public class OrderViolationController extends BaseController<OrderViolationBiz, OrderViolation> {
+@Slf4j
+public class OrderViolationController extends BaseController<OrderViolationBiz, OrderViolation> implements UserRestInterface {
 
     @Autowired
     private UserFeign userFeign;
+    @Autowired
+    OrderDepositRefundRecordBiz orderDepositRefundRecordBiz;
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
 
     private Long MAX_DRIVING_LICENSE_SIZE = 1024 * 1024 * 50L;
 
     private final String  FILE_TYPE="JPG";
-    /**
-     * 获取操作用户信息
-     */
-    private UserDTO getUserDTO() {
-        ObjectRestResponse<UserDTO> orrUserDTO = userFeign.userinfoByToken(request.getHeader("Authorization"));
-        if (orrUserDTO == null || orrUserDTO.getData() == null || orrUserDTO.getData().getId() == null) {
-            throw new BaseException("This user does not exist");
-        }
-        UserDTO userDTOD = orrUserDTO.getData();
-        return userDTOD;
-    }
 
     /**
      * 保存违章记录
@@ -58,9 +56,8 @@ public class OrderViolationController extends BaseController<OrderViolationBiz,
      */
     @PostMapping("/saveOrderViolation")
     public ObjectRestResponse saveOrderViolation(@RequestBody OrderViolation orderViolation, HttpServletRequest request) {
-
-
-        UserDTO userDTOD = getUserDTO();
+        log.info("保存违章记录：orderViolation = {}", orderViolation.toString());
+        UserDTO userDTOD = getAdminUserInfo();
         if (orderViolation.getId()==null) {
             orderViolation.setIsDel(0);
             orderViolation.setCrtHost(request.getRemoteHost());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -172,32 +172,20 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         for(AccompanyingItemVo aiv : accompanyingItemList) {
             if(AccompanyingItemType.TOOL.getCode().equals(aiv.getType())
                 || AccompanyingItemType.EQUIPMENT.getCode().equals(aiv.getType())) {
-                OrderAccompanyDTO orderAccompanyDTO = new OrderAccompanyDTO();
-                orderAccompanyDTO.setId(aiv.getId());
-                orderAccompanyDTO.setName(aiv.getName());
-                orderAccompanyDTO.setUnit(aiv.getUnit());
+                OrderAccompanyDTO orderAccompanyDTO = BeanUtil.toBean(aiv, OrderAccompanyDTO.class);
                 orderAccompanyDTO.setUnitPrice(aiv.getPrice());
                 orderAccompanyDTO.setNum(aiv.getNumber());
                 oads.add(orderAccompanyDTO);
             }else {
                 OrderAccompanyDTO orderAccompanyDTO = orderAccompanyDTOMap.get(aiv.getId().toString());
                 if(null != orderAccompanyDTO) {
-                    orderAccompanyDTO.setName(aiv.getName());
-                    orderAccompanyDTO.setUnit(aiv.getUnit());
+                    BeanUtil.copyProperties(aiv, orderAccompanyDTO);
                     orderAccompanyDTO.setUnitPrice(aiv.getPrice());
                     oads.add(orderAccompanyDTO);
                 }
             }
         }
         bo.setAccompanyItems(oads);
-//        for(OrderAccompanyDTO oad : bo.getAccompanyItems()) {
-//            AccompanyingItemVo aiv = accompanyingItemMap.get(oad.getId().toString());
-//            oad.setName(aiv.getName());
-//            oad.setUnit(aiv.getUnit());
-//            oad.setUnitPrice(aiv.getPrice());
-//            oad.setNum(aiv.getNumber());
-//            oad.setTotalAmount(oad.getUnitPrice().multiply(new BigDecimal(oad.getNum().toString())));
-//        }
 
         //获取可用车辆
         acquireVehicle(bo);

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

@@ -15,7 +15,7 @@
         </plugin>
 
         <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="jdbc:mysql://10.5.52.3:3306/xxfc_activity?useUnicode=true&amp;characterEncoding=UTF8"
+                        connectionURL="jdbc:mysql://10.5.52.4:3307/xxfc_order?useUnicode=true&amp;characterEncoding=UTF8"
                         userId="root"
                         password="sslcloud123*()">
         </jdbcConnection>
@@ -37,10 +37,6 @@
 <!--        </table>-->
 <!--        <table tableName="branch_company_stock_info" domainObjectName="BranchCompanyStockInfo"></table>-->
 <!--        <table tableName="branch_company_stock_apply_info" domainObjectName="BranchCompanyStockApplyInfo"></table>-->
-            <table tableName="integral_rule" domainObjectName="IntegralRule"></table>
-            <table tableName="integral_sign_record" domainObjectName="IntegralSignRecord"></table>
-            <table tableName="integral_user_total" domainObjectName="IntegralUserTotal"></table>
-            <table tableName="integral_user_record" domainObjectName="IntegralUserRecord"></table>
-<!--        <table tableName="integeral_user_record" domainObjectName="VehicleUpkeepLog"></table>-->
+            <table tableName="deposit_refund_record" domainObjectName="DepositRefundRecord"></table>
     </context>
 </generatorConfiguration>
\ No newline at end of file

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

@@ -172,7 +172,11 @@
         <if test="userId != null">
             and b.user_id = #{userId}
         </if>
-        <if test="status != null">
+        <if test="status != null and status == -1">
+            AND b.status in (6,-1)
+            and b.refund_status in (0,2)
+        </if>
+        <if test="status != null and status != -1">
             and b.status = #{status}
         </if>
         <if test="no != null">
@@ -181,13 +185,19 @@
         <if test="startTime != null and status == 4">
             and r.start_time between #{startTime} and #{endTime}
         </if>
-        <if test="startTime != null and status == 5">
-            and r.start_time between #{startTime} and #{endTime}
+        <if test="startTime != null and (status == 5 || status == 6 || status == -1)">
+            and r.end_time between #{startTime} and #{endTime}
         </if>
         <if test="startCompanyId != null">
             and r.start_company_id = #{startCompanyId}
         </if>
-        order by b.crt_time desc
+        <if test="status == 4">
+            order by r.start_time
+        </if>
+        <if test="status == 5 || status == -1">
+            order by r.end_time
+        </if>
+
     </select>
 
     <select id="getTourList" parameterType="Map" resultMap="orderPageMap">
@@ -220,5 +230,4 @@
     </select>
 
 
-
 </mapper>
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/DepositRefundRecordMapper.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.order.mapper.DepositRefundRecordMapper">
+
+    <select id="findByCrossIdAndStatus" resultType="com.xxfc.platform.order.entity.DepositRefundRecord"
+            parameterType="java.util.Map">
+     select * from deposit_refund_record
+     where status = #{status} and crosstown_id = #{crossId} and isshow = 1
+  </select>
+    <select id="selectByCrossId" resultType="com.xxfc.platform.order.entity.DepositRefundRecord"
+            parameterType="java.lang.Integer">
+     select * from deposit_refund_record
+     where crosstown_id = #{crossId} and isshow = 1
+     order by status
+  </select>
+</mapper>
\ No newline at end of file

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

@@ -27,7 +27,12 @@
       <result column="rest_deposit" jdbcType="INTEGER" property="restDeposit"/>
       <result column="user_license_id" jdbcType="VARCHAR" property="userLicenseId"/>
   </resultMap>
-
+    <resultMap id="orderMap" type="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">
+        <result column="id" javaType="java.lang.Integer" property="id"/>
+        <association column="id" property="depositRefundRecord"
+                     select="com.xxfc.platform.order.mapper.DepositRefundRecordMapper.selectByCrossId"
+                     javaType="com.xxfc.platform.order.entity.DepositRefundRecord"/>
+    </resultMap>
     <select id="selectByOrderId" parameterType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto" resultType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">
         select *
         from order_vehicle_crosstown
@@ -46,4 +51,10 @@
             </if>
         </where>
     </select>
+    <select id="selectByOrderNo" parameterType="java.util.Map" resultType="com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto">
+        select *
+        from order_vehicle_crosstown
+        where order_no = #{no} and type = #{type}
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -14,4 +14,9 @@
      where
      v.id=#{vId}
     </select>
+
+    <select id="getOneByDetailId" resultType="com.xxfc.platform.order.entity.OrderViolation" parameterType="java.lang.Integer">
+        select * from order_violation
+        where detail_id = #{detailId}
+    </select>
 </mapper>
\ No newline at end of file

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/SmsTemplateDTO.java

@@ -59,9 +59,9 @@ public class SmsTemplateDTO {
     public static final int CANCEL_E = 21;
 
     //租车押金退还
-    public static final int FINISH_A = 22;
+    public static final int REFUND_A = 22;
     //违章押金退还
-    public static final int FINISH_B = 23;
+    public static final int REFUND_B = 23;
 
 
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/ResCode/ResCode.java

@@ -28,6 +28,8 @@ public enum ResCode {
     VEHICLE_DEPARTURE_VEHICLE_DISABLE(104002,"车辆不可用"),
     VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE(104003,"车辆未出车"),
 
+    VEHICLE_BOOK_RECORD_IS_NOT_EXIST(104004, "预约记录不存在"),
+
     BRANCH_COMPANY_UNEXIST(105001, "分公司信息不存在"),
     BRANCH_COMPANY_STOCK_EXISTED(105002, "分公司股权信息已存在"),
     BRANCH_COMPANY_STOCK_UNEXIST(105003, "分公司股权信息不存在"),

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

@@ -77,7 +77,9 @@ public class VehicleDepartureLog {
      * 还车分公司
      */
     Integer arrivalBranchCompanyId;
+
     Date createTime;
+
     Date updateTime;
 
     Integer state;
@@ -86,8 +88,17 @@ public class VehicleDepartureLog {
      * 预约记录id
      */
     Integer bookRecordId;
-
+    //违章图片，逗号分隔
     String illegalPic;
-
+    //违章金额
     Integer illegalAmount;
+
+    //出车图片
+    String departurePic;
+    //收车图片
+    String arrivalPic;
+    //备注
+    String departureRemark;
+
+    String arrivalRemark;
 }

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

@@ -21,7 +21,7 @@ public interface VehicleFeign {
     @GetMapping(value = "/vehicleModel/{id}")
     public ObjectRestResponse<VehicleModel> get(@PathVariable(value = "id") int id);
 
-    @GetMapping(value = "/vehicleInfo/{id}")
+    @GetMapping(value = "/vehicleInfo/app/unauth/{id}")
     public ObjectRestResponse<Vehicle> get(@PathVariable(value = "id") String id);
 
     @RequestMapping(value = "/vehicleInfo/findById", method = RequestMethod.GET)

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

@@ -27,4 +27,17 @@ public class VehicleArrivalVo {
      */
     Integer arrivalBranchCompanyId;
 
+    //收车图片
+    String arrivalPic;
+
+    //备注
+    String remark;
+
+    //违章图片，逗号分隔
+    String illegalPic;
+    //违章金额
+    Integer illegalAmount;
+
+    Integer bookRecordId;
+
 }

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.vehicle.pojo;
 
 import com.xxfc.platform.vehicle.entity.VehicleBookHourInfo;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
+import com.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
 import lombok.Data;
 
 import java.util.List;
@@ -32,4 +33,7 @@ public class VehicleBookRecordVo extends VehicleBookRecord {
     private Integer liftStatus;
 
     private Integer retStatus;
+
+    List<VehicleUpkeepItem> vehicleUpkeepItems;
+
 }

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

 package com.xxfc.platform.vehicle.pojo;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
 import lombok.Data;
 
 @Data
@@ -31,4 +34,19 @@ public class VehicleDepartureLogVo {
     String illegalPic;
 
     Integer illegalAmount;
+    //出车图片
+    String departurePic;
+    //收车图片
+    String arrivalPic;
+    //备注
+    String departureRemark;
+
+    String arrivalRemark;
+
+    public VehicleDepartureLog getVehicleDeparture(VehicleDepartureLogVo vehicleDepartureLogVo) {
+        VehicleDepartureLog departureLog = new VehicleDepartureLog();
+        BeanUtil.copyProperties(vehicleDepartureLogVo, departureLog, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+        return departureLog;
+    }
+
 }

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

@@ -50,4 +50,14 @@ public class VehicleDepartureVo {
      */
     Integer bookRecordId;
 
+    //出车图片
+    String departurePic;
+
+    //备注
+    String remark;
+
+    //违章图片，逗号分隔
+    String illegalPic;
+    //违章金额
+    Integer illegalAmount;
 }

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

@@ -7,12 +7,12 @@ import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.entity.AccompanyingItem;
 import com.xxfc.platform.vehicle.mapper.AccompanyingItemMapper;
 import com.xxfc.platform.vehicle.pojo.AddOrUpdateAccompanyingItem;
-import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.pojo.QueryAccompanyItemVo;
 import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import lombok.extern.slf4j.Slf4j;
@@ -21,14 +21,15 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
-import java.lang.reflect.Array;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service

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

@@ -65,17 +65,20 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     UserFeign userFeign;
 
     @Override
-    public UserFeign getUserFeign() {return userFeign;}
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
 
 
     @Value("${branchCompanyPic.baseUploadPath}")
-    private String baseUploadPath ;
+    private String baseUploadPath;
 
     @Autowired
     private VehicleBiz vehicleBiz;
 
     /**
      * 按主键获取公司
+     *
      * @param id
      * @return
      */
@@ -84,17 +87,17 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     }
 
     public List<BranchCompany> selectByZoneId(Integer zoneId) {
-        if(zoneId == null) {
+        if (zoneId == null) {
             return null;
         }
         UserDTO userDTO = getAdminUserInfo();
-        if(userDTO == null) {
+        if (userDTO == null) {
             return null;
         }
         Map<String, Object> map = new HashedMap<>();
         map.put("zoneId", zoneId);
         List<Integer> branchCompanies = Lists.newArrayList();
-        if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
+        if (DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
             branchCompanies = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
         }
         map.put("ids", branchCompanies);
@@ -103,15 +106,16 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
 
     /**
      * 获取公司信息
+     *
      * @param id
      * @return
      */
-    @Cache(key= RedisKey.BRANCH_COMPANY_CACHE)
+    @Cache(key = RedisKey.BRANCH_COMPANY_CACHE)
     public CompanyDetail getDetailById(Integer id) {
         BranchCompany branchCompany = this.getById(id);
         CompanyDetail detail = null;
-        if(branchCompany != null) {
-            List<SysRegion> sysRegions = sysRegionBiz.getRegionsByCodes(new ArrayList<Long>(){{
+        if (branchCompany != null) {
+            List<SysRegion> sysRegions = sysRegionBiz.getRegionsByCodes(new ArrayList<Long>() {{
                 add(Long.valueOf(branchCompany.getAddrProvince()));
                 add(Long.valueOf(branchCompany.getAddrCity()));
                 add(Long.valueOf(branchCompany.getAddrTown()));
@@ -122,23 +126,24 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         return detail;
     }
 
-    public Boolean exits(Integer id){
+    public Boolean exits(Integer id) {
         BranchCompany param = new BranchCompany();
         param.setId(id);
-        return mapper.selectCount(param)>0;
+        return mapper.selectCount(param) > 0;
     }
 
     /**
      * 转换为vo类
+     *
      * @param branchCompanies
      * @returns
      */
-    private List<BranchCompanyVo> branchCompany2VO(List<BranchCompany> branchCompanies){
+    private List<BranchCompanyVo> branchCompany2VO(List<BranchCompany> branchCompanies) {
         List<BranchCompanyVo> branchCompanyVoList = Lists.newArrayList();
-        if(CollectionUtils.isNotEmpty(branchCompanies)){
-            for(BranchCompany branchCompany:branchCompanies){
+        if (CollectionUtils.isNotEmpty(branchCompanies)) {
+            for (BranchCompany branchCompany : branchCompanies) {
                 BranchCompanyVo branchCompanyVo = new BranchCompanyVo();
-                BeanUtils.copyProperties(branchCompany,branchCompanyVo);
+                BeanUtils.copyProperties(branchCompany, branchCompanyVo);
                 branchCompanyVoList.add(branchCompanyVo);
             }
         }
@@ -146,28 +151,28 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     }
 
     public PageDataVO<BranchCompany> getAll(Integer page, Integer limit, Integer addrProvince, Integer addrCity,
-                                            Integer addrTown, UserDTO userDTO){
+                                            Integer addrTown, UserDTO userDTO) {
         Example example = new Example(BranchCompany.class);
         Example.Criteria criteria = example.createCriteria();
-        if(addrProvince!=null) {
+        if (addrProvince != null) {
             criteria.andCondition(" addr_province = '" + addrProvince + "'");
         }
-        if(addrCity!=null) {
+        if (addrCity != null) {
             criteria.andCondition(" addr_city = '" + addrCity + "'");
         }
-        if(addrTown!=null) {
+        if (addrTown != null) {
             criteria.andCondition(" addr_town = '" + addrTown + "'");
         }
-        if(userDTO != null && DATA_ALL_FALSE.equals(userDTO.getDataAll())) {
-            if(StringUtils.isNotBlank(userDTO.getDataZone())) {
+        if (userDTO != null && DATA_ALL_FALSE.equals(userDTO.getDataAll())) {
+            if (StringUtils.isNotBlank(userDTO.getDataZone())) {
                 criteria.andIn(COMPANY_ZONE_ID, userDTO.dataZone2List());
             }
-            if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
+            if (StringUtils.isNotBlank(userDTO.getDataCompany())) {
                 criteria.andIn(ID, userDTO.dataCompany2List());
             }
         }
         example.setOrderByClause("`id` asc");
-        PageHelper.startPage(page,limit);
+        PageHelper.startPage(page, limit);
         PageInfo<BranchCompany> branchCompanyPageInfo = new PageInfo<>(mapper.selectByExample(example));
         return PageDataVO.pageInfo(branchCompanyPageInfo);
     }
@@ -179,53 +184,55 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     }
 
 
-
-    @Cache(key= RedisKey.BRANCH_COMPANY_CACHE_ALL)
-    public List<BranchCompany> getAll(){
+    @Cache(key = RedisKey.BRANCH_COMPANY_CACHE_ALL)
+    public List<BranchCompany> getAll() {
         return mapper.selectAll();
     }
 
     /**
      * 增加公司，返回id
+     *
      * @param branchCompanyVo
      * @return
      */
-    @CacheClear(pre= RedisKey.BRANCH_COMPANY_CACHE)
-    public Integer add(BranchCompanyVo branchCompanyVo){
+    @CacheClear(pre = RedisKey.BRANCH_COMPANY_CACHE)
+    public Integer add(BranchCompanyVo branchCompanyVo) {
         BranchCompany branchCompany = new BranchCompany();
-        BeanUtils.copyProperties(branchCompanyVo,branchCompany);
+        BeanUtils.copyProperties(branchCompanyVo, branchCompany);
         mapper.insertSelective(branchCompany);
         return branchCompany.getId();
     }
 
-    @CacheClear(pre= RedisKey.BRANCH_COMPANY_CACHE)
-    public void del(Integer id){
+    @CacheClear(pre = RedisKey.BRANCH_COMPANY_CACHE)
+    public void del(Integer id) {
         mapper.deleteByPrimaryKey(id);
     }
 
     /**
      * 更新公司信息
+     *
      * @param branchCompany
      * @return
      */
     @CacheClear(pre = RedisKey.BRANCH_COMPANY_CACHE)
-    public Integer update(BranchCompany branchCompany){
+    public Integer update(BranchCompany branchCompany) {
         return mapper.updateByPrimaryKeySelective(branchCompany);
     }
 
     /**
      * 写入上传文件，返回相对路径
+     *
      * @param file
      * @return
      */
-    public RestResponse<String> uploadCompanyPic(MultipartFile file) throws Exception{
+    public RestResponse<String> uploadCompanyPic(MultipartFile file) throws Exception {
         //创建本日存放目录
         DateTime now = DateTime.now();
         String dirPathToday = File.separator + now.toString(DEFAULT_DATE_TIME_FORMATTER);
         String redisNoKey = RedisKey.UPLOAD_FILE_NO_PREFIX + now.toString(DEFAULT_DATE_TIME_FORMATTER);
         Long no = customRedisTemplate.opsForValue().increment(redisNoKey);
-        if(no.equals(1l)){
-            customRedisTemplate.expire(redisNoKey,1, TimeUnit.DAYS);
+        if (no.equals(1l)) {
+            customRedisTemplate.expire(redisNoKey, 1, TimeUnit.DAYS);
         }
         String fileName = file.getOriginalFilename();
         String realFileRelPath = dirPathToday + File.separator + no + fileName.substring(fileName.lastIndexOf("."));
@@ -236,9 +243,9 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         return RestResponse.suc(realFileRelPath);
     }
 
-    @Cache(key=BRANCH_COMPANY_CACHE_DATAZONE)
+    @Cache(key = BRANCH_COMPANY_CACHE_DATAZONE)
     public List<BranchCompany> dataCompany(String dataZone) {
-        if(StringUtils.isBlank(dataZone)) {
+        if (StringUtils.isBlank(dataZone)) {
             return new ArrayList<BranchCompany>();
         }
         List<Integer> zoneIds = Arrays.asList(dataZone.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
@@ -248,42 +255,43 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         return zoneCompanys;
 
     }
-    public RestResponse<String> importExcel(MultipartFile multipartfile, HttpServletRequest request){
+
+    public RestResponse<String> importExcel(MultipartFile multipartfile, HttpServletRequest request) {
         try {
             List<String[]> readExcel = ExcelImport.getExcelData(multipartfile);
-            if(readExcel.size()<1){
-                return RestResponse.codeAndMessage(1001,"导入不能没数据！！！");
+            if (readExcel.size() < 1) {
+                return RestResponse.codeAndMessage(1001, "导入不能没数据！！！");
             }
-            List<BranchCompanyStockInfo> list=new ArrayList<>();
+            List<BranchCompanyStockInfo> list = new ArrayList<>();
             for (int i = 1; i < readExcel.size(); i++) {
                 String[] str = readExcel.get(i);
-                BranchCompany branchCompany=new BranchCompany();
+                BranchCompany branchCompany = new BranchCompany();
                 branchCompany.setName(str[0]);
-                branchCompany=mapper.selectOne(branchCompany);
-                if(branchCompany!=null){
-                    BranchCompany branchCompany1=new BranchCompany();
-                    if(str.length>1){
+                branchCompany = mapper.selectOne(branchCompany);
+                if (branchCompany != null) {
+                    BranchCompany branchCompany1 = new BranchCompany();
+                    if (str.length > 1) {
                         branchCompany1.setLeader(str[1]);
                     }
-                    if(str.length>2){
+                    if (str.length > 2) {
                         branchCompany1.setLeaderContactInfo(str[2]);
                     }
-                   if(branchCompany1!=null&&(StringUtils.isNotBlank(branchCompany1.getLeader())||StringUtils.isNotBlank(branchCompany1.getLeaderContactInfo()))){
+                    if (branchCompany1 != null && (StringUtils.isNotBlank(branchCompany1.getLeader()) || StringUtils.isNotBlank(branchCompany1.getLeaderContactInfo()))) {
                         branchCompany1.setId(branchCompany.getId());
                         mapper.updateByPrimaryKeySelective(branchCompany1);
                     }
 
                 }
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            return RestResponse.codeAndMessage(10001,"网络异常！");
+            return RestResponse.codeAndMessage(10001, "网络异常！");
         }
         return RestResponse.suc();
     }
 
-    public List<BranchCompany> getListByUser(UserDTO userDTO){
-        if(userDTO != null && DATA_ALL_FALSE.equals(userDTO.getDataAll())) {
+    public List<BranchCompany> getListByUser(UserDTO userDTO) {
+        if (userDTO != null && DATA_ALL_FALSE.equals(userDTO.getDataAll())) {
             Example example = new Example(BranchCompany.class);
             Example.Criteria criteria = example.createCriteria();
             if (StringUtils.isNotBlank(userDTO.getDataZone())) {
@@ -301,6 +309,7 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
 
     /**
      * 通过片区片区和分公司id获取对应的城市信息
+     *
      * @param zoneList
      * @param companyList
      * @return
@@ -310,13 +319,12 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         if (CollectionUtils.isEmpty(list)) {
             return new HashSet<>();
         }
-        Example exa =new Example(BranchCompany.class);
+        Example exa = new Example(BranchCompany.class);
         Example.Criteria criteria = exa.createCriteria();
-        criteria.andIn("id",list);
+        criteria.andIn("id", list);
         List<BranchCompany> result = mapper.selectByExample(exa);
         return result.parallelStream().map(BranchCompany::getAddrCity).collect(Collectors.toSet());
 
 
-
     }
 }

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

 package com.xxfc.platform.vehicle.biz;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleActiveType;
+import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.constant.VehicleDepartureState;
 import com.xxfc.platform.vehicle.constant.VehicleStatus;
-import com.xxfc.platform.vehicle.entity.Vehicle;
-import com.xxfc.platform.vehicle.entity.VehicleActiveLog;
-import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
-import com.xxfc.platform.vehicle.entity.VehicleUpkeepLog;
+import com.xxfc.platform.vehicle.entity.*;
 import com.xxfc.platform.vehicle.mapper.*;
-import com.xxfc.platform.vehicle.pojo.VehicleArrivalVo;
-import com.xxfc.platform.vehicle.pojo.VehicleDepartureVo;
-import com.xxfc.platform.vehicle.pojo.VehicleUpkeepEndVo;
-import com.xxfc.platform.vehicle.pojo.VehicleUpkeepVo;
+import com.xxfc.platform.vehicle.pojo.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -39,6 +36,9 @@ public class VehicleActiveService {
     @Autowired
     VehicleUpkeepLogMapper vehicleUpkeepLogMapper;
 
+    @Autowired
+    VehicleBookRecordBiz vehicleBookRecordBiz;
+
     @Autowired
     VehicleUpkeepItemMapper vehicleUpkeepItemMapper;
     @Value("${vehicle.mileage}")
@@ -80,7 +80,20 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc(),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
             }
-
+            //修改预约记录状态
+            if(departureVo.getBookRecordId() != null) {
+                updateBookRecordStatus(departureVo.getBookRecordId());
+            }
+            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(departureVo.getBookRecordId());
+           if(vehicleDepartureLogVo != null) {
+               BeanUtil.copyProperties(departureVo, vehicleDepartureLogVo, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+               VehicleDepartureLog departureLog = vehicleDepartureLogVo.getVehicleDeparture(vehicleDepartureLogVo);
+               departureLog.setDepartureTime(new Date());
+               departureLog.setUpdateTime(new Date());
+               departureLog.setState(VehicleDepartureState.DEPARTURE.getCode());
+               departureLog.setDepartureRemark(departureVo.getRemark());
+               vehicleDepartureLogMapper.updateByPrimaryKeySelective(departureLog);
+           } else {
                // 出车记录
                VehicleDepartureLog departureLog = new VehicleDepartureLog();
                BeanUtils.copyProperties(departureVo, departureLog);
@@ -89,7 +102,10 @@ public class VehicleActiveService {
                departureLog.setMileageStart(departureVo.getMileage());
                departureLog.setState(VehicleDepartureState.DEPARTURE.getCode());
                departureLog.setBookRecordId(departureVo.getBookRecordId());
+               departureLog.setDepartureRemark(departureVo.getRemark());
                vehicleDepartureLogMapper.insert(departureLog);
+           }
+
 
             // 车辆活动日志
             VehicleActiveLog activeLog = new VehicleActiveLog();
@@ -102,10 +118,6 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-
-
-
-
     }
 
     @Transactional
@@ -141,6 +153,11 @@ public class VehicleActiveService {
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
             }
 
+            if(arrivalVo.getBookRecordId() != null) {
+                updateBookRecordStatus(arrivalVo.getBookRecordId());
+            }
+
+
             // 出车记录
             VehicleDepartureLog departureLog = vehicleDepartureLogMapper.selectLastByVehicleId(arrivalVo.getVehicleId());
             if (departureLog == null) {
@@ -154,8 +171,11 @@ public class VehicleActiveService {
                 departureLog.setUpdateTime(new Date());
                 departureLog.setArrivalTime(new Date());
                 departureLog.setState(VehicleDepartureState.END.getCode());
+                departureLog.setIllegalPic(arrivalVo.getIllegalPic());
+                departureLog.setIllegalAmount(arrivalVo.getIllegalAmount());
+                departureLog.setArrivalPic(arrivalVo.getArrivalPic());
+                departureLog.setArrivalRemark(arrivalVo.getRemark());
                 vehicleDepartureLogMapper.updateByPrimaryKeySelective(departureLog);
-
             // 车辆活动日志
             VehicleActiveLog activeLog = vehicleActiveLogMapper.selectLastByVehicleId(arrivalVo.getVehicleId());
             if (activeLog == null) {
@@ -172,6 +192,18 @@ public class VehicleActiveService {
         }
     }
 
+    public void updateBookRecordStatus(Integer bookRecordId) {
+        VehicleBookRecord vehicleBookRecord = vehicleBookRecordBiz.selectById(bookRecordId);
+        if(vehicleBookRecord != null) {
+            vehicleBookRecord.setStatus(VehicleBookRecordStatus.LIFTED.getCode());
+            vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
+        } else {
+            throw new BaseException(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc(),
+                    ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode());
+        }
+    }
+
+
     /**
      * 车辆保养
      * @param vehicleUpkeepVo

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

@@ -14,12 +14,14 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.constant.BookType;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.entity.BookRecordAccItem;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
+import com.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
 import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper;
 import com.xxfc.platform.vehicle.pojo.*;
@@ -70,6 +72,8 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
 
     @Autowired
     UserFeign userFeign;
+    @Autowired
+    VehicleUpkeepService vehicleUpkeepService;
 
     @Override
     public UserFeign getUserFeign() {return userFeign;}
@@ -128,6 +132,7 @@ 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()));
+        getupKeeps(pageDataVO.getData());
         return RestResponse.suc(pageDataVO);
     }
 
@@ -158,13 +163,29 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                 companyList.add(vehicleBookRecordQueryVo.getCompanyId());
             }
         }
-
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
         Query query = new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
+        getupKeeps(pageDataVO.getData());
         return RestResponse.suc(pageDataVO);
     }
 
+    public List<VehicleBookRecordVo> getupKeeps(List<VehicleBookRecordVo> vehicleBookRecordVos) {
+        for(VehicleBookRecordVo vehicleBookRecordVo : vehicleBookRecordVos) {
+            if(vehicleBookRecordVo.getBookType() == BookType.MAINTAIN.getCode()) {//获取 保养项目
+               if(StringUtils.isNotBlank(vehicleBookRecordVo.getUpkeepIds())) {
+                   List<Integer> upKeeps = Arrays.asList(vehicleBookRecordVo.getUpkeepIds().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+                   if(upKeeps.size() > 0) {
+                       List<VehicleUpkeepItem> vehicleUpkeepItems = vehicleUpkeepService.getUpkeepsByIds(upKeeps);
+                       vehicleBookRecordVo.setVehicleUpkeepItems(vehicleUpkeepItems);
+                   }
+               }
+            }
+        }
+        return vehicleBookRecordVos;
+    }
+
+
     public RestResponse<Integer> lift(Integer operatorId, String userName, LiftVehicleVo liftVehicleVo) throws Exception{
         Map<String, Object> params = PropertyUtils.describe(liftVehicleVo);
         params.put("reviewerLift", operatorId);

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

@@ -2,7 +2,6 @@ package com.xxfc.platform.vehicle.biz;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
 import com.xxfc.platform.vehicle.entity.VehicleUpkeepLog;
 import com.xxfc.platform.vehicle.mapper.VehicleUpkeepItemMapper;
@@ -13,10 +12,11 @@ import org.apache.commons.beanutils.BeanUtilsBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import redis.clients.jedis.Transaction;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class VehicleUpkeepService {
@@ -56,6 +56,12 @@ public class VehicleUpkeepService {
         return new PageInfo<>(vehicleUpkeepLogMapper.selectVoAll(numberPlate, companyList));
     }
 
+    public List<VehicleUpkeepItem> getUpkeepsByIds(List<Integer> ids) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("ids", ids);
+        return vehicleUpkeepItemMapper.selectByIds(param);
+    }
+
     public VehicleUpkeepLogVo getLogVoById(Integer id) {
         VehicleUpkeepLogVo vehicleUpkeepLogVo = vehicleUpkeepLogMapper.selectVoById(id);
         List<VehicleUpkeepLogItemVo> upkeepItems = vehicleUpkeepLogMapper.getItemsByLogId(id);

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

@@ -3,5 +3,9 @@ package com.xxfc.platform.vehicle.mapper;
 import com.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 public interface VehicleUpkeepItemMapper extends Mapper<VehicleUpkeepItem> {
+    List<VehicleUpkeepItem> selectByIds(Map<String, Object> param);
 }
\ No newline at end of file

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

@@ -83,7 +83,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
 
     public static final DateTimeFormatter DEFAULT_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
 
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/app/unauth/{id}", method = RequestMethod.GET)
     public RestResponse<Vehicle> get(@PathVariable String id) {
         return RestResponse.data(baseBiz.get(id));
     }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.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.VehicleBookRecordMapper" >
+<mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper">
 
     <resultMap id="getVehicleMap" type="com.xxfc.platform.vehicle.pojo.VehicleRecordInfoVo">
-         <association property="vehicle" column="vehicle_id" select="com.xxfc.platform.vehicle.mapper.VehicleMapper.selectById" />
+        <association property="vehicle" column="vehicle_id"
+                     select="com.xxfc.platform.vehicle.mapper.VehicleMapper.selectById"/>
     </resultMap>
 
     <resultMap id="searchBookRecord" type="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo">
         <result column="id" property="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
-        <association property="vehicleDepartureLogVo" column="id" select="com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper.selectByBookRecordId" />
+        <association property="vehicleDepartureLogVo" column="id"
+                     select="com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper.selectByBookRecordId"/>
     </resultMap>
 
     <resultMap id="getVehicleHourMap" type="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo">
-        <association property="vehicleBookHourInfo" column="id" select="com.xxfc.platform.vehicle.mapper.VehicleBookHourInfoMapper.selectByBookRecordId" />
+        <association property="vehicleBookHourInfo" column="id"
+                     select="com.xxfc.platform.vehicle.mapper.VehicleBookHourInfoMapper.selectByBookRecordId"/>
     </resultMap>
 
     <update id="changeRecordStatus" parameterType="java.util.Map">
@@ -90,8 +93,8 @@
             have_violation =#{haveViolation},
         </if>
         <choose>
-                <when test="targetStatus == 7"> `actual_start_date` = now() </when>
-                <when test="targetStatus == 3"> `actual_end_date` = now() </when>
+            <when test="targetStatus == 7">`actual_start_date` = now()</when>
+            <when test="targetStatus == 3">`actual_end_date` = now()</when>
         </choose>
 
         where id = #{id} and `status` = #{conditionStatus}
@@ -129,7 +132,10 @@
       mileage_ret,
       have_violation,
       ret_remark,
-      order_no
+      order_no,
+      vehicle_username,
+      vehicle_user_phone,
+      upkeep_ids
     )
     values(
             #{id},
@@ -162,11 +168,15 @@
             #{mileageRet},
             #{haveViolation},
             #{retRemark},
-            #{orderNo}
+            #{orderNo},
+            #{vehicleUsername},
+            #{vehicleUserPhone},
+            #{upkeepIds}
           );
   </insert>
 
-  <select id="getByPage4Month" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord">
+    <select id="getByPage4Month" parameterType="java.util.Map"
+            resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord">
     select
       `id`,
       `vehicle_id`,
@@ -200,7 +210,10 @@
       mileage_ret,
       have_violation,
       ret_remark,
-      order_no
+      order_no,
+       vehicle_username,
+      vehicle_user_phone,
+      upkeep_ids
     from
          vehicle_book_record
     where
@@ -209,7 +222,8 @@
     limit #{pageStart},#{pageSize}
   </select>
 
-    <select id="getByPage" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.pojo.QueryVehicleBookRecordVo">
+    <select id="getByPage" parameterType="java.util.Map"
+            resultType="com.xxfc.platform.vehicle.pojo.QueryVehicleBookRecordVo">
         select
         vbr.`id`,
         vbr.`vehicle_id`,
@@ -246,6 +260,9 @@
         vbr.have_violation,
         vbr.ret_remark,
         vbr.order_no,
+        vbr.vehicle_username,
+        vbr.vehicle_user_phone,
+        vbr.upkeep_ids,
         v.`code` as vehicleCode,
         v.number_plate as numberPlate,
         v.subordinate_branch,
@@ -306,7 +323,7 @@
         order by vbr.id desc
     </select>
 
-    <select id="getById" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord" >
+    <select id="getById" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord">
         select
             vbr.`id`,
             vbr.`vehicle_id`,
@@ -340,12 +357,16 @@
             vbr.mileage_ret,
             vbr.have_violation,
             vbr.ret_remark,
-            vbr.order_no
+            vbr.order_no,
+            vbr.vehicle_username,
+            vbr.vehicle_user_phone,
+            vbr.upkeep_ids,
          from ${tbName} vbr
         where id = #{id}
 
     </select>
-    <select id="getByVehicleId" parameterType="java.lang.String" resultType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo" >
+    <select id="getByVehicleId" parameterType="java.lang.String"
+            resultType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo">
        SELECT v1.*, conv(v2.booked_hour,10,2) startHour,conv(v3.booked_hour,10,2) endHour,bc2.name retCompanyName from vehicle_book_record v1
         LEFT JOIN vehicle_book_hour_info v2 on v2.book_record_id = v1.id and YEAR(v2.year_month_day) = YEAR(v1.book_start_date) AND MONTH(v2.year_month_day) = MONTH(v1.book_start_date) AND DAY(v2.year_month_day) =DAY(v1.book_start_date)
         LEFT JOIN vehicle_book_hour_info v3 on v3.book_record_id = v1.id and YEAR(v3.year_month_day) = YEAR(v1.book_end_date) AND MONTH(v3.year_month_day) = MONTH(v1.book_end_date) AND DAY(v3.year_month_day) =DAY(v1.book_end_date)
@@ -375,11 +396,18 @@
         order By v1.create_time DESC
     </select>
 
-    <select id="getBookRecord" resultMap="searchBookRecord" parameterType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordQueryVo">
-        select  bc3.name parkCompanyName,bc4.name subordinateBranchName, conv(v4.booked_hour,10,2) startHour,conv(v5.booked_hour,10,2) endHour, bc1.`name` lift_company_name, bc2.`name` ret_company_name, v3.number_plate,v1.*
+    <select id="getBookRecord" resultMap="searchBookRecord"
+            parameterType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordQueryVo">
+        select bc3.name parkCompanyName,bc4.name subordinateBranchName, conv(v4.booked_hour,10,2)
+        startHour,conv(v5.booked_hour,10,2) endHour, bc1.`name` lift_company_name, bc2.`name` ret_company_name,
+        v3.number_plate,v1.*
         from vehicle_book_record v1
-            LEFT JOIN vehicle_book_hour_info v4 on v4.book_record_id = v1.id and YEAR(v4.year_month_day) = YEAR(v1.book_start_date) AND MONTH(v4.year_month_day) = MONTH(v1.book_start_date) AND DAY(v4.year_month_day) =DAY(v1.book_start_date)
-            LEFT JOIN vehicle_book_hour_info v5 on v5.book_record_id = v1.id and YEAR(v5.year_month_day) = YEAR(v1.book_end_date) AND MONTH(v5.year_month_day) = MONTH(v1.book_end_date) AND DAY(v5.year_month_day) =DAY(v1.book_end_date)
+        LEFT JOIN vehicle_book_hour_info v4 on v4.book_record_id = v1.id and YEAR(v4.year_month_day) =
+        YEAR(v1.book_start_date) AND MONTH(v4.year_month_day) = MONTH(v1.book_start_date) AND DAY(v4.year_month_day)
+        =DAY(v1.book_start_date)
+        LEFT JOIN vehicle_book_hour_info v5 on v5.book_record_id = v1.id and YEAR(v5.year_month_day) =
+        YEAR(v1.book_end_date) AND MONTH(v5.year_month_day) = MONTH(v1.book_end_date) AND DAY(v5.year_month_day)
+        =DAY(v1.book_end_date)
         LEFT JOIN branch_company bc1 ON v1.lift_company = bc1.id
         LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
         LEFT JOIN vehicle v3 on v3.id = v1.vehicle_id
@@ -387,7 +415,8 @@
         LEFT JOIN branch_company bc4 on v3.subordinate_branch = bc4.id
         <where>
             <if test="selectedMonth != null">
-                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_end_date like CONCAT(#{selectedMonth}, "%"))
+                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_end_date like
+                CONCAT(#{selectedMonth}, "%"))
             </if>
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}
@@ -410,7 +439,9 @@
 
 
     <select id="getBookRecordInfo" resultMap="searchBookRecord" parameterType="java.util.Map">
-        select (CASE v1.lift_company WHEN #{userCompany} THEN 1 ELSE 0 end) liftStatus,(CASE v1.ret_company WHEN #{userCompany} THEN 1 ELSE 0 end) retStatus,bc4.name subordinateBranchName, bc1.`name` lift_company_name, bc2.`name` ret_company_name, v3.number_plate,v1.*
+        select (CASE v1.lift_company WHEN #{userCompany} THEN 1 ELSE 0 end) liftStatus,(CASE v1.ret_company WHEN
+        #{userCompany} THEN 1 ELSE 0 end) retStatus,bc4.name subordinateBranchName, bc1.`name` lift_company_name,
+        bc2.`name` ret_company_name, v3.number_plate,v1.*
         from vehicle_book_record v1
         LEFT JOIN branch_company bc1 ON v1.lift_company = bc1.id
         LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
@@ -419,7 +450,8 @@
         LEFT JOIN branch_company bc4 on v3.subordinate_branch = bc4.id
         <where>
             <if test="selectedMonth != null">
-                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_end_date like CONCAT(#{selectedMonth}, "%"))
+                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_end_date like
+                CONCAT(#{selectedMonth}, "%"))
             </if>
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}
@@ -447,8 +479,6 @@
     </select>
 
 
-
-
     <insert id="createTbIfNotExists" parameterType="java.lang.String">
     CREATE TABLE IF NOT EXISTS ${_parameter} (
      `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
@@ -493,8 +523,4 @@
   </insert>
 
 
-
-
-
-
 </mapper>
\ No newline at end of file

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

@@ -8,4 +8,13 @@
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="name" property="name" jdbcType="VARCHAR" />
   </resultMap>
+
+  <select id="selectByIds" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleUpkeepItem">
+        select * from vehicle_upkeep_item
+        where id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+          #{id}
+        </foreach>
+  </select>
+
 </mapper>
\ No newline at end of file