beauty-erp.git - Gitblit

			@@ -359,7 +359,7 @@

			private void buildAchieve(SysOrder pageOrder, SysOrderItem orderItem, AchieveNew achieveNew) {
			BusParameterSettings shopManageJjcpasConsume =null;
			if (Dictionary.ORDER_STATU_TK.equals(pageOrder.getStatu())) {
			if (SysOrder.ORDER_TYPE_REFUND == pageOrder.getOrderType()) {
			achieveNew.setId(null);
			achieveNew.setProjPercentage(0 - achieveNew.getProjPercentage());
			achieveNew.setGoodsCash(0 - achieveNew.getGoodsCash());

			@@ -927,7 +927,10 @@

			// 充值卡订单欠款检测
			if (Dictionary.FLAG_NO_N.equals(moneyCardUse.getIsVipCar())) {
			SysOrder sysOrder = sysOrderDao.selectById(orderItemDao.selectById(moneyCardUse.getOrderItemId()).getOrderId());
			SysOrderItem item = orderItemDao.selectById(moneyCardUse.getOrderItemId());
			if (item != null) {
			SysOrder sysOrder = sysOrderDao.selectById(item.getOrderId());
			if (sysOrder != null) {
			if (Dictionary.ORDER_STATU_QK.equals(sysOrder.getStatu())) {
			if (SysOrderFlow.IS_GIFT_Y.equals(flow.getIsGift())) {
			throw new GlobleException("充值卡订单存在欠款，无法使用赠送余额支付");
			@@ -946,6 +949,8 @@
			}
			}
			}
			}
			}

			SysUsers user = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);

	zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java	7 ●●●●● patch \| view \| raw \| blame \| history