交易金变动修改

app/Admin/Extensions/Grid/AuditIndustryProduct.php

@@ -47,7 +47,7 @@ class AuditIndustryProduct extends RowAction
 			//如果是通过，扣除交易金，如果拒绝返还冻结金额
 			$single = SystemSetting::val('single', 'price'); //单人头交易金
 
-			$supplier = Supplier::find(Admin::user()->id);
+			$supplier = Supplier::find($industry->supplier_id);
 
 			$change_deposit = $single * $industry->stock * $industry->service_persons;
 			if ($industry->status == ProductStatus::ON_SALE) {

app/AdminSupplier/Controllers/IndustryProductController.php

@@ -70,7 +70,7 @@ class IndustryProductController extends AdminController
 			$show->disableDeleteButton();
 
 			//不允许查看非自己的数据
-			if ($show->model()->agent_id != Admin::user()->id) {
+			if ($show->model()->supplier_id != Admin::user()->id) {
 				Admin::exit('数据不存在');
 			}
 
@@ -102,7 +102,11 @@ class IndustryProductController extends AdminController
     protected function form()
     {
 		Admin::user()->publish_type = json_decode(Admin::user()->publish_type, true);
-		$change_deposit = 0;
+
+		//注：这2个变量需要通过引用方式传值才可以
+		$change_deposit = 0; //变动的
+		$old_deposit = 0; //原来交易金数
+
 		return Form::make(new IndustryProduct(), function (Form $form) {
 			$form->disableDeleteButton();
 
@@ -198,7 +202,7 @@ class IndustryProductController extends AdminController
 					$form->text('extends.field_3.address', '地址');
 					$form->map('extends.field_3.latitude', 'extends.field_3.longitude', '位置');
 				});
-        })->saving(function (Form $form) use (&$change_deposit) {
+        })->saving(function (Form $form) use (&$change_deposit, &$old_deposit) {
 			//不允许编辑非自己数据
 			if ($form->isEditing() && $form->model()->supplier_id != Admin::user()->id) {
 				return $form->response()->error('数据不存在');
@@ -224,50 +228,51 @@ class IndustryProductController extends AdminController
 			}
 
         	//处理交易金
-			//判断交易金是否充足
 			$single = SystemSetting::val('single', 'price'); //单人头交易费
 			if (!$single) {
 				return $form->response()->error('未设置单人头交易费，请联系管理员在后台设置');
 			}
 
-			//TODO 还需要计算涉及用户数
-
-			//目前逻辑不考虑单人头交易费变动的情况
-			if ($form->isCreating() || $form->isEditing() && $form->model()->stock != $form->stock) {
-
-				if ($form->isCreating()) { //新增处理
-					$change_deposit = $single * $form->service_persons * $form->stock;
-				} else if ($form->isEditing() && $form->model()->stock != $form->stock) { //库存变动时冻结或解冻相应的保证金
-					$new_deposit = $single * $form->service_persons * $form->stock;
-					$old_deposit = $single * $form->service_persons * $form->model()->stock;
-					$change_deposit = $new_deposit - $old_deposit; //saved里面获取的$form->model()->stock是不对的
-				}
+			//目前逻辑不考虑总后台修改单人头交易费的情况
+			if ($form->isCreating()) {
+				$change_deposit = $single * $form->service_persons * $form->stock;
+			}
+			//库存和涉及用户数变动时冻结或解冻相应的保证金
+			else if ($form->isEditing() && ($form->model()->stock != $form->stock || $form->model()->service_persons != $form->service_persons)) {
+				$new_deposit = $single * $form->service_persons * $form->stock; //新的涉及用户数及库存计算出来的值
+				$old_deposit = $single * $form->model()->service_persons * $form->model()->stock; //原来的涉及用户数及库存计算出来的值
+				$change_deposit = $new_deposit - $old_deposit; //saved里面获取的$form->model()->stock是不对的
+			}
 
-				if (Admin::user()->deposit_normal < $change_deposit) {
-					return $form->response()->error('交易金不足，请先联系管理员充值');
-				}
+			//判断可用交易金是否充足
+			if (Admin::user()->deposit_normal < $change_deposit) {
+				return $form->response()->error('交易金不足，请先联系管理员充值');
 			}
-		})->saved(function (Form $form, $result) use (&$change_deposit) {
-			if ($form->isEditing()) { //有extends判断不准
-				//待审核
-				if ($form->model()->wasChanged(['title', 'price', 'original_price', 'pictures', 'know', 'content'])) {
+		})->saved(function (Form $form, $result) use (&$change_deposit, &$old_deposit) {
+			if ($form->isEditing()) {
+				$supplier = Supplier::query()->find(Admin::user()->id); //不能使用Admin::user()修改，必须使用Supplier模型才能正确记录资金变动日志
+
+				//需要审核的情况
+				if ($form->model()->wasChanged(['title', 'price', 'original_price', 'pictures', 'know', 'content'])) { //有extends判断不准
 					DB::beginTransaction();
 					try {
 						//将产品状态改为未审核
 						$form->model()->update(['status' => ProductStatus::UNAUDITED]);
 
-						//如果产品未审核，重新计算交易金。通过或拒绝之后再扣掉 TODO 改变库存和涉及用户数要考虑。未审核也需要重新全部减掉
-						$supplier = Supplier::query()->find(Admin::user()->id); //不能使用Admin::user()修改，必须使用Supplier模型才能正确记录资金变动日志
-
-						$supplier->deposit_normal = $supplier->deposit_normal - $change_deposit; //正常交易金
-						$supplier->deposit_frozen = $supplier->deposit_frozen + $change_deposit; //冻结交易金
+						//如果产品未审核，原来冻结过的交易金先全部返还，待总后台审核通过之后再做扣除处理
+						$supplier->deposit_normal = $supplier->deposit_normal + $old_deposit; //正常交易金
+						$supplier->deposit_frozen = $supplier->deposit_frozen - $old_deposit; //冻结交易金
 						$supplier->save();
 						DB::commit();
 					} catch (\Exception $e) {
 						DB::rollBack();
 					}
-				} else { //不是待审核
-
+				}
+				//不需要审核的情况，$change_deposit无论是正数还是负数都一样计算
+				else if ($change_deposit != 0) {
+					$supplier->deposit_normal = $supplier->deposit_normal - $change_deposit; //正常交易金
+					$supplier->deposit_frozen = $supplier->deposit_frozen + $change_deposit; //冻结交易金
+					$supplier->save();
 				}
 			}