beauty-erp.git - Gitblit

			@@ -167,7 +167,7 @@
			taocan.setStatus(Dictionary.TAOCAN_STATUS_WX);
			} else if (Dictionary.FLAG_YES_Y.equals(taocan.getIsCourse())) {
			//任选套餐检查套餐整体剩余次数
			int tcSurplusCount = taocan.getSurplusCount() - sysProjUse.getDeductionNum();
			int tcSurplusCount = taocan.getSurplusCount() - sysBeauticianState.getCount();
			if (tcSurplusCount < 0) {
			throw new GlobleException(taocan.getProjName() + "已经达到最大使用次数");
			} else {
			@@ -492,6 +492,16 @@
			upProjUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
			if (sysProjUse.getTaocanId() != null) {
			//TODO 更新套餐状态为有效
			SysProjUse taocanProjUse = sysProjUseDao.selectById(sysProjUse.getTaocanId());
			if (taocanProjUse.getSurplusCount() == 0) {
			taocanProjUse.setIsOver(Dictionary.DELETED_N);
			taocanProjUse.setStatus(Dictionary.MONEYCARD_STATUS_YX);
			}

			if (Dictionary.FLAG_YES_Y.equals(taocanProjUse.getIsCourse())) {
			taocanProjUse.setSurplusCount(taocanProjUse.getSurplusCount() + beauticianState.getCount());
			}
			sysProjUseDao.update(taocanProjUse);
			}
			}
			int surplus = sysProjUse.getSurplusCount() + beauticianState.getCount();

			@@ -888,9 +888,9 @@
			*/
			chouseGoods() {
			let _this = this;
			this.multipleSelection.forEach(item => {
			_this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE);
			});
			// this.multipleSelection.forEach(item => {
			// _this.pushToSelectGoods(item, BUY_TYPE_NOT_FREE);
			// });
			this.closeXm();
			this.calculationTotal();
			},

	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java	12 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html	6 ●●●●● patch \| view \| raw \| blame \| history