Merge branch 'dev' into base-modify

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

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

@@ -26,6 +26,8 @@ public class Menu {
     private String type;
 
     private String state;
+    @Column(name = "order_num")
+    private  Integer orderNum;
 
     private String description;
 
@@ -183,6 +185,20 @@ public class Menu {
         this.state = state;
     }
 
+    /**
+     * @return orderNum
+     */
+    public Integer getOrderNum() {
+        return orderNum;
+    }
+
+    /**
+     * @param orderNum
+     */
+    public void setOrderNum(Integer orderNum) {
+        this.orderNum = orderNum;
+    }
+
     /**
      * @return description
      */

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/PermissionService.java

@@ -23,6 +23,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -178,6 +179,9 @@ public class PermissionService {
         User user = userBiz.getUserByUsername(username);
         List<Menu> menus = menuBiz.getUserAuthorityMenuByUserId(user.getId());
         menus=menus.stream().filter(a->state.contains(a.getState()==null?"1":a.getState())).collect(Collectors.toList());
+        if (state.contains("2")){
+            menus.sort(Comparator.comparing(Menu::getOrderNum));
+        }
         return getMenuTree(menus,AdminCommonConstant.ROOT);
     }
 }

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

@@ -13,6 +13,7 @@
         <result column="icon" jdbcType="VARCHAR" property="icon"/>
         <result column="type" jdbcType="CHAR" property="type"/>
         <result column="state" jdbcType="INTEGER" property="state"/>
+        <result column="order_num" jdbcType="INTEGER" property="orderNum"/>
         <result column="description" jdbcType="VARCHAR" property="description"/>
         <result column="crt_time" jdbcType="DATE" property="crtTime"/>
         <result column="crt_user" jdbcType="VARCHAR" property="crtUser"/>

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

@@ -15,6 +15,7 @@ public enum OrderCostEnum {
      * 编码
      */
     private String code;
+
     /**
      * 类型描述
      */

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

 package com.xxfc.platform.order.entity;
 
+import com.github.wxiaoqi.security.common.util.JsonUtil;
+import com.xxfc.platform.order.pojo.price.CostDetailExtend;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -327,4 +329,8 @@ public class OrderRentVehicleDetail implements Serializable {
 	@ApiModelProperty(value = "费用其他明细 type：1--取消违约金；2--取消费用明细；3--提前还车费用明细；4--延期还车费用明细")
 	private String costDetailExtend;
 
+
+	public void handelCostDetailExtend(CostDetailExtend costDetailExtend) {
+		this.costDetailExtend = JsonUtil.objectToJson(((CostDetailExtend)costDetailExtend));
+	}
 }

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

@@ -64,6 +64,6 @@ public class OrderStatistics {
     /**
      * 历史实际消费总额
      */
-    @ApiModelProperty(value = "实际消费总额")
+    @ApiModelProperty(value = "历史实际消费总额")
     private BigDecimal totalExpenditure;
 }

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

 package com.xxfc.platform.order.entity;
 
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
+import com.github.wxiaoqi.security.common.util.JsonUtil;
+import com.xxfc.platform.order.pojo.price.CostDetailExtend;
 import com.xxfc.platform.tour.entity.TourUser;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -251,4 +253,8 @@ public class OrderTourDetail implements Serializable {
 
 	@Transient
 	private List<TourUser> userVoList;
+
+	public void handelCostDetailExtend(CostDetailExtend costDetailExtend) {
+		this.costDetailExtend = JsonUtil.objectToJson(((CostDetailExtend)costDetailExtend));
+	}
 }

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

@@ -11,19 +11,19 @@ public class OrderAccountDetail {
     /**
      * 实际返回订单款 账单的的orderAmount 对应的是 订单的商品金额
      */
-    BigDecimal orderAmount;
+    BigDecimal orderAmount = BigDecimal.ZERO;
     /**
      * 实际返回押金款
      */
-    BigDecimal depositAmount;
+    BigDecimal depositAmount = BigDecimal.ZERO;
     /**
      * 原来要返回的订单款 账单的的orderAmount 对应的是 订单的商品金额
      */
-    BigDecimal originOrderAmount;
+    BigDecimal originOrderAmount = BigDecimal.ZERO;
     /**
      * 原来要返回的押金款
      */
-    BigDecimal originDepositAmount;
+    BigDecimal originDepositAmount = BigDecimal.ZERO;
 
     /**
      * 扣款列表

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

@@ -9,32 +9,32 @@ public class CancelStartedVO extends CostDetailExtend {
     /**
      * 消费金额（实际计费）
      */
-    private BigDecimal consumeAmount;
+    private BigDecimal consumeAmount = BigDecimal.ZERO;
 
     /**
      * 租车单价
      */
-    private BigDecimal modelAmount;
+    private BigDecimal modelAmount = BigDecimal.ZERO;
 
     /**
      * 使用天数
      */
-    private Integer usedDayNum;
+    private Integer usedDayNum = 0;
 
     /**
      * 使用金额
      */
-    private BigDecimal usedAmount;
+    private BigDecimal usedAmount = BigDecimal.ZERO;
 
     /**
      * 使用免费天数
      */
-    private Integer usedfreeDayNum;
+    private Integer usedfreeDayNum = 0;
 
     /**
      * 使用免费金额
      */
-    private BigDecimal usedFreeAmount;
+    private BigDecimal usedFreeAmount = BigDecimal.ZERO;
 
     /**
      * 违约金描述
@@ -44,5 +44,20 @@ public class CancelStartedVO extends CostDetailExtend {
     /**
      * 违约金金额
      */
-    private BigDecimal violateAmount;
+    private BigDecimal violateAmount = BigDecimal.ZERO;
+
+    /**
+     * 优惠金额
+     */
+    private BigDecimal couponAmount = BigDecimal.ZERO;
+
+    /**
+     * 优惠描述
+     */
+    private String couponDesc;
+
+    /**
+     * 原订单是否包含优惠券
+     */
+    private Boolean hadConpon = Boolean.FALSE;
 }

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

@@ -188,7 +188,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                 refundGoodsAmount = new BigDecimal((IntervalUtil.evaluate(dic.getDetail(), new MapContext(){{
                     //ga : goodsAmount
                     set("ga", goodsAmount);
-                }})).toString());
+                }})+ "").toString());
                 refundDescBuilder = refundDescBuilder.insert(0, names[1]+ ",");
                 if(goodsAmount.subtract(refundGoodsAmount).compareTo(BigDecimal.ZERO) > 0) {
                     orderAccountDetail.getDeductions().add(initDeduction(goodsAmount.subtract(refundGoodsAmount), names[1], DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT));

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

@@ -56,7 +56,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
         OrderStatistics member = membersBiz.findAll(companyId);
         if (vehicle != null) {
             HomePageOrderData data = new HomePageOrderData() {{
-                setTotalOrders(member.getTotalGmv().subtract(member.getTotalReturnGmv()));
+                setTotalOrders(member.getTotalGmv());
 
             }};
             orderStatistics.add(data);

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

@@ -14,6 +14,7 @@ import com.xxfc.platform.order.pojo.price.CancelStartedVO;
 import com.xxfc.platform.order.pojo.price.CostDetailExtend;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -69,24 +70,51 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
         }});
     }
 
-    /**
-     * 计算费用明细
-     * @param vo
-     * @return
-     */
-    public void handleCostDetailExtend(CancelNoStartVO vo) {
+    public <T extends CostDetailExtend> void handleCostDetailExtend(T costDetailExtend) {
+        switch (costDetailExtend.getType()) {
+            case CostDetailExtend.CANCEL_NO_START :
+                break;
+            case CostDetailExtend.CANCEL_STARTED :
+                OrderTemplate template = selectByCode(OrderCostEnum.RENT_VEHICLE.getCode());
+                template.setTemplate(result(template.getTemplate(), new HashMap(){{
+                    put("children", handleChildren(costDetailExtend));
+                    put("consumeAmount", ((CancelStartedVO)costDetailExtend).getConsumeAmount());
+                }}));
+                break;
+            case CostDetailExtend.FINLISH_ADVANCE :
+                break;
+            case CostDetailExtend.FINLISH_DELAY :
+                break;
+            default:
+                break;
+        }
         OrderTemplate template = selectByCode(OrderCostEnum.CANCEL_NO_START.getCode());
-        vo.setCostDetail(result(template.getTemplate(), Dict.parse(vo)));
+        costDetailExtend.setCostDetail(result(template.getTemplate(), Dict.parse(costDetailExtend)));
     }
 
-    /**
-     * 取消费用明细
-     * @param vo
-     * @return
-     */
-    public void handleCostDetailExtend(CancelStartedVO vo) {
-        OrderTemplate template = selectByCode(OrderCostEnum.CANCEL_STARTED.getCode());
-        vo.setCostDetail(result(template.getTemplate(), Dict.parse(vo)));
+    public <T extends CostDetailExtend> String handleChildren(T costDetailExtend) {
+        StringBuffer childrenStr = new StringBuffer("");
+        if(costDetailExtend instanceof CancelStartedVO) {
+            CancelStartedVO cancelStartedVO = (CancelStartedVO)costDetailExtend;
+            childrenStr.append(",${tem_0401}");
+            if(cancelStartedVO.getUsedfreeDayNum() > 0 ) {
+                childrenStr.append(",${tem_0402}");
+            }
+            if(cancelStartedVO.getHadConpon()) {
+                if(cancelStartedVO.getCouponAmount().compareTo(BigDecimal.ZERO) > 0) {
+                    childrenStr.append(",${tem_0901}");
+                }else {
+                    childrenStr.append(",${tem_0902}");
+                }
+            }
+            if(cancelStartedVO.getViolateAmount().compareTo(BigDecimal.ZERO) > 0) {
+                childrenStr.append(",${tem_0903}");
+            }
+        }
+        if(childrenStr.length() > 0){
+            childrenStr.deleteCharAt(0);
+        }
+        return childrenStr.toString();
     }
 
     public static void main(String[] args) {

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

@@ -157,7 +157,7 @@ public class OrderCalculateBiz {
             setOrderId(baseOrder.getId());
         }});
         Integer freeDays = (null == orderItem.getCutNum())?0 :orderItem.getCutNum();
-        return inProgressCalculate(baseOrder, orderItem, freeDays, useDays, null);
+        return inProgressCalculate(baseOrder, orderItem, freeDays, useDays, new OrderAccountDetail());
     }
 
     public InProgressVO calculateOrderComplete(BaseOrder baseOrder, OrderRentVehicleDetail orvd, OrderAccountDetail oad, OrderItem orderItem, Integer useDays) {

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

@@ -175,7 +175,7 @@ public class OrderCancelBiz {
                             }
                         }
                         orderTemplateBiz.handleCostDetailExtend(csv);
-                        orvd.setCostDetailExtend(csv.getCostDetail());
+                        orvd.handelCostDetailExtend(csv);
                         orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
                     }else {
                         //没到出车时间
@@ -186,11 +186,11 @@ public class OrderCancelBiz {
                             //违约金封顶 租车身份价 * 2天
                             BigDecimal topAmount = orderItem.getUnitPrice().multiply(new BigDecimal(2+ ""));
                             if(freeDayAmount.compareTo(topAmount) > 0) {
-                                freeDayAmount = freeDayAmount;
+                                freeDayAmount = topAmount;
                             }
                         }
                         //退款流程
-                        orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount, null);
+                        orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount, oad);
 
                         //如果有扣款项，则生成额外的费用明细
                         if(oad.getDeductions().size() > 0) {
@@ -201,7 +201,7 @@ public class OrderCancelBiz {
                                         setViolateDesc(deduction.getName());
                                     }};
                                     orderTemplateBiz.handleCostDetailExtend(cnsv);
-                                    orvd.setCostDetailExtend(cnsv.getCostDetail());
+                                    orvd.handelCostDetailExtend(cnsv);
                                     orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
                                 }
                             }

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

@@ -108,7 +108,7 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
             if (TYPE_MEMBER.equals(type)) {
                 OrderStatistics member = membersBiz.findAll(companyId);
                 return ObjectRestResponse.succ(new HomePageOrderData(){{
-                    setTotalOrders(member.getTotalGmv().subtract(member.getTotalReturnGmv()));
+                    setTotalOrders(member.getTotalGmv());
 
                 }});
             }

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

@@ -130,7 +130,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         //设置订单状态为3
         bo.getOrder().setStatus(OrderStatusEnum.ORDER_UNPAY.getCode());
         //设置订单图片
-        bo.getOrder().setPicture(bo.getVehicleModel().getPicture());
+
+        bo.getOrder().setPicture(StrUtil.isNotBlank(bo.getVehicleModel().getCoverPic())? bo.getVehicleModel().getCoverPic(): bo.getVehicleModel().getPicture());
         //设置订单名称
         bo.getOrder().setName(bo.getVehicleModel().getName());
 
@@ -410,7 +411,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
      * @return
      */
     private void costDetail(RentVehiclePriceVO vo, String children) {
-        OrderTemplate template = orderTemplateBiz.selectById(OrderCostEnum.RENT_VEHICLE.getCode());
+        OrderTemplate template = orderTemplateBiz.selectByCode(OrderCostEnum.RENT_VEHICLE.getCode());
         template.setTemplate(orderTemplateBiz.result(template.getTemplate(), new HashMap(){{
             put("children", children);
             put("vehicleAmount", vo.getVehicleAmount());

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

@@ -310,7 +310,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
      * @return
      */
     private void costDetail(TourPriceVO vo, String children) {
-        OrderTemplate template = orderTemplateBiz.selectById(OrderCostEnum.RENT_VEHICLE.getCode());
+        OrderTemplate template = orderTemplateBiz.selectByCode(OrderCostEnum.RENT_VEHICLE.getCode());
         template.setTemplate(orderTemplateBiz.result(template.getTemplate(), new HashMap(){{
             put("children", children);
         }}));

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodVerificationMapper.xml

@@ -45,7 +45,7 @@
         </if>
         <if test="travelDate!=null">
             and p.start_time=#{travelDate}
-        </if> ORDER BY s.depart_time ) as `goodOrder`
+        </if> ORDER BY p.start_time DESC ) as `goodOrder`
     </select>
     <!-- 获取旅游路线id-->
      <select id="getGoodList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">

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

@@ -10,11 +10,9 @@ import com.xxfc.platform.vehicle.pojo.dto.BranchCompanyFindDTO;
 import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranComanyLeaderVo;
 import com.xxfc.platform.vehicle.pojo.vo.BranchCompanyListVO;
-import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

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

@@ -259,9 +259,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if (addOrUpdateVehicleVo.getNumberPlate() == null) {
             throw new BaseException(ResultCode.NUMBER_PLAT_CAN_NOT_BE_NULL);
         }
-         boolean exist = checkCodeExist(addOrUpdateVehicleVo.getCode(),addOrUpdateVehicleVo.getId());
-        if (exist){
-            throw new BaseException("车辆编码已经被占用",400);
+        boolean exist = checkCodeExist(addOrUpdateVehicleVo.getCode(), addOrUpdateVehicleVo.getId());
+        if (exist) {
+            throw new BaseException("车辆编码已经被占用", 400);
         }
         List<Vehicle> vehicles = mapper.lockByCode(addOrUpdateVehicleVo);
         return vehicles;

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

@@ -19,7 +19,6 @@ 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,@Param("name") String name);
-    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")

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

@@ -327,7 +327,7 @@
 
     <select id="selectByVehicleIdAndTime" parameterType="java.util.Map" resultMap="searchBookRecord">
         select v1.* from vehicle_book_record v1
-         where v1.vehicle_id = #{vehicleId} and v1.book_end_date > #{time} and v1.status BETWEEN 1 and 2
+         where v1.vehicle_id = #{vehicleId} and v1.book_end_date &gt; #{time} and v1.status BETWEEN 1 and 2
     </select>
 
     <select id="selectZeroHourRecord" resultMap="searchBookRecord" parameterType="java.util.Map">
@@ -475,12 +475,12 @@
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}
             </if>
-            <if test="keywords != null and keywords != ''">
-                and (v3.number_plate like concat('%', #{keywords}, '%') or v3.code like concat('%', #{keywords}, '%'))
-            </if>
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
             </if>
+            <if test="keywords != null and keywords != ''">
+                and (v3.number_plate like concat('%', #{keywords}, '%') or v3.code like concat('%', #{keywords}, '%'))
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and (v1.lift_company in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">