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

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/process/ResultCode.java

@@ -16,6 +16,10 @@ public class ResultCode {
 	// 操作失败
 	public static int FAILED_CODE = Integer.valueOf(SystemProperty.getResultConfig("FAILED_CODE"));
 
+	//IM消息删除失败
+	public static int IM_DELETE_FAIL_CODE = Integer.valueOf(SystemProperty.getResultConfig("IM_DELETE_FAIL_CODE"));
+	public static int IM_MSG_NOT_EXIST_CODE = Integer.valueOf(SystemProperty.getResultConfig("IM_MSG_NOT_EXIST_CODE"));
+
 	// 车辆预定失败，请重试
 	public static int BOOKED_FAILED_CODE = Integer.valueOf(SystemProperty.getResultConfig("BOOKED_FAILED_CODE"));
 	//预定时间不能为空 DATE_TIME_IS_NULL

ace-common/src/main/resources/properties/resultcod.properties

@@ -6,6 +6,10 @@ SUCCESS_CODE=200
 #操作失败
 FAILED_CODE=1001
 1001=操作失败
+IM_DELETE_FAIL_CODE = 10011
+10011 = 删除消息失败
+IM_MSG_NOT_EXIST_CODE = 10012
+10012 = 消息不存在
 #数据已存在
 EXIST_CODE=1002
 1002=数据已存在

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

@@ -52,6 +52,9 @@ public interface UserFeign {
     public ObjectRestResponse<AppUserDTO> userDetailById(@RequestParam("id") Integer id);
 
 
+    @GetMapping("/app/user/app/unauth/getUserIdByUsername")
+    public List<Integer> getUserIdByUsername(@RequestParam(value="keywords")String keywords);
+
     /**
      *status:0-判断是否认证过,1-认证成功后修改用户认证状态
      *userId:用户登录时的id,必须

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

@@ -144,4 +144,9 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         appUserInfoVo.setNickname(userDetail.getNickname());
         return  appUserInfoVo;
     }
+
+    public List<Integer> getUserIdByUsername(String keywords) {
+        return mapper.getUserIdByUsername(keywords);
+    }
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java

@@ -19,4 +19,6 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
     void updateUserMemberStatusByUserId(@Param("userId") Integer userId,@Param("status") Integer status);
 
     void updateUserPositionByUserId(@Param("userId") Integer id, @Param("positionId") Integer positionId);
+
+    List<Integer> getUserIdByUsername(@Param("keywords") String keywords);
 }
\ No newline at end of file

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

@@ -280,6 +280,14 @@ public class AppUserController extends CommonBaseController{
          return ObjectRestResponse.succ(appUserInfoVo);
     }
 
+    @GetMapping("/app/unauth/getUserIdByUsername")
+    @IgnoreUserToken
+    @IgnoreClientToken
+    public List<Integer> getUserIdByUsername(@RequestParam("keywords") String keywords){
+        List<Integer> userIds = userDetailBiz.getUserIdByUsername(keywords);
+        return userIds;
+    }
+
     @GetMapping("/app/unauth/test")
     @IgnoreUserToken
     @IgnoreClientToken

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

@@ -42,6 +42,15 @@
      where d.userid = #{userId}  limit 1
   </select>
 
+
+    <select id="getUserIdByUsername" resultType="java.lang.Integer" parameterType="java.lang.String">
+        select d.userid  from app_user_login l
+        left join  app_user_detail d
+        on d.userid = l.id
+        where d.realname like concat("%", #{keywords}, "%") or l.username like concat("%", #{keywords}, "%")
+    </select>
+
+
     <select id="selectAppUserManage" parameterType="com.github.wxiaoqi.security.admin.dto.AppUserManageDTO"
             resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
         select

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

@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.admin.vo.ImiVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.mongodb.client.result.DeleteResult;
 import com.xxfc.platform.im.dto.CommentVo;
 import com.xxfc.platform.im.dto.PraiseVo;
 import com.xxfc.platform.im.dto.QuestionParamDto;
@@ -16,7 +17,9 @@ import com.xxfc.platform.im.model.Comment;
 import com.xxfc.platform.im.model.Msg;
 import com.xxfc.platform.im.model.Praise;
 import com.xxfc.platform.im.vo.MsgVo;
+import com.xxfc.platform.universal.constant.ResCode;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.bson.types.ObjectId;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -27,9 +30,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 @Service
 @Slf4j
@@ -162,6 +163,36 @@ public class MsgBiz {
 
     }
 
+    /**
+     * 删除消息
+     * @param ids id字符串，用逗号隔开
+     * @return
+     */
+    public ObjectRestResponse deleteByList(String ids) {
+        Integer userId = 0;
+        AppUserDTO appUserDTO = userBiz.getUserInfo();
+        if(appUserDTO == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
+        }
+        if (StringUtils.isBlank(ids)) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        userId = appUserDTO.getImUserid();
+        List<String> list = Arrays.asList(ids.split(","));
+        Set<String> set = new HashSet<>();
+        set.addAll(list);
+        Query query = new Query(Criteria.where("id").in(set));
+        query.addCriteria(Criteria.where("userId").is(userId));
+        List<Msg> msgList = mongoTemplate.find(query, Msg.class, "s_msg");
+        if(msgList.size() != set.size()) { //查询到的消息条数不等于查询的Id数
+            return ObjectRestResponse.createFailedResult(ResultCode.IM_DELETE_FAIL_CODE, ResultCode.getMsg(ResultCode.IM_DELETE_FAIL_CODE));
+        }
+        DeleteResult deleteResult = mongoTemplate.remove(query, Msg.class, "s_msg");
+        if (deleteResult != null && deleteResult.getDeletedCount() == set.size()) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createFailedResult(ResultCode.IM_DELETE_FAIL_CODE, ResultCode.getMsg(ResultCode.IM_DELETE_FAIL_CODE));
+    }
 
 
     /**

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/rest/MsgController.java

@@ -35,4 +35,9 @@ public class MsgController {
     public ObjectRestResponse getByUserId(Integer page, Integer limit, Integer type) {
         return msgBiz.getMsgListByUserId(page, limit, type);
     }
+
+    @GetMapping(value = "/delete")
+    public ObjectRestResponse deleteByIds(String ids) {
+        return msgBiz.deleteByList(ids);
+    }
 }

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

+package com.xxfc.platform.order.contant.enumerate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum AccountTypeEnum {
+    //账款类型 1*--入账；2*--出账
+    //账款类型 记帐类型 101--订单支付；201--取消订单退款；202--全部押金退款；203--部分押金退款；204--剩余押金退款
+    IN_ORDER_PAY(101, "订单支付"),
+    OUT_ORDER_FUND(201, "订单款"),
+    OUT_DEPOSIT(202, "所有押金"),
+    OUT_PART_DEPOSIT(203, "部分押金（扣除该扣除的 + 保留违章预备金）"),
+    OUT_RESIDUE_DEPOSIT(204, "剩余押金（扣除该扣除的）"),
+    ;
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
+            //Maps.newHashMap();
+
+    static{
+        for(AccountTypeEnum enumE : AccountTypeEnum.values()){
+            codeAndDesc.put(enumE.getCode(),enumE.getDesc());
+        }
+    }
+
+    AccountTypeEnum(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);
+    }
+}
\ No newline at end of file

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

@@ -7,6 +7,7 @@ public enum CrosstownTypeEnum {
     DEPARTURE(1, "交车"),
     ARRIVE(2, "还车"),
     FIXED_LOSS(3, "定损"),
+    FIXED_LOSS_NOW(4, "定损"),
     ;
     /**
      * 编码

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

+package com.xxfc.platform.order.contant.enumerate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DeductionTypeEnum {
+    //账款类型 1--违约金；2--消费金额；3--赔偿金（定损）；4--违章相关
+    VIOLATE_CANCEL(101, "提前取消违约金"),
+    VIOLATE_ADVANCE(102, "提前还车违约金"),
+    VIOLATE_DELAY(103, "延迟还车违约金"),
+    EXTRA(201, "消费金额"),
+    DAMAGES(301, "赔偿金（定损）"),
+    VIOLATE_TRAFFIC_DEDUCT(401, "违章扣款"),
+    VIOLATE_TRAFFIC_KEEP(402, "违章扣款保留金"),
+    ;
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
+            //Maps.newHashMap();
+
+    static{
+        for(DeductionTypeEnum enumE : DeductionTypeEnum.values()){
+            codeAndDesc.put(enumE.getCode(),enumE.getDesc());
+        }
+    }
+
+    DeductionTypeEnum(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);
+    }
+}
\ No newline at end of file

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

@@ -6,7 +6,8 @@ import java.util.Map;
 
 public enum OrderViolateEnum {
     BEFORE(1, "提前"),
-    AFTER(2, "延期")
+    AFTER(2, "延期"),
+    EXCESS(3, "消费超额金")
     ;
     /**
      * 编码

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

+package com.xxfc.platform.order.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 订单帐目
+ * 
+ * @author zhoujw
+ * @email 18178966185@163.com
+ * @date 2019-09-09 15:51:16
+ */
+@Data
+@Table(name = "order_account")
+public class OrderAccount implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	/**
+     *  主键
+     */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+	/**
+     *  订单id
+     */
+    @Column(name = "order_id")
+	@ApiModelProperty(value = "订单id")
+    private Integer orderId;
+	
+	    /**
+     *  账款对应的流水号
+     */
+    @Column(name = "trade_no")
+	@ApiModelProperty(value = "账款对应的流水号")
+    private String tradeNo;
+	
+	    /**
+     *  记账时间
+     */
+    @Column(name = "account_time")
+	@ApiModelProperty(value = "记账时间")
+    private Long accountTime;
+	
+	    /**
+     *  记帐类型 101--订单支付；201--取消订单退款；202--全部押金退款；203--部分押金退款；204--剩余押金退款
+     */
+    @Column(name = "account_type")
+	@ApiModelProperty(value = "记帐类型 101--订单支付；201--取消订单退款；202--全部押金退款；203--部分押金退款；204--剩余押金退款")
+    private Integer accountType;
+	
+	    /**
+     *  账款状态 1--成功；2--失败
+     */
+    @Column(name = "account_status")
+	@ApiModelProperty(value = "账款状态 1--成功；2--失败")
+    private Integer accountStatus;
+	
+	    /**
+     *  账款金额
+     */
+    @Column(name = "account_amount")
+	@ApiModelProperty(value = "账款金额")
+    private BigDecimal accountAmount;
+	
+	    /**
+     *  账款说明
+     */
+    @Column(name = "account_desc")
+	@ApiModelProperty(value = "账款说明")
+    private String accountDesc;
+	
+	    /**
+     *  账款详情
+     */
+    @Column(name = "account_detail")
+	@ApiModelProperty(value = "账款详情")
+    private String accountDetail;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  原金额
+     */
+    @Column(name = "original_amount")
+	@ApiModelProperty(value = "原金额")
+    private BigDecimal originalAmount;
+	
+	    /**
+     *  扣除金额
+     */
+    @Column(name = "deduct_amount")
+	@ApiModelProperty(value = "扣除金额")
+    private BigDecimal deductAmount;
+	
+
+}

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

@@ -146,6 +146,14 @@ public class OrderItem implements Serializable {
 		return calculateAmount;
 	}
 
+	public BigDecimal getBuyAmount() {
+		return getUnitPrice().multiply(new BigDecimal(getBuyNum() + ""));
+	}
+
+	public BigDecimal getCutAmount() {
+		return getUnitPrice().multiply(new BigDecimal(getCutNum() + ""));
+	}
+
 	public BigDecimal handleCouponAmount(BigDecimal couponAmount) {
 		BigDecimal realAmountResidue = getRealAmount().subtract(couponAmount);
 		//剩余价格小于0  即优惠价格超出本item的实际价格，返回剩余优惠

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

@@ -315,4 +315,12 @@ public class OrderRentVehicleDetail implements Serializable {
 //	@Column(name = "back_free_days")
 //	Integer backFreeDays;
 
+	@ApiModelProperty(value = "违章金额")
+	@Column(name = "violate_traffic_amount")
+	BigDecimal violateTrafficAmount;
+
+	@ApiModelProperty(value = "使用天数")
+	@Column(name = "used_day")
+	Integer usedDay;
+
 }

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

@@ -7,6 +7,9 @@ import java.util.List;
 
 @Data
 public class DedDetailDTO {
+    //public static final int TYPE_VIOLATE_ADVANCE = 1;
+
+
     /**
      * : 扣除项名称
      */
@@ -17,13 +20,19 @@ public class DedDetailDTO {
      */
     BigDecimal cost;
 
+    /**
+     * 订单超额费用
+     */
+    BigDecimal excessCost;
+
     /**
      * 编号（用于顺序）
      */
     Integer id;
 
 
-    //1、延期， 2、车辆损坏 3、其他
+    //作为：DedDetail ：2、车辆损坏 3、其他
+    //作为：violate_amount_detail 1--提前还车 2--延期还车 3--消费超额
     Integer type;
 
     //小雨都不知道什么东西

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

+package com.xxfc.platform.order.pojo.account;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class OrderAccountDeduction {
+
+    public static final int ORIGIN_ORDER = 1;
+    public static final int ORIGIN_DEPOSIT = 2;
+    public static final int ORIGIN_ORDER_DEPOSIT = 3;
+    public static final int ORIGIN_DEPOSIT_ORDERß = 4;
+
+    /**
+     * 名称
+     */
+    String name;
+
+    /**
+     * 类型
+     */
+    Integer type;
+
+    /**
+     * 来源 1--订单款  2--押金
+     */
+    Integer origin;
+
+    /**
+     * 金额
+     */
+    BigDecimal amount;
+}

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

+package com.xxfc.platform.order.pojo.account;
+
+import lombok.Data;
+import org.assertj.core.util.Lists;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class OrderAccountDetail {
+    /**
+     * 实际返回订单款
+     */
+    BigDecimal orderAmount;
+    /**
+     * 实际返回押金款
+     */
+    BigDecimal depositAmount;
+    /**
+     * 原来要返回的订单款
+     */
+    BigDecimal originOrderAmount;
+    /**
+     * 原来要返回的押金款
+     */
+    BigDecimal originDepositAmount;
+
+    /**
+     * 扣款列表
+     */
+    List<OrderAccountDeduction> deductions = Lists.newArrayList();
+}

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

@@ -23,6 +23,31 @@ public class InProgressVO {
      */
     BigDecimal extraAmount = BigDecimal.ZERO;
 
+    /**
+     * 已使用天数
+     */
+    Integer usedDays = 0;
+
+    /**
+     * 已使用的金额
+     */
+    BigDecimal usedAmount = BigDecimal.ZERO;
+
+    /**
+     * 已使用免费天数
+     */
+    Integer usedfreeDays = 0;
+
+    /**
+     * 已使用的免费天数对应的费用
+     */
+    BigDecimal usedFreeDaysAmount = BigDecimal.ZERO;
+
+    /**
+     * 返回订单款金额
+     */
+    BigDecimal refundOrderAmount = BigDecimal.ZERO;
+
     /**
      * 返还的优惠券
      */
@@ -32,4 +57,9 @@ public class InProgressVO {
      * 返还的免费天数
      */
     Integer backFreeDays = 0;
+
+    String cancelCostDetail = "";
+
+    String advanceDelayCostDetail = "";
+
 }

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

 package com.xxfc.platform.order.pojo.order;
 
 import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.order.pojo.DedDetailDTO;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import lombok.Data;
 
@@ -33,6 +34,8 @@ public class OrderPageVO extends BaseOrder {
 
     private String telephone;
 
+    //订单违约金
+    private String dedDetailDTO;
     /**
      * 車輛編碼
      */

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

@@ -33,4 +33,29 @@ public class RentVehiclePriceVO extends OrderPriceVO{
     BigDecimal damageSafePrice;
     @ApiModelProperty(value = "费用详情")
     private String costDetail;
+
+//    /**
+//     * 原租车天数
+//     */
+//    private Integer originDayNum;
+
+    /**
+     * 免费天数
+     */
+    private Integer freeDayNum;
+
+    /**
+     * 免费价格
+     */
+    private BigDecimal freeAmount;
+
+    /**
+     * 购买的租车金额
+     */
+    private BigDecimal buyVehicleAmount;
+
+    /**
+     * 优惠描述
+     */
+    private String couponDesc = "";
 }

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

@@ -5,6 +5,7 @@ import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.google.common.collect.Maps;
 import com.xxfc.platform.order.entity.OrderTemplate;
 import com.xxfc.platform.order.mapper.OrderTemplateMapper;
 import org.springframework.stereotype.Service;
@@ -57,4 +58,17 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
         return template.render(map);
     }
 
+    public static void main(String[] args) {
+        String tempStr = "{\"key\":\"费用明细\", \"val\":\"\", \"consumeAmount\":\"${consumeAmount}\",\"children\":[${children}]}";
+        Map map = Maps.newHashMap();
+        map.put("consumeAmount", "");
+        map.put("children", "{\"test\" : \"1111\" }");
+
+        //匹配参数 填充参数
+        TemplateEngine engine = TemplateUtil.createEngine();
+        Template template = engine.getTemplate(tempStr);
+        String result = template.render(new Dict(map));
+        System.out.println(result);
+    }
+
 }
\ No newline at end of file

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

 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.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
-import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.app.feign.ConfigFeign;
+import com.xxfc.platform.order.biz.OrderAccountBiz;
 import com.xxfc.platform.order.biz.OrderItemBiz;
 import com.xxfc.platform.order.biz.OrderRefundBiz;
-import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
+import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
-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.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.assertj.core.util.Lists;
 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.HOUR_MINUTE_FORMATTE_HUTOOL;
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
-import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
  * 订单退款记录表
@@ -71,22 +54,33 @@ public class OrderCalculateBiz {
     @Autowired
     OrderItemBiz orderItemBiz;
 
-    public InProgressVO inProgressCalculate(BaseOrder baseOrder, OrderItem orderItem, Integer freeDays, Integer useDays) {
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
+    public InProgressVO inProgressCalculate(BaseOrder baseOrder, OrderItem orderItem, Integer freeDays, Integer useDays, OrderAccountDetail oad) {
+        BigDecimal refundAmount = BigDecimal.ZERO;
+        InProgressVO inProgressVO = new InProgressVO();
+        inProgressVO.setUsedDays(useDays);
+        inProgressVO.setUsedfreeDays(freeDays);
+        inProgressVO.setUsedAmount(orderItem.getUnitPrice().multiply(new BigDecimal(useDays+ "")));
+        inProgressVO.setUsedFreeDaysAmount(orderItem.getUnitPrice().multiply(new BigDecimal(freeDays+ "")));
+
         //计算：剩余免费天数
         Integer backFreeDays = freeDays - useDays;
+        //待返还的免费天数
+        List<String> backCouponNos = Lists.newArrayList();
+        //剩余天数
+        Integer residueDays = orderItem.getTotalNum() - useDays;
         //过了出发时间取消订单 ，优先使用免费天数
         if(backFreeDays <= 0) {
-            //大于总天数 只返回押金
-            if(useDays >= orderItem.getTotalNum()) {
-                //退押金
-                //orderRefundBiz.rentRefundDepositProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, freeDayAmount);
-            }else {
+            //使用天数 小于 总天数
+            if(useDays < orderItem.getTotalNum()) {
                 //需要扣除订单费用
                 //判断是否达到优惠券条件 不符合则返还优惠券
+                    //消费天数
                 Integer consumeDays = 0 - backFreeDays;
                     //计算使用天数的费用
                 BigDecimal consumeAmount = orderItem.getUnitPrice().multiply(new BigDecimal(consumeDays+""));
-                List<String> backCouponNos = Lists.newArrayList();
                 List<BigDecimal> couponAmounts = Lists.newArrayList();
                 for(String tickerNo : baseOrder.getCouponTickerNos().split(",")) {
                     BigDecimal couponAmount = activityFeign.use(baseOrder.getUserId(), Lists.newArrayList(tickerNo), baseOrder.getNo(), Coupon.CHANNEL_RENT, consumeAmount, ActivityFeign.TYPE_CHECK);
@@ -97,14 +91,60 @@ public class OrderCalculateBiz {
                         backCouponNos.add(tickerNo);
                     }
                 }
+
+                for(BigDecimal couponAmount : couponAmounts) {
+                    consumeAmount = consumeAmount.subtract(couponAmount);
+                }
+
+                if(consumeAmount.compareTo(orderItem.getRealAmount()) > 0) {
+                    //消费金额 大于真实的金额 增加额外费用
+                    inProgressVO.setExtraAmount(consumeAmount.subtract(orderItem.getRealAmount()));
+//                    consumeAmount = orderItem
+                    OrderAccountDeduction extraDeduction = orderAccountBiz.initDeduction(inProgressVO.getExtraAmount(), "消费额外费用", DeductionTypeEnum.EXTRA, OrderAccountDeduction.ORIGIN_DEPOSIT);
+                    oad.getDeductions().add(extraDeduction);
+                }else {
+                    //否则，设置返回钱
+                    refundAmount = refundAmount.add(orderItem.getRealAmount().subtract(consumeAmount));
+                }
+            } else {
+
             }
         }else {
             //返回剩余免费天数，返回优惠券，订单款
+            refundAmount = refundAmount.add(orderItem.getRealAmount());
+            inProgressVO.setBackFreeDays(backFreeDays);
+
+        }
 
+        inProgressVO.setRefundOrderAmount(refundAmount);
+        inProgressVO.setBackCoupons(backCouponNos);
 
+        //计算违约金
+            //residueDays * 身份价格
+        if(residueDays > 0) {
+            if(residueDays > 2) {
+                residueDays = 2;
+            }
+            inProgressVO.setViolateAmount(orderItem.getUnitPrice().multiply(new BigDecimal((residueDays + ""))));
+            OrderAccountDeduction violateDeduction = orderAccountBiz.initDeduction(inProgressVO.getViolateAmount(), "违约金", DeductionTypeEnum.VIOLATE_ADVANCE, OrderAccountDeduction.ORIGIN_DEPOSIT);
+            oad.getDeductions().add(violateDeduction);
+        }else if(residueDays < 0){
+            //如果订单 出发中 或者 已完成 或者定损中
+            if(OrderStatusEnum.ORDER_WAIT.equals(baseOrder.getStatus()) ||
+                    OrderStatusEnum.ORDER_FINISH.equals(baseOrder.getStatus()) ||
+                    OrderStatusEnum.ORDER_FIXED_LOSS.equals(baseOrder.getStatus())) {
+                Integer overDays = 0 - residueDays;
+                if(overDays > 2) {
+                    overDays = 2;
+                }
+                //超过的天数 * 200% * 单价
+                inProgressVO.setViolateAmount(orderItem.getUnitPrice().multiply(new BigDecimal(2+ "")).multiply(new BigDecimal((overDays + ""))));
+                OrderAccountDeduction violateDeduction = orderAccountBiz.initDeduction(inProgressVO.getViolateAmount(), "违约金", DeductionTypeEnum.VIOLATE_DELAY, OrderAccountDeduction.ORIGIN_DEPOSIT);
+                oad.getDeductions().add(violateDeduction);
+            }
         }
 
-        return new InProgressVO();
+        return inProgressVO;
     }
 
     public InProgressVO inProgressCalculate(BaseOrder baseOrder, Integer useDays) {
@@ -113,6 +153,15 @@ public class OrderCalculateBiz {
             setOrderId(baseOrder.getId());
         }});
         Integer freeDays = (null == orderItem.getCutNum())?0 :orderItem.getCutNum();
-        return inProgressCalculate(baseOrder, orderItem, freeDays, useDays);
+        return inProgressCalculate(baseOrder, orderItem, freeDays, useDays, null);
+    }
+
+    public InProgressVO calculateOrderComplete(BaseOrder baseOrder, OrderRentVehicleDetail orvd, OrderAccountDetail oad, OrderItem orderItem, Integer useDays) {
+        InProgressVO inProgressVO = inProgressCalculate(baseOrder, orderItem, orvd.getFreeDays(), useDays, oad);
+        oad.setDepositAmount(orvd.getDeposit().subtract(inProgressVO.getExtraAmount()).subtract(inProgressVO.getViolateAmount()));
+        oad.setOrderAmount(inProgressVO.getRefundOrderAmount());
+        oad.setOriginDepositAmount(orvd.getDeposit());
+        oad.setOriginOrderAmount(baseOrder.getRealAmount());
+        return inProgressVO;
     }
 }
\ No newline at end of file

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

 package com.xxfc.platform.order.biz.inner;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 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.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
+import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -55,6 +61,12 @@ public class OrderCancelBiz {
     @Autowired
     OrderMsgBiz orderMsgBiz;
 
+    @Autowired
+    OrderCalculateBiz orderCalculateBiz;
+
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
     @Autowired
     UserFeign userFeign;
 
@@ -67,6 +79,9 @@ public class OrderCancelBiz {
     @Autowired
     ThirdFeign thirdFeign;
 
+    @Autowired
+    ActivityFeign activityFeign;
+
     private static Map<Integer, List<Integer>> cancelAble;
     static {
         cancelAble = new HashMap<Integer, List<Integer>>();
@@ -100,6 +115,8 @@ public class OrderCancelBiz {
                 setVersion(baseOrder.getVersion());
             }};
             BaseOrder hasUpdateOrder = baseOrderBiz.updateSelectiveByIdReT(updateOrder);
+            InProgressVO inProgressVO = null;
+            OrderAccountDetail oad = new OrderAccountDetail();
 
             //触发退款流程
             //判断是否已支付
@@ -110,41 +127,51 @@ public class OrderCancelBiz {
                         setOrderId(baseOrder.getId());
                     }});
 
-                    //原退还押金
-                    BigDecimal freeDayAmount = BigDecimal.ZERO;
-                    //判断是否使用免费天数，并且进行扣款
-                    if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
                     OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
                         setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
                         setOrderId(baseOrder.getId());
                     }});
-                        freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
-                    }
+
+                    //原退还押金
+                    Integer freeDays = (null == orderItem.getCutNum())?0 :orderItem.getCutNum();
+                    BigDecimal freeDayAmount = BigDecimal.ZERO;
 
 
                     //如果超过出发时间，不能取消订单
                     //根据时间处理goodsAmount
                     //获取出发时间 到现在 距离时间
                     Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
-                    //后面允许开始时间过后可以取消订单
-//                    if(timeLag < 0) {
-//                        throw new BaseException(ResultCode.FAILED_CODE, new HashSet<String>(){{
-//                            add("已超过出发时间，不能取消订单");
-//                        }});
-//                    }
+                    if(timeLag < 0 ) {
+                        //开始时间当天时间戳
+                        Long beginOfStartDay = DateUtil.beginOfDay(DateUtil.date(orvd.getStartTime())).getTime();
+                        //计算：使用天数 当前时间 - 开始时间的0时0分0秒
+                        Long useTimeLag = System.currentTimeMillis() - beginOfStartDay;
+                        Integer useDays = new BigDecimal(useTimeLag + "").divide(new BigDecimal((24 * 60 * 60 * 1000)+ "")).setScale(0, BigDecimal.ROUND_UP).intValue();
+                        inProgressVO = orderCalculateBiz.calculateOrderComplete(baseOrder, orvd, oad, orderItem, useDays);
+                        //结合
+                        //退款子流程: 订单基础，退款描述，退款金额
+                        orderAccountBiz.refundSubProcess(baseOrder, "", baseOrder.getRealAmount().subtract(orvd.getDeposit()), oad.getDepositAmount().add(oad.getOrderAmount()), AccountTypeEnum.OUT_ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode(), oad);
 
-                    //退款流程
-                    //退订单款
-                    orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ RENT_REFUND);
+                    }else {
+                        //没到出车时间
+                        //判断是否使用免费天数，并且进行扣款
+                        if(freeDays > 0) {
+                            freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
 
-                    //退押金
-                    orderRefundBiz.rentRefundDepositProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, freeDayAmount);
+                            //违约金封顶 租车身份价 * 2天
+                            BigDecimal topAmount = orderItem.getUnitPrice().multiply(new BigDecimal(2+ ""));
+                            if(freeDayAmount.compareTo(topAmount) > 0) {
+                                freeDayAmount = freeDayAmount;
+                            }
+                        }
+                        //退款流程
+                        orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount);
+                    }
 
                     //已付款的取消订单发送消息
                     try {
                         AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
                         //处理后台用户提醒短信的发送
-//                        orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_CANCEL);
                         orderMsgBiz.handelMsgCancel(orvd, otd, omd, baseOrder, appUserDTO);
                     }catch (Exception e) {
                         log.error(e.getMessage(), e);
@@ -154,15 +181,29 @@ public class OrderCancelBiz {
                     otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
                         setOrderId(baseOrder.getId());
                     }});
+
                     Long timeLag = otd.getStartTime() - System.currentTimeMillis();
 
+                    OrderItem adultItem = orderItemBiz.selectOne(new OrderItem(){{
+                        setType(ItemTypeEnum.TOUR_ADULT.getCode());
+                        setOrderId(baseOrder.getId());
+                    }});
+
+                    OrderItem childItem = orderItemBiz.selectOne(new OrderItem(){{
+                        setType(ItemTypeEnum.TOUR_CHILD.getCode());
+                        setOrderId(baseOrder.getId());
+                    }});
+
                     //判断是省内还是省外
                     String key = TOUR_IN_REFUND;
                     if(SYS_TRUE.equals(otd.getIsOutside())) {
                         key = TOUR_REFUND;
                     }
                     //退款流程
-                    orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ key);
+                    orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, adultItem.getRealAmount().add(childItem.getRealAmount()), timeLag, APP_ORDER+ "_"+ key, BigDecimal.ZERO, BigDecimal.ZERO);
+
+                    //站点总人数减少
+                    tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, (otd.getTotalNumber() * -1));
                 }
             }
 
@@ -183,11 +224,20 @@ public class OrderCancelBiz {
 
                 //取消租车免费天数使用
                 if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
-                    int result = userFeign.memberDays(baseOrder.getUserId(), orvd.getFreeDays(), UserFeign.MEMBER_DAYS_WITHDRAW);
+                    Integer freeDays = (null == inProgressVO) ? orvd.getFreeDays(): inProgressVO.getBackFreeDays();
+                    int result = userFeign.memberDays(baseOrder.getUserId(), freeDays, UserFeign.MEMBER_DAYS_WITHDRAW);
                     if(result < 0) {
                         throw new BaseException(ResultCode.FAILED_CODE);
                     }
                 }
+
+                //返还优惠券
+                if(StrUtil.isNotBlank(baseOrder.getCouponTickerNos())) {
+                    List<String> backCoupons = (null == inProgressVO)? inProgressVO.getBackCoupons(): Convert.convert(List.class, baseOrder.getCouponTickerNos().split(","));
+                    for(String backCoupon : backCoupons) {
+                        activityFeign.cancelUse(backCoupon);
+                    }
+                }
             }else if(OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
                 otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
                     setOrderId(baseOrder.getId());

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

@@ -10,6 +10,7 @@ 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.account.OrderAccountDetail;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -61,6 +62,9 @@ public class RentDepositJobHandler extends IJobHandler {
     @Autowired
     OrderRefundBiz orderRefundBiz;
 
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
     @Autowired
     OrderMsgBiz orderMsgBiz;
 
@@ -120,7 +124,9 @@ public class RentDepositJobHandler extends IJobHandler {
                         refundAmont = orvd.getReturnPayResidue();
                         refundDesc += refundAmont.toString();
                     }
-                    orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
+                    OrderAccountDetail oad = new OrderAccountDetail();
+                    orderAccountBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), AccountTypeEnum.OUT_RESIDUE_DEPOSIT, oad);
+                    //orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
                     orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), DepositRefundStatus.VIOLATIONARRIVAL);
                     orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
                 }

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

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.OrderAccount;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 订单帐目
+ * 
+ * @author zhoujw
+ * @email 18178966185@163.com
+ * @date 2019-09-09 15:51:16
+ */
+public interface OrderAccountMapper extends Mapper<OrderAccount> {
+	
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RefundMQHandler.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.order.mqhandler;
 
 import cn.hutool.json.JSONUtil;
 import com.rabbitmq.client.Channel;
+import com.xxfc.platform.order.biz.OrderAccountBiz;
 import com.xxfc.platform.order.biz.OrderRefundBiz;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +28,9 @@ public class RefundMQHandler {
     @Autowired
     OrderRefundBiz orderRefundBiz;
 
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
     /**
      * 退款
      * @param
@@ -42,7 +46,7 @@ public class RefundMQHandler {
                     String msg = new String(message.getBody(), "UTF-8");
                     OrderMQDTO orderMQDTO = JSONUtil.toBean(msg, OrderMQDTO.class);
 
-                    orderRefundBiz.refundPartDeposit(orderMQDTO);
+                    orderAccountBiz.refundPartDeposit(orderMQDTO);
 
                     executorService.shutdown();
                     Long deliveryTag = (Long) headers.get(AmqpHeaders.DELIVERY_TAG);

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

@@ -214,6 +214,14 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 dto.setEndTime(new Date().getTime());
             }
         }
+        List<Integer> userIds = new ArrayList<>();
+        if(StringUtils.isNotBlank(dto.getKeywords())) {
+          List<Integer> list =  userFeign.getUserIdByUsername(dto.getKeywords());
+          if(list != null) {
+              userIds.addAll(list);
+          }
+        }
+        dto.setUserIds(userIds);
         UserDTO userDTO = getAdminUserInfo();
         if (userDTO == null) {
             return ObjectRestResponse.succ(new PageDataVO<>());

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

@@ -311,6 +311,11 @@ public class BaseOrderController extends CommonBaseController implements UserRes
 
         private  List<String> vehicleIds;
 
+        //订单用户ID列表
+        private List<Integer> userIds;
+        //订单用户手机号或订单用户真实姓名
+        private String keywords;
+
         /**
          * 车牌号
          */

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

+package com.xxfc.platform.order.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.order.biz.OrderAccountBiz;
+import com.xxfc.platform.order.entity.OrderAccount;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("orderAccount")
+public class OrderAccountController extends BaseController<OrderAccountBiz,OrderAccount> {
+
+}
\ No newline at end of file

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

@@ -72,43 +72,43 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
 
         switch (orderTypeEnum) {
             case RENT_VEHICLE:
-                orderRefundAmount = orderRefundBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
-                        , orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis()
-                        , DictionaryKey.APP_ORDER+ "_"+ RENT_REFUND
-                        , refundDescBuilder);
-                OrderRentVehicleDetail orvd = orderPageVO.getOrderRentVehicleDetail();
-                Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
-                //原退还押金
-                BigDecimal originalDeductAmount = BigDecimal.ZERO;
-                BigDecimal originalRefundAmount = BigDecimal.ZERO.add(orvd.getDeposit());
-                //判断是否使用免费天数，并且进行扣款
-                if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
-                    refundDescBuilder = new StringBuilder("");
-                    OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
-                        setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
-                        setOrderId(orderPageVO.getId());
-                    }});
-                    originalDeductAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
-                }
-                BigDecimal residueAmount = orderRefundBiz.calculateRefund(originalDeductAmount, timeLag, APP_ORDER+ "_"+ RENT_REFUND, refundDescBuilder);
-                residueAmount = residueAmount.setScale(2, RoundingMode.HALF_UP);
-
-                //押金剩余款 ：押金 - (原扣除款 - 剩余款)
-                //退款金额 ：订单剩余款 + 押金剩余款
-                orderRefundAmount = orderRefundAmount.add(originalRefundAmount.subtract(originalDeductAmount.subtract(residueAmount)));
+//                orderRefundAmount = orderRefundBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
+//                        , orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis()
+//                        , DictionaryKey.APP_ORDER+ "_"+ RENT_REFUND
+//                        , refundDescBuilder);
+//                OrderRentVehicleDetail orvd = orderPageVO.getOrderRentVehicleDetail();
+//                Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
+//                //原退还押金
+//                BigDecimal originalDeductAmount = BigDecimal.ZERO;
+//                BigDecimal originalRefundAmount = BigDecimal.ZERO.add(orvd.getDeposit());
+//                //判断是否使用免费天数，并且进行扣款
+//                if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
+//                    refundDescBuilder = new StringBuilder("");
+//                    OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
+//                        setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+//                        setOrderId(orderPageVO.getId());
+//                    }});
+//                    originalDeductAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
+//                }
+//                BigDecimal residueAmount = orderRefundBiz.calculateRefund(originalDeductAmount, timeLag, APP_ORDER+ "_"+ RENT_REFUND, refundDescBuilder);
+//                residueAmount = residueAmount.setScale(2, RoundingMode.HALF_UP);
+//
+//                //押金剩余款 ：押金 - (原扣除款 - 剩余款)
+//                //退款金额 ：订单剩余款 + 押金剩余款
+//                orderRefundAmount = orderRefundAmount.add(originalRefundAmount.subtract(originalDeductAmount.subtract(residueAmount)));
 
                 break;
             case TOUR:
                 //判断是省内还是省外
-                String key = TOUR_IN_REFUND;
-                if(SYS_TRUE.equals(orderPageVO.getOrderTourDetail().getIsOutside())) {
-                    key = TOUR_REFUND;
-                }
-                orderRefundAmount = orderRefundBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
-                        , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
-                        , DictionaryKey.APP_ORDER+ "_"+ key
-                        , refundDescBuilder);
-                break;
+//                String key = TOUR_IN_REFUND;
+//                if(SYS_TRUE.equals(orderPageVO.getOrderTourDetail().getIsOutside())) {
+//                    key = TOUR_REFUND;
+//                }
+//                orderRefundAmount = orderRefundBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
+//                        , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
+//                        , DictionaryKey.APP_ORDER+ "_"+ key
+//                        , refundDescBuilder);
+//                break;
             default:
                 break;
         }

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

@@ -219,6 +219,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         BigDecimal damageSafeAmount = BigDecimal.ZERO;
 //        BigDecimal modelAmount = BigDecimal.ZERO;
         BigDecimal couponAmount = BigDecimal.ZERO;
+        String couponDesc = "";
         Integer vehicleDayNum = 0;
         Integer freeDayNum = 0;
 
@@ -314,6 +315,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
                 detail.getOrder().setCouponTickerNos(detail.getTickerNo().stream().collect(Collectors.joining(",")));
                 detail.getOrder().setHasDiscount(SYS_TRUE);
                 vehicleOrderItem.handleCouponAmount(couponAmount);
+                couponDesc += activityFeign.info(detail.getTickerNo().get(0)).getTitle();
             }
         }
 
@@ -340,6 +342,11 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rvp.setModelAmount(vehicleOrderItem.getUnitPrice());
         rvp.setVehicleDayNum(vehicleDayNum);
 
+        rvp.setFreeDayNum(freeDayNum);
+        rvp.setFreeAmount(vehicleOrderItem.getCutAmount());
+        rvp.setBuyVehicleAmount(vehicleOrderItem.getBuyAmount());
+        rvp.setCouponDesc(couponDesc);
+
         //设置收费明细
         costDetail(rvp, handleChildren(detail, vehicleDayNum));
         return rvp;
@@ -389,6 +396,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         if(DRIVER_TYPE_DAMAGE_SAFE.equals(detail.getDamageSafe())) {
             childrenStr.append(",${tem_0104}");
         }
+        if(detail.getFreeDays() > 0) {
+            childrenStr.append(",${tem_0105}");
+        }
         if(StrUtil.isNotBlank(detail.getOrder().getCouponTickerNos())) {
             childrenStr.append(",${tem_9901}");
         }
@@ -407,6 +417,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         OrderTemplate template = orderTemplateBiz.selectById(OrderCostEnum.RentVehicle.getCode());
         template.setTemplate(orderTemplateBiz.result(template.getTemplate(), new HashMap(){{
             put("children", children);
+            put("vehicleAmount", vo.getVehicleAmount());
+            put("realAmount", vo.getRealAmount());
         }}));
         String result = orderTemplateBiz.result(template, Dict.parse(vo));
         vo.setCostDetail(result);
@@ -433,4 +445,5 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         detail.setVehicleId(orr.getData().getVehicleId());
         detail.setBookRecordId(orr.getData().getId());
     }
+
 }

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

@@ -182,7 +182,7 @@
             and b.user_id = #{userId}
         </if>
         <if test="status != null and status == -1">
-            AND b.status in (6,-1)
+            AND b.status = -1
             and b.refund_status in (0,2)
         </if>
         <if test="status != null and status != -1">

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/fastservice/api/FastServiceApi.java

+//package com.xxfc.platform.universal.fastservice.api;
+//
+//
+//import com.alibaba.fastjson.JSONObject;
+//import com.github.wxiaoqi.security.common.util.HTTPSUtils;
+//import com.github.wxiaoqi.security.common.util.process.SystemConfig;
+//import com.xxfc.platform.universal.fastservice.dto.EventNotifyRequestDto;
+//import com.xxfc.platform.universal.fastservice.dto.RequestBodyDto;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.HashMap;
+//import java.util.Map;
+//
+//@Slf4j
+//@Service
+//public class FastServiceApi {
+//
+//    public String getAccessToken(String code) {
+//        RequestBodyDto requestBodyDto = new RequestBodyDto(SystemConfig.HUAWEI_FAST_SERVICE_GRANT_TYPE_AUTH,
+//                SystemConfig.HUAWEI_FAST_SERVICE_CLIENT_ID,
+//                SystemConfig.HUAWEI_FAST_SERVICE_CLIENT_SECRET,
+//                code,
+//                SystemConfig.HUAWEI_FAST_SERVICE_REDIRECT_URI);
+//        String paramString = requestBodyDto.getParamMap();
+//        log.info("获取token参数列表： param = {}", paramString);
+//        Map<String, String> headers = new HashMap<>();
+//        headers.put("Content-Type", "application/x-www-form-urlencoded");
+//        try {
+//            String result = HTTPSUtils.post(SystemConfig.HUAWEI_FAST_SERVICE_GET_TOKEN, paramString, headers);
+//            log.info("获取token返回结果： result = {}", result);
+//            return result;
+//        } catch (Exception e) {
+//            log.info("获取token返回失败");
+//            e.printStackTrace();
+//        }
+//      return null;
+//    }
+//
+//    public String refreshAccessToken(String refreshToken) {
+//        RequestBodyDto requestBodyDto = new RequestBodyDto(SystemConfig.HUAWEI_FAST_SERVICE_GRANT_TYPE_REFRESH_TOKEN,
+//                refreshToken,
+//                SystemConfig.HUAWEI_FAST_SERVICE_CLIENT_ID,
+//                SystemConfig.HUAWEI_FAST_SERVICE_CLIENT_SECRET
+//                );
+//        String paramString = requestBodyDto.getParamMap();
+//        Map<String, String> headers = new HashMap<>();
+//        headers.put("Content-Type", "application/x-www-form-urlencoded");
+//        try {
+//            String result = HTTPSUtils.post(SystemConfig.HUAWEI_FAST_SERVICE_GET_TOKEN, paramString, headers);
+//            log.info("刷新token返回结果： result = {}", result);
+//            return result;
+//        } catch (Exception e) {
+//            log.info("刷新token返回失败");
+//            e.printStackTrace();
+//        }
+//        return null;
+//    }
+//    public String getOpenId(String accessToken) {
+//        RequestBodyDto requestBodyDto = new RequestBodyDto(SystemConfig.HUAWEI_FAST_SERVICE_NSP_SVC,
+//                SystemConfig.HUAWEI_FAST_SERVICE_OPEN_ID,
+//                accessToken
+//        );
+//        String paramString = requestBodyDto.getParamMap();
+//        log.info("获取openId参数列表： param = {}", paramString);
+//        Map<String, String> headers = new HashMap<>();
+//        headers.put("Content-Type", "application/x-www-form-urlencoded");
+//        try {
+//            String result = HTTPSUtils.post(SystemConfig.HUAWEI_FAST_SERVICE_GET_OPENID, paramString, headers);
+//            log.info("获取openId返回结果： result = {}", result);
+//            return result;
+//        } catch (Exception e) {
+//            log.info("获取openId返回失败");
+//            e.printStackTrace();
+//        }
+//        return null;
+//    }
+//
+//    public String eventNotify(EventNotifyRequestDto eventNotifyRequestDto) {
+//        Map<String, String> headers = new HashMap<>();
+//        headers.put("x-appid", SystemConfig.HUAWEI_FAST_SERVICE_CLIENT_ID);
+//        headers.put("Authorization", eventNotifyRequestDto.getOAuthToken().getAccessToken());
+//        headers.put("Content-Type", "application/json");
+//        headers.put("Accept", "application/json");
+//        String paramString = JSONObject.toJSONString(eventNotifyRequestDto);
+//        log.info("事件通知参数列表： param = {}", paramString);
+//        try {
+//            String result = HTTPSUtils.post(SystemConfig.HUAWEI_FAST_SERVICE_EVENT_NOTIFY, paramString, headers);
+//            log.info("事件通知返回： result = {}", result);
+//            return result;
+//        } catch (Exception e) {
+//            log.info("事件通知返回失败");
+//            e.printStackTrace();
+//        }
+//        return null;
+//    }
+//
+//    public static void main(String[] args) {
+//        FastServiceApi fastServiceApi = new FastServiceApi();
+//
+//    }
+//}

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

+package com.xxfc.platform.universal.fastservice.dto;
+
+import lombok.Data;
+
+/**
+ * 快服务事件通知参数实体
+ */
+@Data
+public class EventNotifyRequestDto {
+    private String requestTime; //	String(17)	M	请求报文的发送时间，格式：yyyyMMddHHmmssSSS(UTC)
+    private String requestId;//	String	M 事件唯一ID。在消息是否重传、以及撤销时作唯一识别标识。如果重传，则需要保证重传消息的requestId与原消息的requestId一致，服务端会对重复请求进行过滤处理。其他情况，则需要保证每次requestId不同。可以使用UUID作为requestId；Pattern: [a-zA-Z0-9\-]{1,64}。
+    private String openId;	//String(512)	M	华为分配的，第三方帐号与华为帐号的关联ID。
+    private String eventName;	//	String(100)	M	事件名称，由开发者定义，在事件卡片规则中关联到某个卡片；需要保证事件名称在同一个appid下是唯一的。
+    private String parameters;	//String(255)	O  事件的参数，由开发者定义，华为快服务智慧平台透传给卡片页面。 Json格式，key不能以_、$和hag_开始，不要使用for, if, show, tid等保留字。
+    private String effectiveTime;	//String(17)	M	事件的生效时间，如酒店入住时间；UTC时区，精确到毫秒，格式：yyyyMMddHHmmssSSS。
+    private String expireTime;	//String(17)	M	事件的失效时间，超过该时间后，事件不再通知用户，UTC时区，精确到毫秒，格式：yyyyMMddHHmmssSSS。
+    private String abilityId;	//String(128)	O	通知的服务ID，开发者可以在华为快服务智慧平台的开发者控制台上获取。
+    private OAuthToken oAuthToken;	//OAuthToken	O  开发者在账号绑定完成后，如果快应用服务器需要对用户的快应用请求进行鉴权，则需要给用户分配AccessToken/RefreshToken信息；如果快应用服务器需要刷新保存在华为快服务智慧平台的用户AccessToken/RefreshToken，也通过该参数。
+}

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

+package com.xxfc.platform.universal.fastservice.dto;
+
+import lombok.Data;
+
+@Data
+public class OAuthToken {
+    private String accessToken;	//String(512)	M	快应用服务器遵循OAuth2.0规范，分配的用户AccessToken。
+    private Long tokenExpire;	//	Long	M	用户AccessToken的有效期，单位为秒，过期后，华为快服务智慧平台会使用refreshToken向快应用服务器重新申请。
+    private String refreshToken;	//	String(512)	M	快应用服务器遵循OAuth2.0规范提供的，用于刷新AccessToken的标识。
+    private String tokenType = "bearer";	//	String(64)	O	传递Token的字段，默认为 bearer。
+}

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

+package com.xxfc.platform.universal.fastservice.dto;
+
+import com.github.wxiaoqi.security.common.util.process.SystemConfig;
+import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.net.URLEncoder;
+
+@Data
+public class RequestBodyDto {
+
+    private String grantType;
+    private String refreshToken;
+    private String clientId;
+    private String clientSecret;
+    private String code;
+    private String redirectUri;
+    private String nspSvc;
+    private String openId;
+    private String accessToken;
+
+    public RequestBodyDto(String grantType, String refreshToken, String clientId, String clientSecret, String code, String redirectUri, String nspSvc, String openId, String accessToken) {
+        this.grantType = grantType;
+        this.refreshToken = refreshToken;
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+        this.code = code;
+        this.redirectUri = redirectUri;
+        this.nspSvc = nspSvc;
+        this.openId = openId;
+        this.accessToken = accessToken;
+    }
+
+    public RequestBodyDto(String grantType, String clientId, String clientSecret, String code, String redirectUri) {
+        this.grantType = grantType;
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+        this.code = code;
+        this.redirectUri = redirectUri;
+    }
+
+    public RequestBodyDto(String grantType, String refreshToken, String clientId, String clientSecret) {
+        this.grantType = grantType;
+        this.refreshToken = refreshToken;
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+    }
+
+    public RequestBodyDto(String nspSvc, String openId, String accessToken) {
+        this.nspSvc = nspSvc;
+        this.openId = openId;
+        this.accessToken = accessToken;
+    }
+
+    public String getParamMap(){
+        StringBuilder stringBuilder = new StringBuilder();
+        if(StringUtils.isNotBlank(this.grantType)) {
+            stringBuilder.append("granType = ");
+            stringBuilder.append( URLEncoder.encode(this.grantType));
+            stringBuilder.append("&");
+        }
+        if(StringUtils.isNotBlank(this.refreshToken)) {
+            stringBuilder.append("refresh_token = ");
+            stringBuilder.append( URLEncoder.encode(this.refreshToken));
+            stringBuilder.append("&");
+        }
+        if(StringUtils.isNotBlank(this.clientId)) {
+            stringBuilder.append("client_id = ");
+            stringBuilder.append( URLEncoder.encode(this.clientId));
+            stringBuilder.append("&");
+        }
+        if(StringUtils.isNotBlank(this.clientSecret)) {
+            stringBuilder.append("client_secret = ");
+            stringBuilder.append( URLEncoder.encode(this.clientSecret));
+            stringBuilder.append("&");
+        }
+        if(StringUtils.isNotBlank(this.code)) {
+            stringBuilder.append("code = ");
+            stringBuilder.append( URLEncoder.encode(this.code));
+            stringBuilder.append("&");
+        }
+        if(StringUtils.isNotBlank(this.redirectUri)) {
+            stringBuilder.append("redirect_uri = ");
+            stringBuilder.append( URLEncoder.encode(this.redirectUri));
+            stringBuilder.append("&");
+        }
+        if(StringUtils.isNotBlank(this.nspSvc)) {
+            stringBuilder.append("nsp_svc = ");
+            stringBuilder.append( URLEncoder.encode(this.nspSvc));
+            stringBuilder.append("&");
+        }
+        if(StringUtils.isNotBlank(this.openId)) {
+            stringBuilder.append("open_id = ");
+            stringBuilder.append( URLEncoder.encode(this.openId));
+            stringBuilder.append("&");
+        }
+        if(StringUtils.isNotBlank(this.accessToken)) {
+            stringBuilder.append("access_token = ");
+            stringBuilder.append( URLEncoder.encode(this.accessToken));
+            stringBuilder.append("&");
+        }
+        return stringBuilder.toString();
+    }
+}

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

@@ -18,6 +18,11 @@ public class VehicleBookRecordQueryVo extends PageParam {
      */
     private String numberPlate;
 
+    /**
+     * 车牌和车辆编号的关键字
+     */
+    private String keywords;
+
     /**
      * 所属分支机构（id）
      */

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

@@ -44,6 +44,8 @@ public class VehiclePlanDto extends PageParam {
      */
     private Integer useType;
 
+    private String keywords;
+
     /**
      * 车型id
      */

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.biz;
 import cn.hutool.core.bean.BeanUtil;
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
@@ -393,4 +394,8 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         pageDataVO.setTotalCount(dataVO.getTotalCount());
         return pageDataVO;
     }
+    public  List<JSONObject> getList(){
+     return  mapper.getList();
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.vehicle.biz;
 
 
 import com.ace.cache.annotation.CacheClear;
+import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.RandomUtil;
@@ -25,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
+import tk.mybatis.mapper.entity.Example;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -124,6 +126,36 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
 
         return  ObjectRestResponse.succ();
     }
+    //临时数据同步5(添加车辆)
+    public ObjectRestResponse synchro5(){
+        List<JSONObject> list= branchCompanyBiz.getList();
+        Integer number=10000;
+        if (list.size()>0){
+
+            for (JSONObject obj:list){
+                Integer code= obj.getInteger("code");
+                if (code==null||code==0){
+                    continue;
+                }
+                Example example=new Example(Vehicle.class);
+                example.createCriteria().andEqualTo("code",code);
+                List<Vehicle> vehicles=vehicleBiz.selectByExample(example);
+                int num=0;
+                for (Vehicle vehicle:vehicles){
+                    num++;
+                    if (num==1){
+                        continue;
+                    }
+                    number++;
+                    vehicle.setCode(number);
+                    vehicleBiz.updateSelectiveById(vehicle);
+                }
+            }
+
+        }
+        return  ObjectRestResponse.succ();
+    }
+
 
     public  String  getNumberPlate(int number){
         String str=number+"";

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

@@ -643,7 +643,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if (vehicleBookRecord == null) {
             return RestResponse.codeAndMessage(ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getCode(), ResCode.VEHICLE_BOOK_RECORD_IS_NOT_EXIST.getDesc());
         }
-        //已通过审核的可以取消预定
+//        //已通过审核的可以取消预定
 //        if (!VehicleBookRecordStatus.APPROVE.getCode().equals(vehicleBookRecord.getStatus())) {
 //            return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_ALREADY_CHANGED.getCode());
 //        }

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

 package com.xxfc.platform.vehicle.mapper;
 
+import com.alibaba.fastjson.JSONObject;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyListDTO;
 import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -17,4 +19,8 @@ public interface BranchCompanyMapper extends Mapper<BranchCompany>, SelectByIdLi
     List<Integer> findCompanyIdsByAreaId(@Param("areaId") Integer areaId);
 
     List<BranchCompanyListDTO > findBranchCompanys(@Param("provinceCode") Integer provinceCode,@Param("cityCode") Integer cityCode);
+
+
+    @Select("SELECT `code`,count(id) cd FROM `vehicle` WHERE is_del=0 and number_plate LIKE '%测试%' GROUP  BY code HAVING cd>=2")
+    List<JSONObject> getList();
 }
\ No newline at end of file

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

@@ -33,8 +33,8 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
 
     @ApiOperation("同步股权3")
     @PostMapping("synchro3")
-    public ObjectRestResponse<String> synchro3() {
-        return baseBiz.synchro3();
+    public ObjectRestResponse synchro3() {
+        return baseBiz.synchro5();
     }
 
 

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

@@ -482,9 +482,6 @@
             <if test="status != null">
                 and v1.status = #{status}
             </if>
-            <if test="code !=null">
-                and v1.code=#{code}
-            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v1.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
@@ -508,9 +505,6 @@
             <if test="status != null">
                 and v2.status = #{status}
             </if>
-            <if test="code !=null">
-                and v2.code=#{code}
-            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and v2.park_branch_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">