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

@@ -20,12 +20,12 @@ public class GlobalBasicConfiguration implements ApplicationRunner{
 
 	@Override
 	public void run(ApplicationArguments args) throws Exception {
-	showApplicationProperties("数据库连接地址: ", "spring.datasource.url");
-	showApplicationProperties("Redis连接主机: ", "spring.redis.host");
-	showApplicationProperties("Redis连接端口: ", "spring.redis.port");
-	showApplicationProperties("rabbitmq连接主机", "spring.rabbitmq.host");
-	showApplicationProperties("rabbitmq连接虚拟机", "spring.rabbitmq.virtual-host");
-}
+		showApplicationProperties("数据库连接地址: ", "spring.datasource.url");
+		showApplicationProperties("Redis连接主机: ", "spring.redis.host");
+		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){
-             ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) requestAttributes;
+        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,19 +160,19 @@ public class IntegralUserRecordBiz extends BaseBiz<IntegralUserRecordMapper, Int
     }
 
 
-
     /**
      * //判断用户获取积分是否达标
+     *
      * @param integralUserRecordDto 积分记录实体
-     * @param period  周期
-     *        number  周期内可获得积分的次数
+     * @param period                周期
+     *                              number  周期内可获得积分的次数
      */
-    public void  getUserRecordStatus(IntegralUserRecordDto integralUserRecordDto, Integer period, Integer number) {
+    public void getUserRecordStatus(IntegralUserRecordDto integralUserRecordDto, Integer period, Integer number) {
 
         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/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/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
@@ -41,14 +41,16 @@ public class OrderViolationBiz extends BaseBiz<OrderViolationMapper, OrderViolat
     private OrderRentVehicleDetailMapper detailMapper;
 
     @Value("order.violation.upload")
-     private   String  ovUpload;
+    private String ovUpload;
 
     public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
 
     @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");
         }
 
@@ -87,14 +90,14 @@ public class OrderViolationBiz extends BaseBiz<OrderViolationMapper, OrderViolat
 
     public ObjectRestResponse uploadViolation(MultipartFile file) throws IOException {
         DateTime now = DateTime.now();
-        String dirPathToday =  File.separator + now.toString(DEFAULT_DATE_TIME_FORMATTER);
+        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/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/constant/VehicleStatus.java

@@ -9,7 +9,7 @@ public enum VehicleStatus {
     DISCARD(3,"报废"),
     DEPARTURE(4, "出车"),
     UPKEEP(5, "保养"),
-    ;
+            ;
 
     /**
      * 编码

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 illegalPic;
+    //出车图片
+    String departurePic;
+    //收车图片
+    String arrivalPic;
+    //备注
+    String departureRemark;
 
-     Integer illegalAmount;
+    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/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,16 +80,32 @@ 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);
+               departureLog.setDepartureTime(new Date());
+               departureLog.setCreateTime(new Date());
+               departureLog.setMileageStart(departureVo.getMileage());
+               departureLog.setState(VehicleDepartureState.DEPARTURE.getCode());
+               departureLog.setBookRecordId(departureVo.getBookRecordId());
+               departureLog.setDepartureRemark(departureVo.getRemark());
+               vehicleDepartureLogMapper.insert(departureLog);
+           }
 
-            // 出车记录
-            VehicleDepartureLog departureLog = new VehicleDepartureLog();
-            BeanUtils.copyProperties(departureVo, departureLog);
-            departureLog.setDepartureTime(new Date());
-            departureLog.setCreateTime(new Date());
-            departureLog.setMileageStart(departureVo.getMileage());
-            departureLog.setState(VehicleDepartureState.DEPARTURE.getCode());
-            departureLog.setBookRecordId(departureVo.getBookRecordId());
-            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,21 +153,29 @@ 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) {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
             }
-            departureLog.setMileageEnd(arrivalVo.getMileage());
-            departureLog.setRecycleMan(arrivalVo.getRecycleMan());
-            departureLog.setRecycleManTel(arrivalVo.getRecycleManTel());
-            departureLog.setArrivalBranchCompanyId(arrivalVo.getArrivalBranchCompanyId());
-            departureLog.setUpdateTime(new Date());
-            departureLog.setArrivalTime(new Date());
-            departureLog.setState(VehicleDepartureState.END.getCode());
-            vehicleDepartureLogMapper.updateByPrimaryKeySelective(departureLog);
-
+                departureLog.setMileageEnd(arrivalVo.getMileage());
+                departureLog.setRecycleMan(arrivalVo.getRecycleMan());
+                departureLog.setRecycleManTel(arrivalVo.getRecycleManTel());
+                departureLog.setArrivalBranchCompanyId(arrivalVo.getArrivalBranchCompanyId());
+                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/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