20210413 后台订单管理修改

xiaoyong931011

2021-04-13 9e10e7d221c8a7f5ca20ce11d0d721eff5370720

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

@@ -33,7 +33,11 @@
         <result property="storeName" column="shop_name" />
         <result property="orderType" column="order_type" />
         <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>


@@ -66,6 +70,7 @@
         <result property="postage" column="postage" />
         <result property="orderType" column="order_type" />
         <result property="storeName" column="shop_name" />
      <result property="scorePay" column="score_pay" />
         <result property="companyId" column="company_id" />
      <result property="activityType" column="activity_type" />
      <!--支付时间-->
@@ -127,6 +132,7 @@
         postage,
         order_type,
         activity_type,
score_pay,
         company_id
   </sql>
   
@@ -159,6 +165,7 @@
         #{item.postage},
         #{item.orderType},
         #{item.activityType},
         #{item.scorePay},
         #{item.companyId}
   </sql>
   
@@ -337,6 +344,9 @@
         <if test="_parameter.containsKey('orderType')">
            order_type  = #{orderType},
         </if>
         <if test="_parameter.containsKey('scorePay')">
            score_pay  = #{scorePay},
         </if>
      </set>
      WHERE id=#{id} 
   </update> 
@@ -405,6 +415,9 @@
         </if>
         <if test="record.postage != null and record.postage != '' ">
            postage  = #{record.postage},
         </if>
         <if test="record.scorePay != null and record.scorePay != '' ">
            score_pay  = #{record.scorePay},
         </if>
         <if test="true">
            update_time  = now(),
@@ -558,6 +571,7 @@
      o.postage,
      s.shop_name,
      o.order_type,
      o.score_pay,
      o.apply_status
      from shop_order o
      INNER JOIN sys_shop_info s on o.store_id = s.ID
@@ -628,10 +642,10 @@
      o.wx_order_no,
      o.pay_result,
      o.postage,
      s.store_name,
      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">
@@ -654,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对象是否为空 -->
@@ -756,7 +770,7 @@
    <select id="selectOrderStatusCount"  resultType="java.util.HashMap"  >
      select  count(order_status) as count , order_status as orderStatus
      from shop_order
      where user_id=#{openId}
      where user_id=#{userId}
      group by order_status
   </select>