Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-07-11 d7d9b601b2e4fdb663375993e2cfbdbd363df421

 java110-db/src/main/resources/mapper/store/ReserveGoodsOrderTimeV1ServiceDaoImplMapper.xml

@@ -19,7 +19,7 @@
    <select id="getReserveGoodsOrderTimeInfo" parameterType="Map" resultType="Map">
        select t.hours,t.quantity,t.time_id,t.time_id timeId,t.order_id,t.order_id orderId,t.goods_id,t.goods_id
        goodsId,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,rgo.person_name personName,
        rgo.person_tel personTel,rgo.appointment_time appointmentTime,rg.goods_name goodName,rgo.received_amount receivedAmount,rgo.state,
        rgo.person_tel personTel,rgo.appointment_time appointmentTime,rg.goods_name goodsName,rgo.received_amount receivedAmount,rgo.state,
        td.`name` stateName
        from reserve_goods_order_time t
        left join reserve_goods_order rgo on t.order_id = rgo.order_id and rgo.status_cd='0'
@@ -28,6 +28,9 @@
        where 1 =1
        <if test="appointmentTime !=null and appointmentTime != ''">
            and rgo.appointment_time = #{appointmentTime}
        </if>
        <if test="personTel !=null and personTel != ''">
            and rgo.person_tel = #{personTel}
        </if>
        <if test="hours !=null and hours != ''">
            and t.hours= #{hours}
@@ -107,6 +110,9 @@
        <if test="appointmentTime !=null and appointmentTime != ''">
            and rgo.appointment_time = #{appointmentTime}
        </if>
        <if test="personTel !=null and personTel != ''">
            and rgo.person_tel = #{personTel}
        </if>
        <if test="hours !=null and hours != ''">
            and t.hours= #{hours}
        </if>