|
@@ -6,7 +6,7 @@
|
|
|
<!--@Table sell_order-->
|
|
|
<id column="id_" property="id"/>
|
|
|
<result column="organ_id_" property="organId"/>
|
|
|
- <result column="school_id_" property="schoolId"/>
|
|
|
+ <result column="cooperation_organ_id_" property="cooperationOrganId"/>
|
|
|
<result column="school_name_" property="schoolName"/>
|
|
|
<result column="trans_no_" property="transNo"/>
|
|
|
<result column="order_no_" property="orderNo"/>
|
|
@@ -33,7 +33,7 @@
|
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
|
<!--@mbg.generated-->
|
|
|
- id_, organ_id_, school_id_, trans_no_,order_id_, order_no_, expect_amount_, actual_amount_,
|
|
|
+ id_, organ_id_, cooperation_organ_id_, trans_no_,order_id_, order_no_, expect_amount_, actual_amount_,
|
|
|
balance_amount_, sell_cost_, sell_cost2_, type_, goods_id_,goods_name_, num_, user_id_, payment_channel_,
|
|
|
mer_no_, sell_time_, create_ime_, update_time_
|
|
|
</sql>
|
|
@@ -52,10 +52,10 @@
|
|
|
<insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.SellOrder"
|
|
|
useGeneratedKeys="true">
|
|
|
<!--@mbg.generated-->
|
|
|
- insert into sell_order (organ_id_, school_id_, trans_no_,order_id_, order_no_, expect_amount_, actual_amount_,
|
|
|
+ insert into sell_order (organ_id_, cooperation_organ_id_, trans_no_,order_id_, order_no_, expect_amount_, actual_amount_,
|
|
|
balance_amount_, type_, goods_id_,goods_name_, sell_cost_, sell_cost2_, num_, user_id_, payment_channel_,
|
|
|
mer_no_, sell_time_, create_ime_, update_time_)
|
|
|
- values (#{organId}, #{schoolId}, #{transNo}, #{orderNo},#{orderId}, #{expectAmount}, #{actualAmount},
|
|
|
+ values (#{organId}, #{cooperationOrganId}, #{transNo}, #{orderNo},#{orderId}, #{expectAmount}, #{actualAmount},
|
|
|
#{balanceAmount}, #{type}, #{goodsId}, #{goodsName}, #{sellCost}, #{sellCost2}, #{num}, #{userId},
|
|
|
#{paymentChannel},
|
|
|
#{merNo}, #{sellTime}, #{createIme}, #{updateTime})
|
|
@@ -67,8 +67,8 @@
|
|
|
<if test="organId != null">
|
|
|
organ_id_ = #{organId},
|
|
|
</if>
|
|
|
- <if test="schoolId != null">
|
|
|
- school_id_ = #{schoolId},
|
|
|
+ <if test="cooperationOrganId != null">
|
|
|
+ cooperation_organ_id_ = #{cooperationOrganId},
|
|
|
</if>
|
|
|
<if test="transNo != null">
|
|
|
trans_no_ = #{transNo},
|
|
@@ -129,12 +129,12 @@
|
|
|
</update>
|
|
|
|
|
|
<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
|
|
|
- insert into sell_order (organ_id_, school_id_, trans_no_,order_id_, order_no_, expect_amount_, actual_amount_,
|
|
|
+ insert into sell_order (organ_id_, cooperation_organ_id_, trans_no_,order_id_, order_no_, expect_amount_, actual_amount_,
|
|
|
balance_amount_, type_, goods_id_,goods_name_, sell_cost_, sell_cost2_, num_, user_id_, payment_channel_,
|
|
|
mer_no_, sell_time_, create_ime_, update_time_)
|
|
|
VALUE
|
|
|
<foreach collection="sellOrders" separator="," item="sellOrder">
|
|
|
- (#{sellOrder.organId},#{sellOrder.schoolId},#{sellOrder.transNo},#{sellOrder.orderId},#{sellOrder.orderNo},
|
|
|
+ (#{sellOrder.organId},#{sellOrder.cooperationOrganId},#{sellOrder.transNo},#{sellOrder.orderId},#{sellOrder.orderNo},
|
|
|
#{sellOrder.expectAmount},#{sellOrder.actualAmount},#{sellOrder.balanceAmount},#{sellOrder.type},#{sellOrder.goodsId},
|
|
|
#{sellOrder.goodsName},#{sellOrder.sellCost},#{sellOrder.sellCost2},#{sellOrder.num},#{sellOrder.userId},
|
|
|
#{sellOrder.paymentChannel},#{sellOrder.merNo},#{sellOrder.sellTime},#{sellOrder.createIme},#{sellOrder.updateTime})
|
|
@@ -144,10 +144,10 @@
|
|
|
|
|
|
<!-- 分页查询 -->
|
|
|
<select id="queryPage" resultMap="SellOrder" parameterType="map">
|
|
|
- SELECT so.*,su.username_ user_name_,su.phone_,o.name_ organ_name_,s.name_ school_name_ FROM sell_order so
|
|
|
+ SELECT so.*,su.username_ user_name_,su.phone_,o.name_ organ_name_,co.name_ school_name_ FROM sell_order so
|
|
|
LEFT JOIN sys_user su ON so.user_id_ = su.id_
|
|
|
LEFT JOIN organization o ON o.id_ = so.organ_id_
|
|
|
- LEFT JOIN school s ON s.id_= so.school_id_
|
|
|
+ LEFT JOIN cooperation_organ co ON co.id_= so.cooperation_organ_id_
|
|
|
<include refid="queryPageSql"/>
|
|
|
ORDER BY so.sell_time_ DESC
|
|
|
<include refid="global.limit"/>
|
|
@@ -170,8 +170,8 @@
|
|
|
<if test="goodsName != null and goodsName != ''">
|
|
|
AND so.goods_name_ = #{goodsName}
|
|
|
</if>
|
|
|
- <if test="schoolId != null">
|
|
|
- AND so.school_id_ = #{schoolId}
|
|
|
+ <if test="cooperationOrganId != null">
|
|
|
+ AND so.cooperation_organ_id_ = #{cooperationOrganId}
|
|
|
</if>
|
|
|
<if test="type != null">
|
|
|
AND so.type_ = #{type}
|
|
@@ -188,7 +188,7 @@
|
|
|
<!-- 获取分部学校的收入支出(乐团订单) -->
|
|
|
<select id="getMusicGroupMonthReport" resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
|
|
|
SELECT spo.organ_id_,
|
|
|
- co.id_ school_id_,
|
|
|
+ co.id_ cooperation_organ_id_,
|
|
|
SUM(spo.actual_amount_) income_total_,
|
|
|
SUM(so.actual_amount_) sell_amount_,
|
|
|
SUM(so.sell_cost_) sellCost
|
|
@@ -206,7 +206,7 @@
|
|
|
<!-- 获取分部学校的收入支出(VIP,网管课) -->
|
|
|
<select id="getMusicVipPracticeMonthReport" resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
|
|
|
SELECT spo.organ_id_,
|
|
|
- co.id_ school_id_,
|
|
|
+ co.id_ cooperation_organ_id_,
|
|
|
SUM(spo.actual_amount_) income_total_
|
|
|
FROM student_payment_order spo
|
|
|
LEFT JOIN
|
|
@@ -228,7 +228,7 @@
|
|
|
<!-- 获取分部学校的收入支出(外部添加订单) -->
|
|
|
<select id="getOutOrderMonthReport" resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
|
|
|
SELECT spo.organ_id_,
|
|
|
- co.id_ school_id_,
|
|
|
+ co.id_ cooperation_organ_id_,
|
|
|
SUM(spo.actual_amount_) income_total_,
|
|
|
SUM(so.actual_amount_) sell_amount_,
|
|
|
SUM(so.sell_cost_) sellCost
|
|
@@ -245,7 +245,7 @@
|
|
|
<!-- 获取分部学校的收入支出(充值) -->
|
|
|
<select id="getRechargeMonthReport" resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
|
|
|
SELECT spo.organ_id_,
|
|
|
- co.id_ school_id_,
|
|
|
+ co.id_ cooperation_organ_id_,
|
|
|
SUM(spo.actual_amount_) income_total_
|
|
|
FROM student_payment_order spo
|
|
|
LEFT JOIN sporadic_charge_info sci ON sci.id_ = spo.music_group_id_
|
|
@@ -262,7 +262,7 @@
|
|
|
<!-- 获取分部学校的收入支出(零星支付) -->
|
|
|
<select id="getSporadicMonthReport" resultMap="com.ym.mec.biz.dal.dao.OperatingReportDao.OperatingReport"><![CDATA[
|
|
|
SELECT spo.organ_id_,
|
|
|
- co.id_ school_id_,
|
|
|
+ co.id_ cooperation_organ_id_,
|
|
|
SUM(spo.actual_amount_) income_total_
|
|
|
FROM student_payment_order spo
|
|
|
LEFT JOIN sporadic_charge_info sci ON sci.id_ = spo.music_group_id_
|