ERP_override.git

			@@ -31,7 +31,16 @@
			where
			date(a.create_time) BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
			</select>


			<select id="selectMaxOrderIdByYear">
			select ifnull((select
			SUBSTR(order_id from 5)
			from
			`order` as a
			where
			year(a.create_time) = year(now())
			order by id desc limit 1),0) temp
			</select>

			<update id="updateOrderParameter">
			update `order` o
			@@ -276,7 +285,7 @@
			</update>

			<update id="updateMoney">
			update `order` set money = #{order.money},calculate_type = #{order.calculateType} where order_id = #{order.orderId}
			update `order` set money = #{order.money},calculate_type = #{order.calculateType},other_money=#{order.otherMoney} where order_id = #{order.orderId}
			</update>

			<update id="cancelOrder">