fix

wzy

2021-11-11 e38c78edf007f24fe1dcdeeac591b17d99e2c8dd

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

@@ -23,6 +23,7 @@
        <result property="vipNo" column="VIP_NO"/>
        <result property="staffName" column="STAFF_NAME"/>
        <result property="changeId" column="CHANGE_ID"/>
        <result property="orderType" column="orderType"/>

        <result property="cashPay" column="cash_Pay"/>
        <result property="cardPay" column="card_Pay"/>
@@ -61,7 +62,9 @@
      beatuyId,
      beatuyName,
      pay_time,
      company_id
      company_id,
      orderType,
        is_has_refund
      )
      VALUES (
      #{id},
@@ -83,14 +86,16 @@
      #{beatuyId},
      #{beatuyName},
      #{payTime},
      #{companyId}
      #{companyId},
      #{orderType},
      #{isHasRefund}
      )
   </insert>

    <!-- 更新订单时间 -->
    <update id="updateOrderTime">
      UPDATE sys_order
      set  ORDER_TIME = #{orderTime}
      set  pay_time = #{payTime}
      WHERE id=#{id}
    </update>

@@ -140,9 +145,11 @@
            <if test="cashPay != null and cashPay  !='' ">
                cash_Pay = #{cashPay},
            </if>

            <if test="payTime != null  ">
                pay_time = #{payTime},
            </if>
            <if test="isHasRefund != null  ">
                is_has_refund = #{isHasRefund},
            </if>

        </set>
@@ -229,11 +236,14 @@
            <if test="(record.companyId!=null and record.companyId!='') ">
                and a.company_id = #{record.companyId}
            </if>
            <if test="(record.orderType!=null and record.orderType!='') ">
                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>
@@ -283,6 +293,9 @@
            <if test="(record.companyId!=null and record.companyId!='') ">
                and a.company_id = #{record.companyId}
            </if>
            <if test="(record.orderType!=null and record.orderType!='') ">
                and a.orderType = #{record.orderType}
            </if>
            <if test="record.isCross != null and record.isCross !='' ">
                and a.IS_CROSS = #{record.isCross}
            </if>
@@ -308,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>
@@ -405,6 +418,9 @@
            <if test="(record.companyId!=null and record.companyId!='') ">
                and a.company_id = #{record.companyId}
            </if>
            <if test="(record.orderType!=null and record.orderType!='') ">
                and a.orderType = #{record.orderType}
            </if>

        </if>
    </sql>
@@ -433,6 +449,9 @@
            </if>
            <if test="(record.companyId!=null and record.companyId!='') ">
                and a.company_id = #{record.companyId}
            </if>
            <if test="(record.orderType!=null and record.orderType!='') ">
                and a.orderType = #{record.orderType}
            </if>
            <if test="record.activity != null and record.activity !='' ">
                and a.ACTIVITY = #{record.activity}
@@ -475,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>
@@ -671,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>