~jiangyouyao/beauty-erp.git

			@@ -50,7 +50,7 @@
			c.order_no,
			c.order_money
			from shop_salesman_order a
			left join biz_user b on b.open_id=a.user_id
			left join sys_vip_info b on b.id=a.user_id
			left join shop_order c on a.order_id=c.id
			where
			a.sales_user_id=#{record.userId}
			@@ -85,26 +85,52 @@
			<select id="findFenxiaoOrderList" resultType="com.matrix.system.fenxiao.vo.LoadFenxiaoOrderListVo">
			SELECT
			a.id id,
			(select order_no from shop_order where id = a.order_id) orderNo,
			(select order_money from shop_order where id = a.order_id) actualBalance,
			(select store_name from shop_store where store_id = (select store_id from shop_order where id = a.order_id)) address,
			d.order_no,
			d.order_money actualBalance,
			f.shop_name address,
			d.order_status orderState,
			b.nick_name custom,
			b.open_id customUserId,
			(select nick_name from biz_user where open_id = b.parent_open_id) parentSale,
			b.id customUserId,
			e.nick_name parentSale,
			a.revenue_type profitType,
			a.amount profitBalance,
			a.order_status settleType,
			c.order_no settleNo,
			c.create_time settleTime,
			(select nick_name from biz_user where c.user_id = open_id) settler
			g.su_name settler
			FROM
			shop_salesman_order a
			LEFT JOIN biz_user b on a.user_id = b.open_id
			LEFT JOIN sys_vip_info b on a.user_id = b.id
			LEFT JOIN shop_saleman_settlement c on a.settlement_id = c.id
			LEFT JOIN shop_order d on d.id = a.order_id
			LEFT JOIN sys_vip_info e on a.sales_user_id = e.id
			LEFT JOIN sys_shop_info f on f.id = d.store_id
			LEFT JOIN sys_users g on c.user_id = g.su_id
			<where>
			a.company_id = #{record.companyId}
			<if test="record.userName != null and record.userName != ''">
			and b.nick_name like concat('%',#{record.userName},'%')
			</if>
			<if test="record.ddType != null and record.ddType != ''">
			and d.order_status = #{record.ddType}
			</if>
			<if test="record.startTime != null ">
			and a.create_time >= #{record.startTime}
			</if>
			<if test="record.endTime != null">
			and #{record.endTime} >= a.create_time
			</if>
			<if test="record.tgy != null and record.tgy != ''">
			and e.nick_name like concat('%',#{record.tgy},'%')
			</if>
			<if test="record.orderType != null and record.orderType != ''">
			and a.order_status = #{record.orderType}
			</if>
			<if test="record.jsbh != null and record.jsbh != ''">
			and c.order_no = #{record.jsbh}
			</if>
			<if test="record.ddh != null and record.ddh != ''">
			and d.order_no = #{record.ddh}
			</if>
			</where>
			<if test="record.sort !=null">
			@@ -121,16 +147,22 @@
			a.order_count setNum,
			a.man_count setManNum,
			a.create_time setTime,
			b.nick_name setMan,
			b.su_name setMan,
			a.settlement_way settlementWay,
			a.remark remark
			from
			shop_saleman_settlement a
			left join biz_user b on a.user_id = b.open_id
			left join sys_users b on a.user_id = b.su_id
			<where>
			a.company_id = #{record.companyId}
			<if test="record.userName != null and record.userName != ''">
			and b.nick_name like concat('%',#{record.userName},'%')
			and b.su_name like concat('%',#{record.userName},'%')
			</if>
			<if test="record.startTime != null ">
			and a.create_time >= #{record.startTime}
			</if>
			<if test="record.endTime != null">
			and #{record.endTime} >= a.create_time
			</if>
			</where>
			<if test="record.sort !=null">