配合新的套餐功能，修正套餐的扣款顺序

houruijun

2020-11-27 8e302d52b67d30fe64a95095565cc39569d1f1c3

 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 &lt;= #{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">