From 5fe2259c5c9b473668c0d89ae1d19537c10b77db Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 18:31:21 +0800
Subject: [PATCH] 配合新的套餐功能，修正套餐的扣款顺序（修复）
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
index 52bac30..889e2f4 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml
@@ -112,7 +112,7 @@
<if test="p.endTime!= null and p.endTime !=''">
and DE.create_time <= #{p.endTime}
</if>
- <include refid="com.kidgrow.oprationcenter.mapper.SysProductMapper.Role_Organization"></include>
+<!-- <include refid="com.kidgrow.oprationcenter.mapper.SysProductMapper.Role_Organization"></include>-->
</where>
</sql>
<select id="groupProductDetail" resultType="com.kidgrow.oprationcenter.vo.GroupProductDetail">
@@ -170,8 +170,9 @@
<include refid="whereforall"/>
order by
DE.pro_endtime ASC,
+ DE.ailight_count ASC,
DE.pro_begintime ASC,
- DE.id asc
+ DE.id ASC
</select>
<select id="getEnabledCount" resultType="int" parameterType="long">
--
Gitblit v1.8.0