~jiangyouyao/beauty-erp.git

			@@ -18,6 +18,7 @@
			<result property="statu" column="STATU"/>
			<result property="zkTotal" column="ZK_TOTAL"/>
			<result property="shopId" column="SHOP_ID"/>
			<result property="companyId" column="company_id"/>
			<result property="vipName" column="VIP_NAME"/>
			<result property="vipNo" column="VIP_NO"/>
			<result property="staffName" column="STAFF_NAME"/>
			@@ -30,6 +31,7 @@

			<!-- 扩展字段 -->
			<result property="shopName" column="SHOP_NAME"/>
			<result property="shopShortName" column="SHOP_SHORT_NAME"/>
			<result property="vipPhone" column="PHONE"/>


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

			@@ -321,6 +323,7 @@
			a.*,
			c.su_name as STAFF_NAME,
			d.SHOP_NAME,
			d.shop_short_name,
			b.PHONE,
			b.VIP_NAME
			from sys_order a
			@@ -467,13 +470,14 @@

			<select id="selectVipOrderInfoTotal" resultType="com.matrix.system.hive.bean.SysOrder">
			select
			sum(ZK_TOTAL) zkTotal,
			sum(amount) zkTotal,
			count(1) times,
			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_shop_info t2 on t1.SHOP_ID=t2.ID
			where VIP_ID=#{vipId} and STATU='已付款';
			where t1.VIP_ID=#{vipId} and STATU='已付款';
			</select>

			<select id="selectApiOrderListInPage" resultType="com.matrix.system.app.vo.OrderDetailVo">
			@@ -502,6 +506,9 @@
			<if test="record.shopId != null">
			and a.shop_id=#{record.shopId}
			</if>
			<if test="record.companyId != null">
			and a.company_id=#{record.companyId}
			</if>
			</where>
			<if test="pageVo !=null"><!-- 判断pageVo对象是否为空 -->
			order by a.order_time desc
			@@ -527,6 +534,9 @@
			</if>
			<if test="record.shopId != null">
			and a.shop_id=#{record.shopId}
			</if>
			<if test="record.companyId != null">
			and a.company_id=#{record.companyId}
			</if>
			</where>
			</select>
			@@ -609,4 +619,56 @@
			group by b.su_id
			order by amount desc, b.su_id
			</select>


			<select id="selectErpOrderList" resultType="com.matrix.system.shopXcx.api.vo.ErpOrderDetailVo">
			select
			a.id orderId,
			a.ORDER_NO orderNo,
			a.ORDER_TIME orderTime,
			a.STATU orderStatus,
			a.ZK_TOTAL needPay,
			a.TOTAL - a.ZK_TOTAL discount,
			(a.card_Pay + a.cash_Pay) realPay,
			a.arrears arrears,
			b.su_name staffName,
			d.shop_name as shopName
			from sys_order a
			left join sys_users b on a.STAFF_ID = b.su_id
			left join sys_vip_info c on c.id = a.VIP_ID
			left join sys_shop_info d on d.id=a.shop_id
			<where>
			<if test="queryKey != null and queryKey != ''">
			and instr(a.order_no, #{queryKey})
			</if>
			<if test="status != null and status != ''">
			and a.statu = #{status}
			</if>
			<if test="vipId != null">
			and a.vip_id=#{vipId}
			</if>
			</where>
			order by a.order_time desc
			limit #{offset},#{limit}
			</select>
			<select id="findUserOrderById" resultType="com.matrix.system.shopXcx.api.vo.ErpOrderDetailVo">
			select
			a.id orderId,
			a.ORDER_NO orderNo,
			a.ORDER_TIME orderTime,
			a.STATU orderStatus,
			a.ZK_TOTAL needPay,
			a.TOTAL - a.ZK_TOTAL discount,
			(a.card_Pay + a.cash_Pay) realPay,
			a.arrears arrears,
			b.su_name staffName,
			d.shop_name as shopName
			from sys_order a
			left join sys_users b on a.STAFF_ID = b.su_id
			left join sys_vip_info c on c.id = a.VIP_ID
			left join sys_shop_info d on d.id=a.shop_id
			where a.id=#{orderId}
			</select>


			</mapper>