充值

app/admin/controller/member/MemberController.php

@@ -854,7 +854,7 @@ class MemberController
             }
         ])->whereIn('order_groupby', $payDetailIds)
             ->where('order_addtimes', '>', $firstRechargeTime)
-            ->whereIn('order_classify',['GOODS','SERVICE','CHNMED','CHNNCD','PACKAGE','DISHES']);
+            ->whereIn('order_classify', ['GOODS', 'SERVICE', 'CHNMED', 'CHNNCD', 'PACKAGE', 'DISHES']);
         $total = $orders->count();
         $rows = $orders->orderBy('order_addtimes', 'DESC')
             ->forPage($page, $pageSize)
@@ -942,7 +942,7 @@ class MemberController
             }
         ])->whereIn('order_groupby', $payDetailIds)
             ->where('order_addtimes', '>', $firstRechargeTime)
-            ->whereIn('order_classify',['GOODS','SERVICE','CHNMED','CHNNCD','PACKAGE','DISHES'])
+            ->whereIn('order_classify', ['GOODS', 'SERVICE', 'CHNMED', 'CHNNCD', 'PACKAGE', 'DISHES'])
             ->orderBy('order_addtimes', 'DESC')
             ->get()
             ->toArray();
@@ -1130,6 +1130,8 @@ class MemberController
                 'mobile' => $params['mobile'],
                 'surplus' => $params['surplus'],
                 'added' => $params['added'],
+                'amount' => $params['bank_amount'],
+                'bank_amount' => $params['bank_amount'],
                 'bank_name' => $params['bank_name'],
                 'bank_acount' => $params['bank_acount'],
                 'bank_cardno' => $params['bank_cardno']

app/admin/controller/order/RefundController.php

@@ -122,8 +122,8 @@ class RefundController extends Curd
                 $item['goods_name'] = $goodsName;
             }
             if (!empty($item['order_return_apply_json']) && is_json($item['order_return_apply_json'])) {
-                $json = json_decode($item['order_return_apply_json'], true);
-                $item['order_return_apply_json'] = $json['apply'] ?? '';
+//                $json = json_decode($item['order_return_apply_json'], true);
+//                $item['order_return_apply_json'] = $json['apply'] ?? '';
             }
             if (!empty($item['order_return_recharge_json']) && is_json($item['order_return_recharge_json'])) {
                 $json = json_decode($item['order_return_recharge_json'], true);
@@ -777,10 +777,11 @@ class RefundController extends Curd
             $refundApplyJson = json_decode($returnOrder->order_return_apply_json, true);
             $amount = $refundApplyJson['surplus'];
             $addedAmount = $refundApplyJson['added'];
-            $refundApplyJson['amount'] = $amount;
+//            $refundApplyJson['amount'] = $refundApplyJson[''];
             $refundApplyJson['added_amount'] = $addedAmount;
             $refundApplyJson['user_id'] = JwtToken::getCurrentId();
             $refundApplyJson['datetime'] = date('Y-m-d H:i:s');
+            $refundApplyJson['remark'] = $request->post('refund_remark', '');
             $returnOrder->order_return_refund_json = json_encode($refundApplyJson);
             $returnOrder->order_return_status = 'DONE';
             $returnOrder->order_return_remark = $request->post('refund_remark', '');