Merge branch 'master-invoice-modular' into dev

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

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

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

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

@@ -127,7 +127,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             if (value.getType()!=1){
                 Example example = new Example(OrderAccount.class);
                 //获取退还部分押金和剩余押金的记录
-                example.createCriteria().andEqualTo("orderId",value.getOrderId()).andIn("accountType",Lists.newArrayList(AccountTypeEnum.OUT_PART_DEPOSIT.getCode(),AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode()));
+                example.createCriteria().andEqualTo("orderId",value.getOrderId()).andIn("accountType",Lists.newArrayList(AccountTypeEnum.OUT_PART_DEPOSIT.getCode(),AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode())).andEqualTo("accountStatus", 1);
                 List<OrderAccount> orderAccounts = orderAccountBiz.selectByExample(example);
                 if (CollectionUtil.isEmpty(orderAccounts)) {
                     value.setActualDeposit("定损中");

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

@@ -190,6 +190,9 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         }
         //dto.setCrtUser(Integer.valueOf(BaseContextHandler.getUserID()));
         dto.setUserId(Integer.valueOf(BaseContextHandler.getUserID()));
+        if (dto.getType() == OrderTypeEnum.RENT_VEHICLE.getCode()) {
+            dto.setRefundStatus(3);
+        }
         Query query = new Query(dto);
         PageDataVO<OrderPageVO> pages = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
         pages.getData().parallelStream().forEach(data -> {

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

@@ -3,28 +3,6 @@
 
 <mapper namespace="com.xxfc.platform.order.mapper.BaseOrderMapper">
 
-    <!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.xxfc.platform.order.entity.BaseOrder" id="baseOrderMap">
-        <result property="id" column="id"/>
-        <result property="no" column="no"/>
-        <result property="type" column="type"/>
-        <result property="detailId" column="detail_id"/>
-        <result property="status" column="status"/>
-        <result property="productAmount" column="product_amount"/>
-        <result property="orderAmount" column="order_amount"/>
-        <result property="detailJson" column="detail_json"/>
-        <result property="thirdType" column="third_type"/>
-        <result property="outTradeNo" column="out_trade_no"/>
-        <result property="crtTime" column="crt_time"/>
-        <result property="crtUser" column="crt_user"/>
-        <result property="crtName" column="crt_name"/>
-        <result property="crtHost" column="crt_host"/>
-        <result property="updTime" column="upd_time"/>
-        <result property="updUser" column="upd_user"/>
-        <result property="updName" column="upd_name"/>
-        <result property="updHost" column="upd_host"/>
-    </resultMap>
-
     <resultMap type="com.xxfc.platform.order.pojo.order.OrderPageVO" id="orderPageMap">
         <result javaType="Integer" column="type" property="type"></result>
         <discriminator javaType="Integer" column="type">
@@ -90,6 +68,12 @@
             <if test="type != null">
                 and type = #{type}
             </if>
+            <if test="invoiceStatus != null">
+                and invoice_status = #{invoiceStatus}
+            </if>
+            <if test="refundStatus != null">
+                and refund_status = #{refundStatus}
+            </if>
             <if test="hasMemberRight != null">
                 and has_member_right = #{hasMemberRight}
             </if>