Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2022-01-24 6d78f8ab222498d727e91983d0511d8119d95aa3

 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml

@@ -240,10 +240,10 @@
                and a.orderType = #{record.orderType}
            </if>
            <if test="record.beginTimeVo != null  ">
                and a.ORDER_TIME >= #{record.beginTimeVo}
                and a.pay_time >= #{record.beginTimeVo}
            </if>
            <if test="record.endTimeVo != null  ">
                <![CDATA[and a.ORDER_TIME <= #{record.endTimeVo}]]>
                <![CDATA[and a.pay_time <= #{record.endTimeVo}]]>
            </if>

        </if>
@@ -321,10 +321,10 @@
                and a.SHOP_ID = #{record.shopId}
            </if>
            <if test="record.beginTimeVo != null ">
                and a.ORDER_TIME >= #{record.beginTimeVo}
                and a.pay_time >= #{record.beginTimeVo}
            </if>
            <if test="record.endTimeVo != null   ">
                <![CDATA[and a.ORDER_TIME <= #{record.endTimeVo}]]>
                <![CDATA[and a.pay_time <= #{record.endTimeVo}]]>
            </if>
        </if>
    </select>
@@ -494,7 +494,7 @@
            MAX(pay_time) payTime,
            GROUP_CONCAT(DISTINCT t2.shop_short_name) shopName
        from sys_order t1
        left join sys_order_flow b on t1.id=b.ORDER_ID and pay_method!='储值卡'
        left join sys_order_flow b on t1.id=b.ORDER_ID and pay_method!='储值卡' and pay_method!='欠款'
        left join sys_shop_info t2 on t1.SHOP_ID=t2.ID
        where t1.VIP_ID=#{vipId} and STATU='已付款';
    </select>
@@ -690,4 +690,8 @@
    </select>


    <select id="selectArrearsByVipId" resultType="java.math.BigDecimal">
        select sum(arrears) from sys_order
        where vip_id=#{vipId} and statu='欠款'
    </select>
</mapper>