Explorar o código

Merge branch 'feature/0613-opt' into develop-new

yuanliang hai 1 ano
pai
achega
9ae4f81061

+ 2 - 0
cooleshow-mall/mall-admin/src/main/resources/config/mybatis/OmsOrderDao.xml

@@ -88,6 +88,7 @@
             oi.product_price item_product_price,
             oi.product_quantity item_product_quantity,
             oi.product_attr item_product_attr,
+            if(oora.status = 2, 1, 0) as returnStatus,
             oh.id history_id,
             oh.operate_man history_operate_man,
             oh.create_time history_create_time,
@@ -97,6 +98,7 @@
             oms_order o
             LEFT JOIN oms_order_item oi ON o.id = oi.order_id
             LEFT JOIN oms_order_operate_history oh ON o.id = oh.order_id
+            left join oms_order_return_apply oora on oi.id = oora.order_item_id
         WHERE
             o.id = #{id}
         ORDER BY oi.id ASC,oh.create_time DESC