From 0abd80878ee9045d5317a2dbeff6c20d2dfdabc0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 14 May 2021 15:07:32 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/resources/mapper/yunding/YdOrderDao.xml | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/yunding/YdOrderDao.xml b/src/main/resources/mapper/yunding/YdOrderDao.xml
index e633040..3075f61 100644
--- a/src/main/resources/mapper/yunding/YdOrderDao.xml
+++ b/src/main/resources/mapper/yunding/YdOrderDao.xml
@@ -9,10 +9,11 @@
*
FROM
yd_order a
- left join yd_product b on b.id = a.product_id
+ inner join yd_product b on b.id = a.product_id
<if test="record != null">
<where>
and a.member_id = #{record.memberId}
+ and a.type=1
<if test="record.state != null" >
and a.state=#{record.state}
</if>
@@ -21,4 +22,78 @@
ORDER BY a.create_time DESC
</select>
+ <select id="selectNeedReturnOrders" resultType="com.xcong.excoin.modules.yunding.entity.YdOrderEntity">
+ select a.*, b.* from yd_order a
+ left join yd_product b on a.product_id=b.id
+ where a.state=2 and a.return_state=1
+ </select>
+
+ <resultMap id="orderMap" type="com.xcong.excoin.modules.yunding.entity.YdOrderEntity">
+ <id column="id" property="id" />
+ <result column="member_id" property="memberId" />
+ <result column="product_id" property="productId" />
+ <result column="quantity" property="quantity" />
+ <result column="amount" property="amount" />
+ <result column="member_id" property="memberId" />
+ <result column="total_profit" property="totalProfit" />
+ <result column="today_profit" property="totalProfit" />
+ <result column="state" property="state" />
+ <result column="buy_time" property="buyTime" />
+ <result column="work_time" property="workTime" />
+ <result column="end_time" property="endTime" />
+ <result column="create_by" property="createBy" />
+ <result column="return_state" property="returnState" />
+ <result column="return_type" property="returnType" />
+ <association property="ydProductEntity" javaType="com.xcong.excoin.modules.yunding.entity.YdProductEntity">
+ <id column="p_id" property="id" />
+ <result column="pro_unit" property="proUnit" />
+ <result column="manage_expense" property="manageExpense" />
+ </association>
+ </resultMap>
+
+ <select id="selectAllValidOrders" resultMap="orderMap">
+ select a.*, b.id p_id, b.pro_unit, b.manage_expense from yd_order a
+ inner join yd_product b on a.product_id=b.id
+ where a.state=2 and a.type = 1
+ </select>
+
+ <update id="UpdateByIdAndState">
+ UPDATE yd_order s
+ SET s.state = #{state}
+ WHERE
+ id = #{id}
+ </update>
+
+ <select id="selectOrderByMemberIdAndId" resultType="com.xcong.excoin.modules.yunding.vo.YdOrderVo">
+ SELECT
+ *
+ FROM
+ yd_order a
+ inner join yd_product b on b.id = a.product_id
+ where a.member_id = #{memberId}
+ and a.id = #{id}
+ </select>
+
+ <select id="getAgentList" resultType="com.xcong.excoin.modules.yunding.vo.AgentVo">
+ SELECT
+ *
+ FROM
+ yd_basic_level_setting a
+ ORDER BY a.id ASC
+ </select>
+
+ <update id="updateAgentLevel">
+ UPDATE member s
+ SET s.agent_level = #{levelId}
+ WHERE
+ s.id = #{id}
+ </update>
+
+ <select id="selectTeamAllPower" resultMap="orderMap">
+ select a.*, c.id p_id, c.pro_unit
+ from yd_order a
+ inner join (select * from member a where find_in_set(#{inviteId}, a.referer_ids) or invite_id=#{inviteId}) b on a.member_id=b.id
+ inner join yd_product c on c.id = a.product_id
+ where a.type=1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1