beauty-erp.git - Gitblit

			@@ -17,6 +17,7 @@
			<result property="vipId" column="vip_id" />
			<result property="freeConsume" column="free_consume" />
			<result property="hisConsume" column="his_consume" />
			<result property="consume" column="consume" />
			<result property="goodsCash" column="goods_cash" />
			<result property="projNum" column="proj_num" />
			<result property="numberOfPeople" column="number_of_people" />
			@@ -50,6 +51,7 @@
			<result property="goodsNo" column="goodsNo" />
			<result property="goodsName" column="goodsName" />
			<result property="payMethod" column="pay_method" />
			<result property="cateName" column="cateName" />

			</resultMap>

			@@ -64,7 +66,7 @@
			d.level_name,
			c.vip_name,
			e.name as pro_name,
			(IFNULL(a.goods_cash,0)) as zk_total,
			b.ZK_TOTAL as zk_total,
			a.goods_cash,
			a.his_consume,
			a.free_consume,
			@@ -74,9 +76,11 @@
			a.number_of_people,
			a.proj_num,
			a.proj_time,
			i.name as module_subName,
			h.SHOP_NAME shop_name,
			a.order_type
			i.name as cateName,
			h.shop_short_name shop_name,
			a.order_type,
			a.achieveType,
			j.pay_method
			from
			achieve_new a
			left join sys_order b on a.order_id=b.id
			@@ -88,6 +92,7 @@
			LEFT JOIN sys_shop_info h ON a.SHOP_ID = h.ID
			LEFT JOIN shopping_goods_category i ON e.cate_id = i.id
			left join sys_proj_services l on a.service_order_id=l.id
			left join sys_order_item j on a.order_item_id=j.ID
			<where>
			<if test="record!=null">
			<if
			@@ -721,6 +726,9 @@
			<if test="record.t9 != null and record.t9 != '' ">
			t9 = #{record.t9},
			</if>
			<if test="record.payMethod != null and record.payMethod != '' ">
			pay_method = #{record.payMethod},
			</if>
			</set>
			WHERE id=#{record.id}
			</update>
			@@ -1062,4 +1070,12 @@
			group by a.shop_id
			order by amount desc, a.shop_id
			</select>

			<select id="selectAchieveByServiceOrderId" resultMap="AchieveNewMap">
			select * from achieve_new where service_order_id=#{serviceOrderId}
			</select>

			<select id="selectAchieveForOrder" resultMap="AchieveNewMap">
			select * from achieve_new where order_type='订单'
			</select>
			</mapper>