|
|
@@ -71,6 +71,7 @@
|
|
|
LEFT JOIN tb_rst_store_info trsi ON tb_rst_sales_order_info.sales_store_id = trsi.store_id
|
|
|
LEFT JOIN tb_rst_order_batch od ON tb_rst_sales_order_info.sales_batch_id = od.batch_id
|
|
|
LEFT JOIN tb_rst_customer_info ci ON tb_rst_sales_order_info.sales_customer_id = ci.customer_id
|
|
|
+ LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
|
|
|
<where>
|
|
|
<if test="salesIsDownload !=null and salesIsDownload !=''">
|
|
|
AND sales_is_download = #{salesIsDownload}
|
|
|
@@ -114,6 +115,9 @@
|
|
|
<if test="salesAddressInfo !=null and salesAddressInfo !=''">
|
|
|
AND sales_address_info like CONCAT('%',#{salesAddressInfo},'%')
|
|
|
</if>
|
|
|
+ <if test="itemProductName !=null and itemProductName !=''">
|
|
|
+ AND oi.item_product_color like CONCAT('%',#{itemProductName},'%')
|
|
|
+ </if>
|
|
|
<if test="startDate != null and startDate != ''">
|
|
|
AND sales_create_time <![CDATA[>=]]> #{startDate}
|
|
|
</if>
|
|
|
@@ -669,8 +673,9 @@
|
|
|
sales_post_firm = #{salesPostFirm,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
<if test="salesShippingStatus != null" >
|
|
|
- sales_shipping_status = #{salesShippingStatus}
|
|
|
+ sales_shipping_status = #{salesShippingStatus},
|
|
|
</if>
|
|
|
+ sales_send_time = NOW()
|
|
|
</set>
|
|
|
where sales_deal_code = #{salesDealCode}
|
|
|
</update>
|
