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 | 6 +++--- 1 files changed, 3 insertions(+), 3 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 adb8bf5..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 @@ -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"> @@ -261,8 +262,7 @@ order_id IN ( SELECT id FROM product_order WHERE hospital_id = #{hospitalId} AND department_id = #{departmentId} AND is_del = 0 AND enabled = 1 ) AND is_del = 0 AND enabled = 1 -ORDER BY - create_time DESC +ORDER BY id DESC </select> <select id="getUserdProduct" resultType="int"> SELECT -- Gitblit v1.8.0