Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-06 512a2f0fb09b663b8de19b5313c8bd5899f4f74b

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

@@ -17,7 +17,7 @@
         <result property="staffId" column="staff_id" />
         <result property="vipName" column="vip_name" />
         <result property="tel" column="tel" />
         <result property="bizUserId" column="biz_user_id" />
         <result property="bizUserId" column="sys_vip_info_id" />
         <result property="formId" column="form_id" />

      <result property="productId" column="product_id" />
@@ -42,7 +42,7 @@
         <result property="staffId" column="staff_id" />
         <result property="vipName" column="vip_name" />
         <result property="tel" column="tel" />
         <result property="bizUserId" column="biz_user_id" />
         <result property="bizUserId" column="sys_vip_info_id" />
         <result property="productId" column="product_id" />
      <result property="orderNo" column="order_no" />
      <result property="formId" column="form_id" />
@@ -66,7 +66,7 @@
         staff_id,
         vip_name,
         tel,
         biz_user_id,
         sys_vip_info_id,
         product_id,
         order_no,
         form_id
@@ -129,7 +129,7 @@
               tel = #{tel},
            </if>
            <if test="(bizUserId!=null and bizUserId!='') or (bizUserId!='' and bizUserId==0)">
               biz_user_id = #{bizUserId},
               sys_vip_info_id = #{bizUserId},
            </if>
            <if test="(productId!=null and productId!='') or (productId!='' and productId==0)">
               product_id = #{productId},
@@ -199,7 +199,7 @@
      staff_id,
      vip_name,
      tel,
      biz_user_id,
      sys_vip_info_id,
      product_id,
      order_no,
      form_id,
@@ -303,7 +303,7 @@
      staff_id,
      vip_name,
      tel,
      biz_user_id,
      sys_vip_info_id,
      product_id
      from onlinebooking
      where 1=1
@@ -417,7 +417,7 @@
         staff_id,
         vip_name,
         tel,
         biz_user_id,
         sys_vip_info_id,
         product_id,
         order_no
      from onlinebooking
@@ -442,7 +442,7 @@
      staff_id,
      vip_name,
      tel,
      biz_user_id,
      sys_vip_info_id,
      product_id
      from onlinebooking
      where 1=1
@@ -495,7 +495,7 @@
      staff_id,
      vip_name,
      tel,
      biz_user_id,
      sys_vip_info_id,
      product_id,
      order_no
      from onlinebooking
@@ -547,7 +547,7 @@
      staff_id,
      vip_name,
      tel,
      biz_user_id,
      sys_vip_info_id,
      product_id,
      order_no,
      form_id,
@@ -565,7 +565,7 @@
            and vip_Id  = #{record.vipId}
         </if>
         <if test="(record.bizUserId!=null and record.bizUserId!='') or (record.bizUserId!='' and record.bizUserId==0)">
            and biz_user_id  = #{record.bizUserId}
            and sys_vip_info_id  = #{record.bizUserId}
         </if>
         <if test="(record.time!=null and record.time!='') or (record.time!='' and record.time==0)">
            and time  = #{record.time}
@@ -611,7 +611,7 @@
            and vip_Id  = #{record.vipId}
         </if>
         <if test="(record.bizUserId!=null and record.bizUserId!='') or (record.bizUserId!='' and record.bizUserId==0)">
            and biz_user_id  = #{record.bizUserId}
            and sys_vip_info_id  = #{record.bizUserId}
         </if>
         <if test="(record.time!=null and record.time!='') or (record.time!='' and record.time==0)">
            and time  = #{record.time}