ERP_override.git

			@@ -6,7 +6,7 @@

			<select id="selectOrder">
			select
			count(*)
			*
			from
			sd.`order` as o
			where
			@@ -21,6 +21,16 @@
			where
			date(a.create_time) = curdate()
			order by id desc,order_id desc limit 1
			</select>

			<select id="selectMaxOrderIdByMonth">
			select
			ifnull(SUBSTR(order_id from 7),0)
			from
			`order` as a
			where
			date(a.create_time) BETWEEN DATE_FORMAT(DATE(NOW()), '%Y-%m-01') AND DATE(NOW())
			order by id desc limit 1
			</select>


			@@ -188,13 +198,13 @@
			and o.delivery_address REGEXP #{order.deliveryAddress}
			</if>
			order by o.id desc
			limit #{offset},#{pageSize}
			</select>

			<update id="reviewOrderById">
			update `order` set order_review = #{status},
			verifier_id = #{userId},
			verifier = #{userName}
			verifier = #{userName},
			update_time=now()
			where order_id = #{id}
			</update>
			<update id="reviewOrderByIds">
			@@ -209,7 +219,7 @@
			</update>

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

			<update id="cancelOrder">
			@@ -224,4 +234,11 @@
			where order_id = #{order.orderId}
			</update>

			<update id="updateOrderPrintNumber">
			update sd.`order` o
			set o.printing_number=o.printing_number+1
			where
			o.order_id = #{orderId}

			</update>
			</mapper>