Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

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

@@ -2,6 +2,8 @@ package com.xxfc.platform.order.pojo.bg;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import javax.persistence.Column;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -109,4 +111,7 @@ public class BgOrderListVo {
 	private Integer refundStatus;
 	//员工身份
 	private String positionName;
+
+	@Column(name = "order_sign")
+	private Integer orderSign;
 }

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

@@ -14,6 +14,8 @@ import java.util.List;
 public class ActivityOrderBO extends OrderActiveDetail implements OrderDetail {
 	private BaseOrder order;
 	private AppUserDTO appUserDTO;
+
+
 	/**
 	 * 促成人联系方式
 	 */

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

@@ -50,4 +50,6 @@ public class QueryOrderDTO extends PageParam {
 
     private Integer orderSign;
 
+    private String multiOrderSign;
+
 }
\ No newline at end of file

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

@@ -41,6 +41,11 @@ public class RentVehiclePriceVO extends OrderPriceVO{
     private String costDetail = "";
     @ApiModelProperty(value = "价格类型：1-按天；2-按小时")
     private Integer priceType;
+    /**
+     * 订单标记 1--普通订单；2--需求预定申请订单；3--特惠租车订单
+     */
+    private Integer orderSign = 1;
+
 
 //    /**
 //     * 原租车天数

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

@@ -432,6 +432,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
 
         Integer bizType;
 
+        private String multiOrderSign;
+
     }
 
     @RequestMapping(value = "/app/unauth/refund/{no}/{refundAmount}", method = RequestMethod.POST)

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

@@ -567,6 +567,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
         //生成订单明细
         RentVehiclePriceVO rvp = new RentVehiclePriceVO();
+        rvp.setOrderSign(detail.getOrderSign());
         rvp.setDeposit(depositAmount);
         rvp.setDriverPrice(DRIVER_PRICE);
         rvp.setDamageSafePrice(DAMAGE_SAFE);
@@ -758,6 +759,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
         //生成订单明细
         RentVehiclePriceVO rvp = new RentVehiclePriceVO();
+        rvp.setOrderSign(detail.getOrderSign());
         rvp.setDeposit(depositAmount);
         rvp.setDriverPrice(DRIVER_PRICE);
         rvp.setDamageSafePrice(DAMAGE_SAFE);

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

@@ -62,6 +62,14 @@
         select *
         from base_order
         <where>
+            <if test="multiOrderSign != null">
+                and
+                (
+                <foreach collection="multiOrderSign.split(',')" index="sIndex" item="signEntity" separator=" or ">
+                    order_sign = #{signEntity}
+                </foreach>
+                )
+            </if>
             <if test="orderSign != null">
                 and order_sign = #{orderSign}
             </if>
@@ -260,6 +268,14 @@
     <select id="getAllOrderList" parameterType="Map" resultType="com.xxfc.platform.order.pojo.bg.BgOrderListVo">
         SELECT * from order_list_info
         <where>
+            <if test="multiOrderSign != null">
+                and
+                (
+                <foreach collection="multiOrderSign.split(',')" index="sIndex" item="signEntity" separator=" or ">
+                    order_sign = #{signEntity}
+                </foreach>
+                )
+            </if>
             <if test="userIds != null and userIds.size() > 0">
                 and userId in
                 <foreach collection="userIds" item="item" open="(" separator="," close=")">