~jiangyouyao/beauty-erp.git

			@@ -50,7 +50,9 @@

			<result property="arriveCnt" column="arrive_cnt" />


			<result property="goodsNo" column="goodsNo" />
			<result property="goodsName" column="goodsName" />
			<result property="zkPrice" column="zkPrice" />

			</resultMap>

			@@ -987,6 +989,7 @@
			<select id="selectBeauticianConsumeAchieveRanking" resultType="com.matrix.system.app.vo.RankingVo">
			select
			b.su_name name,
			b.su_id id,
			sum(IFNULL(a.free_consume,0) + IFNULL(a.his_consume, 0) + IFNULL(a.consume, 0)) amount,
			c.shop_short_name shopName
			from achieve_new a
			@@ -1013,4 +1016,18 @@
			group by a.beault_id
			order by amount desc
			</select>

			<select id="selectOrderItemAchieveByOrderId" resultMap="AchieveNewMap">
			select
			a.*,
			b.code goodsNo,
			b.name goodsName,
			c.su_name meiliao,
			d.count*d.zk_price zk_total
			from achieve_new a
			left join shopping_goods b on a.shopping_goods_id=b.id
			left join sys_users c on a.beault_id=c.su_id
			left join sys_order_item d on a.order_item_id=d.id
			where a.order_id=#{orderId}
			</select>
			</mapper>