xzx.git - Gitblit

			@@ -357,9 +357,14 @@
			throw new RestException(-3, "暂不能确认收货");
			}

			if (ScoreOrder.ISFINISH_YES.equals(order.getIsFinish())) {
			scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DONE, userId);
			} else {
			scoreOrderMapper.updateOrderStatus(id, ScoreOrder.STATUS_DOING, userId);
			}

			}

			public void cancelOrder(Long id, String userId) {
			ScoreOrder order = scoreOrderMapper.selectByPrimaryKey(id);
			if (order == null) {