finish open or close

Helius

2021-04-16 043e2c522c25aec53dd59772f18b105e4fe643ff

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDao.xml

@@ -34,6 +34,7 @@
         <result property="orderType" column="order_type" />
         <result property="applyStatus" column="apply_status" />
         <result property="scorePay" column="score_pay" />
         <result property="payMethod" column="pay_method" />
         <result property="companyId" column="company_id" />
         <!--返回详情列表-->
         <collection property="details" column="{orderId=id}"
@@ -48,6 +49,7 @@
      <result property="createTime" column="create_time" />
      <result property="updateBy" column="update_by" />
      <result property="updateTime" column="update_time" />
      <result property="payMethod" column="pay_method" />
         <result property="orderNo" column="order_no" />
         <result property="orderMoney" column="order_money" />
         <result property="commodityPrice" column="commodity_price" />
@@ -133,6 +135,8 @@
         order_type,
         activity_type,
score_pay,

      pay_method,
         company_id
   </sql>
   
@@ -166,6 +170,7 @@
         #{item.orderType},
         #{item.activityType},
         #{item.scorePay},
         #{item.payMethod},
         #{item.companyId}
   </sql>
   
@@ -242,6 +247,7 @@
          <if test="(record.companyId!=null and record.companyId!='') or  (record.companyId!='' and record.companyId==0)  ">
             and company_id  = #{record.companyId}
          </if>

      </if>
       
   </sql>
@@ -542,37 +548,10 @@
   </select>

   <!-- 分页查询 -->
   <select id="selectInPageByQuery" resultMap="ShopOrderMap">
   <select id="selectInPageByQuery" resultMap="ShopOrderComplexMap">
      select
      o.create_by,
      o.create_time,
      o.update_by,
      o.update_time,
      o.id,
      o.order_no,
      o.order_money,
      o.commodity_price,
      o.user_id,
      o.order_time,
      o.pay_status,
      o.discount_explain,
      o.discount_amount,
      o.order_status,
      o.refund_charge,
      o.user_name,
      o.user_tel,
      o.remarks,
      o.shipping_method,
      o.store_id,
      o.purchase_quantity,
      o.del_flag,
      o.wx_order_no,
      o.pay_result,
      o.postage,
      s.shop_name,
      o.order_type,
      o.score_pay,
      o.apply_status
      o.*,
      s.shop_name
      from shop_order o
      INNER JOIN sys_shop_info s on o.store_id = s.ID
      where del_flag = 2 and o.company_id  = #{record.companyId}
@@ -601,6 +580,8 @@
         <if test="(record.shopId!=null and record.shopId!='')">
            and o.store_id=#{record.shopId}
         </if>


      </if>
      <if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
         <if test="pageVo.sort !=null  and pageVo.order !=null">
@@ -642,6 +623,7 @@
      o.wx_order_no,
      o.pay_result,
      o.postage,
             o.pay_method,
      s.shop_name,
      o.order_type
      from shop_order o
@@ -774,6 +756,13 @@
      group by order_status
   </select>

   <select id="selectShopOrderByOrderNo"  resultType="com.matrix.system.shopXcx.bean.ShopOrder"  >
      select
      a.*
      from shop_order a
      where a.order_no=#{orderNo}
   </select>

   <update id="batchUpdateOrderStatus">
      <foreach collection="list" index="index" item="item" separator=";">
         update shop_order set order_status=#{item.orderStatus}