更新

app/Admin/Forms/CheckIncome.php

@@ -49,16 +49,16 @@ public function handle(array $input)
                     //更新余额
                     if ($income->user_type == 1) { //用户
                         $uObj = User::find($income->um_id);
-                        if ($uObj->balance >= $income->amount) {
-                            $uObj->balance -= $income->amount;
+                        if ($uObj->freeze_balance >= $income->amount) {
+                            $uObj->freeze_balance -= $income->amount;
                             $uObj->save();
                         } else {
                             throw new Exception('用户余额不足！');
                         }
                     } elseif ($income->user_type == 2) { //商户
                         $mObj = Merchant::find($income->um_id);
-                        if ($mObj->balance >= $income->amount) {
-                            $mObj->balance -= $income->amount;
+                        if ($mObj->freeze_balance >= $income->amount) {
+                            $mObj->freeze_balance -= $income->amount;
                             $mObj->save();
                         } else {
                             throw new Exception('商户余额不足！');
@@ -67,6 +67,18 @@ public function handle(array $input)
                 }
             } elseif ($status == 2) {
                 $income->status = 2;
+                //退回余额
+                if ($income->user_type == 1) { //用户
+                    $uObj = User::find($income->um_id);
+                    $uObj->balance += $income->amount;
+                    $uObj->freeze_balance -= $income->amount;
+                    $uObj->save();
+                } elseif ($income->user_type == 2) { //商户
+                    $mObj = Merchant::find($income->um_id);
+                    $mObj->freeze += $income->amount;
+                    $mObj->freeze_balance -= $income->amount;
+                    $mObj->save();
+                }
             }
 
             $income->save();

app/Admin/Renderable/RenderGoodSku.php

@@ -22,6 +22,7 @@ public function grid(): Grid
             //规格	购买数量 折扣价	采购价	京东价	零售价	库存
             $grid->addTableClass(['table-text-center']);
             $grid->model()->where('goods_id', $gid);
+            $grid->column('pic', '商品图片')->image('', 100, 100);
             $grid->column('attr_val', '规格');
             $grid->column('cg_price', '代购价');
             $grid->column('market_price', '零售价');

app/Http/Controllers/Api/IncomeController.php

@@ -80,8 +80,16 @@ public function add(Request $request)
         }
         DB::beginTransaction();
         try {
-            $comObj = new Income();
+            if ($role_id == 1) { //商家
+                $memObj = Merchant::find($um_id);
+            } else { //用户
+                $memObj = User::find($um_id);
+            }
+            $memObj->balance -= $money;
+            $memObj->freeze_balance += $money;
+            $memObj->save();
 
+            $comObj = new Income();
             $comObj->user_type = $type;
             $comObj->um_id = $um_id;
             $comObj->openid = $useObj->openid;

app/Http/Controllers/Api/OrderController.php

@@ -290,10 +290,10 @@ public function pay(Request $request)
             $res = '';
             $order = OrderInfoModel::find($order_id);
             if ($order->pay_cs > 0) {
-                $order_record = $order->order_record ?? $order->order_sn;
-                $order->order_sn = $this->getOrderSn();
-                $order->order_record = $order_record . "|" . $order->order_sn;
-                $order->save();
+                // $order_record = $order->order_record ?? $order->order_sn;
+                // $order->order_sn = $this->getOrderSn();
+                // $order->order_record = $order_record . "|" . $order->order_sn;
+                // $order->save();
             }
             $orderGoodsObj = OrderGoods::where("order_id", $order_id)->first();
             $order_title = $orderGoodsObj ? $orderGoodsObj->goods_name : '';

app/Models/Pay.php

@@ -60,11 +60,11 @@ public static  function payNotify($fields = [])
     {
         $app =  Factory::payment(self::getConfig());
         $response = $app->handlePaidNotify(function ($message, $fail) {
+            Log::add('--支付回调--', $message);
             $orderObj = OrderInfo::where(['order_sn' => $message['out_trade_no']])->first();
             if (!$orderObj) {
                 $fail('订单不存在');
             }
-            Log::add('--支付回调--', $message);
             //支付完成后的业务逻辑[result_code] => SUCCESS
             if ($orderObj->pay_status == 1) {
                 return true;

app/Store/Controllers/MerchatGoodsStoreController.php

@@ -6,8 +6,6 @@
 use App\Models\MerchantGoodSku;
 use App\Admin\Renderable\MerchantStoreSkuList;
 use App\Models\Good;
-use App\Models\StoreGoodsCategory;
-use App\Models\StoreGoodsTag;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;

app/Store/Controllers/OrderDivideRecordController.php

@@ -4,7 +4,6 @@
 
 use App\Models\Merchant;
 use App\Models\OrderDivideRecord;
-use App\Store\Actions\Grid\IncomeApply;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;

app/Store/Controllers/OrderInfoController.php

@@ -3,10 +3,6 @@
 namespace App\Store\Controllers;
 
 use App\Models\UserAddress;
-use App\Models\UserRefund;
-use App\Store\Actions\Grid\RefundToExamine;
-use App\Store\Actions\Grid\SendOutGoods;
-use App\Models\StoreOrder;
 use App\Models\OrderInfo;
 use App\Models\City;
 use App\Models\Store;
@@ -96,41 +92,12 @@ protected function grid()
      *
      * @return Show
      */
-    protected function detail($id)
-    {
-        return Show::make($id, new StoreOrder(), function (Show $show) {
-            $show->field('id');
-            $show->field('order_id');
-            $show->field('goods_id');
-            $show->field('num');
-            $show->field('address_id');
-            $show->field('status');
-            $show->field('over_time');
-            $show->field('voucher');
-            $show->field('created_at');
-            $show->field('updated_at');
-        });
-    }
+    protected function detail($id) {}
 
     /**
      * Make a form builder.
      *
      * @return Form
      */
-    protected function form()
-    {
-        return Form::make(new StoreOrder(), function (Form $form) {
-            $form->display('id');
-            $form->text('order_id');
-            $form->text('goods_id');
-            $form->text('num');
-            $form->text('address_id');
-            $form->text('status');
-            $form->text('over_time');
-            $form->text('voucher');
-
-            $form->display('created_at');
-            $form->display('updated_at');
-        });
-    }
+    protected function form() {}
 }

app/Store/Controllers/StoreIncomeController.php

@@ -3,7 +3,6 @@
 namespace App\Store\Controllers;
 
 use App\Models\Income;
-use App\Store\Actions\Grid\IncomeApply;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
@@ -21,7 +20,6 @@ class StoreIncomeController extends AdminController
     protected function grid()
     {
         return Grid::make(new Income(), function (Grid $grid) {
-            //$grid->tools(new IncomeApply());
             $grid->addTableClass(['table-text-center']);
             $merchant_id = Admin::user()->merchant_id;
             $grid->model()->where(['user_type' => 2, 'um_id' => $merchant_id])->orderBy('created_at', 'DESC');