beauty-erp.git - Gitblit

			@@ -535,7 +535,7 @@
			ShoppingGoods goods = shoppingGoodsDao.selectById(goodsId);
			flow.setFlowContent(goods.getName() + "等" + sourceOrder.getItems().size() + "件产品");
			// 若是退款，则取负数
			if (Dictionary.ORDER_STATU_TK.equals(sourceOrder.getStatu())) {
			if (SysOrder.ORDER_TYPE_REFUND==sourceOrder.getOrderType()) {
			flow.setFlowType(SysOrderFlow.FLOW_TYPE_REFUND);
			flow.setAmount(flow.getAmount().negate());
			flow.setOrderId(sourceOrder.getOldOrderId());
			@@ -1276,7 +1276,10 @@
			sysOrder.setCompanyId(user.getCompanyId());
			sysOrder.setShopId(user.getShopId());
			sysOrder.setOrderType(SysOrder.ORDER_TYPE_REFUND);
			sysOrder.setOrderTime(new Date());
			sysOrder.setStatu(Dictionary.ORDER_STATU_YFK);
			Date now = new Date();
			sysOrder.setOrderTime(now);
			sysOrder.setPayTime(now);
			sysOrder.setOrderNo(codeService.getRefundOrderNo());
			sysOrder.setZkTotal(-sysOrder.getZkTotal());
			//新增订单

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

			_this.data.items = dataItems;
			_this.data.zkTotal = _this.refundMoney;
			_this.data.total = _this.total;


			AjaxProxy.requst({
			@@ -739,6 +740,8 @@
			}

			_this.refundMoney += parseFloat(item.refundPrice * item.refundCount);
			//记录一下未优惠之前的价格
			_this.total += parseFloat(item.price * item.refundCount);
			}
			}

			@@ -749,7 +752,7 @@
			_this.dialogSettleVisible = true;
			},
			calOrderTotalFormatter(row, column) {
			return row.count * row.price;
			return row.count * row.zkPrice;
			},
			getVipMoneyCards() {
			let _this = this;

	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java	7 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html	5 ●●●●● patch \| view \| raw \| blame \| history