20210413 后台订单管理修改

xiaoyong931011

2021-04-13 9e10e7d221c8a7f5ca20ce11d0d721eff5370720

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

@@ -35,6 +35,9 @@
         <result property="applyStatus" column="apply_status" />
         <result property="scorePay" column="score_pay" />
         <result property="companyId" column="company_id" />
         <!--返回详情列表-->
         <collection property="details" column="{orderId=id}"
                  select="com.matrix.system.shopXcx.dao.ShopOrderDetailsDao.selectByOrderId"/>
   </resultMap>


@@ -639,11 +642,10 @@
      o.wx_order_no,
      o.pay_result,
      o.postage,
      s.store_name,
      s.score_pay,
      s.shop_name,
      o.order_type
      from shop_order o
      LEFT JOIN shop_store s on o.store_id = s.store_id
      LEFT JOIN sys_shop_info s on o.store_id = s.ID
      where del_flag = 2 and o.company_id  = #{record.companyId}

      <if test="record != null">
@@ -666,7 +668,7 @@
            and  o.order_status = #{record.orderStatus}
         </if>
         <if test="(record.storeName!=null and record.storeName!='')">
            and s.store_name like concat('%', #{record.storeName}, '%')
            and s.shop_name like concat('%', #{record.storeName}, '%')
         </if>
      </if>
      <if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->