同上

src/main/java/com/dk/mdm/mapper/sale/OrderItemMapper.xml

@@ -60,37 +60,37 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.sale.OrderItemResponse">
         <id column="item_id" property="itemId"/>
-                <result column="order_id" property="orderId" typeHandler="UuidTypeHandler"/>
-                <result column="item_index" property="itemIndex"/>
-                <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
-                <result column="unit_id" property="unitId" typeHandler="UuidTypeHandler"/>
-                <result column="sub_unit_id" property="subUnitId" typeHandler="UuidTypeHandler"/>
-                <result column="pack_box" property="packBox"/>
-                <result column="item_qty" property="itemQty"/>
-                <result column="price_std" property="priceStd"/>
-                <result column="amt_std" property="amtStd"/>
-                <result column="price_sale" property="priceSale"/>
-                <result column="item_amt" property="itemAmt"/>
-                <result column="price_discount" property="priceDiscount"/>
-                <result column="non_std_code" property="nonStdCode"/>
-                <result column="out_status" property="outStatus"/>
-                <result column="outing_qty" property="outingQty"/>
-                <result column="outing_amt" property="outingAmt"/>
-                <result column="out_qty" property="outQty"/>
-                <result column="out_amt" property="outAmt"/>
-                <result column="return_qty" property="returnQty"/>
-                <result column="return_amt" property="returnAmt"/>
-                <result column="remarks" property="remarks"/>
-                <result column="flg_valid" property="flgValid"/>
-                <result column="cp_id" property="cpId"/>
-                <result column="wh_id" property="whId"/>
-                <result column="wh_name" property="whName"/>
-                <result column="order_no" property="orderNo"/>
+        <result column="order_id" property="orderId" typeHandler="UuidTypeHandler"/>
+        <result column="item_index" property="itemIndex"/>
+        <result column="sku_id" property="skuId" typeHandler="UuidTypeHandler"/>
+        <result column="unit_id" property="unitId" typeHandler="UuidTypeHandler"/>
+        <result column="sub_unit_id" property="subUnitId" typeHandler="UuidTypeHandler"/>
+        <result column="pack_box" property="packBox"/>
+        <result column="item_qty" property="itemQty"/>
+        <result column="price_std" property="priceStd"/>
+        <result column="amt_std" property="amtStd"/>
+        <result column="price_sale" property="priceSale"/>
+        <result column="item_amt" property="itemAmt"/>
+        <result column="price_discount" property="priceDiscount"/>
+        <result column="non_std_code" property="nonStdCode"/>
+        <result column="out_status" property="outStatus"/>
+        <result column="outing_qty" property="outingQty"/>
+        <result column="outing_amt" property="outingAmt"/>
+        <result column="out_qty" property="outQty"/>
+        <result column="out_amt" property="outAmt"/>
+        <result column="return_qty" property="returnQty"/>
+        <result column="return_amt" property="returnAmt"/>
+        <result column="remarks" property="remarks"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <result column="wh_id" property="whId"/>
+        <result column="wh_name" property="whName"/>
+        <result column="order_no" property="orderNo"/>
         <result column="brand_name" property="brandName"/>
         <result column="short_name" property="shortName"/>
         <result column="sku_images" property="skuImages" typeHandler="JsonTypeHandler"/>
-                <result column="transferableQuantity" property="transferableQuantity"/>
-                <result column="skuImages" property="skuImages" typeHandler="JsonTypeHandler"/>
+        <result column="transferableQuantity" property="transferableQuantity"/>
+        <result column="skuImages" property="skuImages" typeHandler="JsonTypeHandler"/>
         <result column="decimalPlaces" property="decimalPlaces"/>
         <result column="fact_price" property="factPrice"/>
         <result column="fact_amt" property="factAmt"/>

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -16,43 +16,43 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.sale.Order">
         <id column="order_id" property="orderId"/>
-            <result column="order_no" property="orderNo"/>
-            <result column="order_type" property="orderType"/>
-            <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
-            <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
-            <result column="cus_id" property="cusId" typeHandler="UuidTypeHandler"/>
-            <result column="address_area" property="addressArea" typeHandler="JsonTypeHandler"/>
-            <result column="address_name" property="addressName"/>
-            <result column="address_no" property="addressNo"/>
-            <result column="address_gcj02" property="addressGcj02" typeHandler="JsonTypeHandler"/>
-            <result column="address_full" property="addressFull"/>
-            <result column="contact_name" property="contactName"/>
-            <result column="contact_phone" property="contactPhone"/>
-            <result column="sales_channel" property="salesChannel" typeHandler="UuidTypeHandler"/>
-            <result column="delivery_date" property="deliveryDate" typeHandler="TimestampTypeHandler"/>
-            <result column="sum_quantity" property="sumQuantity"/>
-            <result column="sum_standard" property="sumStandard"/>
-            <result column="sum_amount" property="sumAmount"/>
-            <result column="sale_discount" property="saleDiscount"/>
-            <result column="order_status" property="orderStatus"/>
-            <result column="out_status" property="outStatus"/>
-            <result column="outing_qty" property="outingQty"/>
-            <result column="outing_amt" property="outingAmt"/>
-            <result column="out_qty" property="outQty"/>
-            <result column="out_amt" property="outAmt"/>
-            <result column="return_qty" property="returnQty"/>
-            <result column="return_amt" property="returnAmt"/>
-            <result column="amt_receivable" property="amtReceivable"/>
-            <result column="amt_handle" property="amtHandle"/>
-            <result column="amt_residue" property="amtResidue"/>
-            <result column="remarks" property="remarks"/>
-            <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
-            <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
-            <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
-            <result column="flg_valid" property="flgValid"/>
-            <result column="cp_id" property="cpId"/>
-            <result column="fact_amt" property="factAmt"/>
-            <result column="disc_amt" property="discAmt"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="order_type" property="orderType"/>
+        <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
+        <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
+        <result column="cus_id" property="cusId" typeHandler="UuidTypeHandler"/>
+        <result column="address_area" property="addressArea" typeHandler="JsonTypeHandler"/>
+        <result column="address_name" property="addressName"/>
+        <result column="address_no" property="addressNo"/>
+        <result column="address_gcj02" property="addressGcj02" typeHandler="JsonTypeHandler"/>
+        <result column="address_full" property="addressFull"/>
+        <result column="contact_name" property="contactName"/>
+        <result column="contact_phone" property="contactPhone"/>
+        <result column="sales_channel" property="salesChannel" typeHandler="UuidTypeHandler"/>
+        <result column="delivery_date" property="deliveryDate" typeHandler="TimestampTypeHandler"/>
+        <result column="sum_quantity" property="sumQuantity"/>
+        <result column="sum_standard" property="sumStandard"/>
+        <result column="sum_amount" property="sumAmount"/>
+        <result column="sale_discount" property="saleDiscount"/>
+        <result column="order_status" property="orderStatus"/>
+        <result column="out_status" property="outStatus"/>
+        <result column="outing_qty" property="outingQty"/>
+        <result column="outing_amt" property="outingAmt"/>
+        <result column="out_qty" property="outQty"/>
+        <result column="out_amt" property="outAmt"/>
+        <result column="return_qty" property="returnQty"/>
+        <result column="return_amt" property="returnAmt"/>
+        <result column="amt_receivable" property="amtReceivable"/>
+        <result column="amt_handle" property="amtHandle"/>
+        <result column="amt_residue" property="amtResidue"/>
+        <result column="remarks" property="remarks"/>
+        <result column="annex_paths" property="annexPaths" typeHandler="JsonTypeHandler"/>
+        <result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
+        <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <result column="fact_amt" property="factAmt"/>
+        <result column="disc_amt" property="discAmt"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -196,10 +196,10 @@
         <result column="contact_phone" property="contactPhone"/>
         <result column="cus_from" property="cusFrom" typeHandler="UuidTypeHandler"/>
         <result column="channel_id" property="channelId" typeHandler="UuidTypeHandler"/>
-
-        <collection property="orderItemResponseList" resultMap="itemListMap" columnPrefix="list_"/>
         <result column="fact_amt" property="factAmt"/>
         <result column="disc_amt" property="discAmt"/>
+        <collection property="orderItemResponseList" resultMap="itemListMap" columnPrefix="list_"/>
+
     </resultMap>
     <!--小程序用 关联映射-->
     <resultMap id="itemListMap" type="java.util.Map">