From e53fcbe9fe844b7788b29c5106c1ac24d17c5535 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:40:19 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
index f532adf..6c658ad 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml
@@ -10,6 +10,7 @@
<!-- <result property="projId" column="PROJ_ID" />
<result property="skuId" column="SKU_ID" /> -->
<result property="count" column="COUNT"/>
+ <result property="refundCount" column="refundCount"/>
<!-- <result property="taocanId" column="TAOCAN_ID" /> -->
<result property="isFree" column="IS_FREE"/>
<result property="type" column="TYPE"/>
@@ -49,6 +50,7 @@
a.TOTAL,
a.SKU_ID,
b.COUNT,
+ b.refundCount,
b.ID,
b.IS_FREE,
b.ORDER_ID,
@@ -89,6 +91,7 @@
ID,
ORDER_ID,
COUNT,
+ refundCount,
TYPE,
IS_FREE,
PRICE,
@@ -106,6 +109,7 @@
#{id},
#{orderId},
#{count},
+ #{refundCount},
#{type},
#{isFree},
#{price},
@@ -131,6 +135,9 @@
</if>
<if test="count != null and count !='' or count == 0 ">
COUNT = #{count},
+ </if>
+ <if test="refundCount != null and refundCount !='' or refundCount == 0 ">
+ refundCount = #{refundCount},
</if>
<if test="isFree != null and isFree !='' ">
IS_FREE = #{isFree},
@@ -232,6 +239,7 @@
i.ID,
i.ORDER_ID,
i.COUNT,
+ i.refundCount,
i.TYPE,
i.IS_FREE,
i.PRICE,
@@ -289,6 +297,7 @@
ID,
ORDER_ID,
COUNT,
+ refundCount,
TYPE,
IS_FREE,
PRICE,
@@ -341,6 +350,7 @@
c.name as goodsName,
g.name as cateName,
a.COUNT,
+ a.refundCount,
a.ZK_PRICE,
a.IS_FREE,
a.pay_method,
@@ -535,4 +545,23 @@
where a.ORDER_ID=#{orderId};
</select>
+ <select id="selectErpOrderItemByOrderId"
+ resultType="com.matrix.system.shopXcx.api.vo.ErpOrderDetailItemVo">
+ select
+ b.name goodsName,
+ a.COUNT count,
+ a.PRICE price,
+ a.ZK_PRICE zkPrice
+ from sys_order_item a
+ inner join shopping_goods b on a.goods_id=b.id
+ where a.ORDER_ID=#{orderId}
+ </select>
+
+ <!-- 临时数据处理sql -->
+ <select id="selectDgd" resultMap="SysOrderItemMap">
+ SELECT a.* from sys_order_item a
+ left join sys_order b on a.ORDER_ID=b.id
+ where a.type='家居产品' and DATE_FORMAT(a.create_time,'%Y-%m')='2021-04' and b.company_id=17 and b.STATU='已付款';
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1