完善功能

app/admin/controller/notify/RechargeController.php

@@ -103,7 +103,7 @@ class RechargeController
             $addedNbr = 0;
             if (isset($objectJson['order_id'])) {
                 // 对应订单设置已完成
-                Order::where('order_groupby',$payDetail->join_pay_order_id)->update(['order_status_system'=>'DONE','order_is_complete'=>'Y']);
+                Order::where('order_groupby',$payDetail->join_pay_order_id)->update(['order_status_system'=>'DONE','order_is_complete'=>'Y','order_status_storage'=>'DONE']);
                 $addedNbr = RechargeService::disposeOrder($objectJson['order_id']);
                 
 

app/admin/controller/order/PayDetailController.php

@@ -15,6 +15,8 @@ use support\exception\BusinessException;
 use support\Request;
 use support\Response;
 
+use function PHPSTORM_META\type;
+
 class PayDetailController extends Curd
 {
     public function __construct()
@@ -154,7 +156,7 @@ class PayDetailController extends Curd
 
         Db::beginTransaction();
         try {
-            $data = $this->insertRechargeInput($request);
+            $data = $this->insertRechargeInput($request,'WELFARE');
             $data['pay_prepayid'] = 'WELFARE';
             
             $this->doInsert($data);
@@ -186,7 +188,7 @@ class PayDetailController extends Curd
      * @return array
      * @throws BusinessException
      */
-    protected function insertRechargeInput(Request $request): array
+    protected function insertRechargeInput(Request $request,$type="CASH"): array
     {
         $params = $request->post();
         $data = $this->inputFilter($params);
@@ -199,7 +201,6 @@ class PayDetailController extends Curd
                     $data['pay_amount'] = $goods->goods_sales_price;
                 }
                 
-
                 $orderId = "OD" . date("YmdHis") . random_string(6, 'up');
                 $orderGroupId = "OD" . date("YmdHis") . random_string(6, 'up');
                 $orderData = [
@@ -211,11 +212,16 @@ class PayDetailController extends Curd
                     'order_amount_pay' => $data['pay_amount'],
                     'order_amount_json' => '{"tax": 0, "freight": 0}',
                     'order_status_payment' => 'SUCCESS',
-                    'order_category' => 'NORMAL',
-                    'order_status_system' => 'WAITING',
+                    'order_category' => 'RECHARGE',
+                    'order_status_system' => 'PAYING',
                     'order_status_storage' => 'PENDING',
                     'order_addtimes' => time()
                 ];
+                if($type == 'WELFARE'){
+                    $orderData['order_is_complete'] = 'Y';
+                    $orderData['order_status_system'] = 'DONE';
+                    $orderData['order_status_storage'] = 'DONE';
+                }
                 $sku = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->first();
 
                 Order::insert($orderData);
@@ -225,7 +231,7 @@ class PayDetailController extends Curd
                     'join_sheet_goods_id' => $params['goods_id'],
                     'join_sheet_goods_sku_id' => $sku ? $sku->goods_sku_id : 0,
                     'order_sheet_status' => 'DONE',
-                    'order_sheet_category' => 'NORMAL',
+                    'order_sheet_category' => 'RECHARGE',
                     'order_sheet_num' => 1,
                     'order_sheet_price' => $data['pay_amount'],
                     'order_sheet_amount' => $data['pay_amount'],

app/admin/controller/order/WholeController.php

@@ -67,7 +67,7 @@ class WholeController extends Curd
         }
         // 充值订单不显示
         $where['order_category'] = ['<>','RECHARGE'];
-        
+
         $order = $request->get('order', 'desc');
         $field = $field ?? 'order_addtimes';
 
@@ -1150,7 +1150,6 @@ class WholeController extends Curd
         if ($redisCode != $code) {
             return json_fail("验证码错误，请重新输入");
         }
-        Redis::del($key);
 
         $benefits = MemberBenefit::whereIn('member_benefit_id', $benefitIds)
             ->where('join_benefit_member_id', $memberId)
@@ -1213,6 +1212,7 @@ class WholeController extends Curd
                 }
             }
 
+            Redis::del($key);
             
             Db::commit();
 

app/admin/service/goods/GoodsService.php

@@ -450,6 +450,8 @@ class GoodsService
             ->when($goodsClassify != '', function ($query) use ($goodsClassify) {
                 if($goodsClassify == 'NOPACKAGE'){
                     $query->where('goods_classify','<>', 'PACKAGE');
+                }else if($goodsClassify == 'SERVICE'){
+                    $query->whereIn('goods_classify', ['SERVICE','CHNMED','CHNNCD']);
                 }else{
                     $query->where('goods_classify', $goodsClassify);
                 }

app/admin/service/member/MemberService.php

@@ -325,6 +325,9 @@ class MemberService
                 }
             }
             $item['goods_category'] = implode(',', array_unique($categoryName));
+            if(mb_substr($item['goods_category'],0,7) == '自定义金额充值'){
+                $item['goods_category'] = '自定义金额充值';
+            }
 
             if (in_array($item['pay_category'], ['RECHARGE', 'REFUND'])) {
                 $item['balance_type'] = 'add';
@@ -434,7 +437,9 @@ class MemberService
                 }
             }
             $item['goods_category'] = implode(',', array_unique($categoryName));
-
+            if(mb_substr($item['goods_category'],0,7) == '自定义金额充值'){
+                $item['goods_category'] = '自定义金额充值';
+            }
             if (in_array($item['pay_category'], ['RECHARGE', 'REFUND'])) {
                 $item['balance_type'] = 'add';
             } else {

app/admin/service/order/AppointmentService.php

@@ -255,7 +255,7 @@ class AppointmentService
                     'order_amount_total' => $sku->goods_sku_sales_price * $params['person'],
                     'order_amount_pay' => $sku->goods_sku_sales_price * $params['person'],
                     'order_is_complete' => 'N',
-                    'order_category' => 'OTHER',
+                    'order_category' => $goods->goods_classify,
                     'order_status_system' => 'PAYING',
                     'order_status_payment' => 'PENDING',
                     'order_status_storage' => 'PENDING',
@@ -313,16 +313,16 @@ class AppointmentService
                         ]);
                         $pay['pay_status'] = 'SUCCESS';
                         // 更新订单状态
-                        Order::where('order_id', $orderId)->update(['order_status_system' => 'CONFIRM', 'order_status_payment' => 'SUCCESS']);
-                        OrderSheet::where('join_sheet_order_id', $orderId)->update(['order_sheet_status' => 'CONFIRM']);
+                        Order::where('order_id', $orderId)->update(['order_status_system' => 'DONE','order_is_complete'=>'Y', 'order_status_payment' => 'SUCCESS']);
+                        OrderSheet::where('join_sheet_order_id', $orderId)->update(['order_sheet_status' => 'DONE']);
                     }
                     PayDetail::insert($pay);
                 } elseif ($params['settlement_mode'] == 'QRCODE') {
                     $pay['pay_status'] = 'SUCCESS';
                     PayDetail::insert($pay);
                     // 更新订单状态
-                    Order::where('order_id', $orderId)->update(['order_status_system' => 'CONFIRM', 'order_status_payment' => 'SUCCESS']);
-                    OrderSheet::where('join_sheet_order_id', $orderId)->update(['order_sheet_status' => 'CONFIRM']);
+                    Order::where('order_id', $orderId)->update(['order_status_system' => 'DONE','order_is_complete'=>'Y', 'order_status_payment' => 'SUCCESS']);
+                    OrderSheet::where('join_sheet_order_id', $orderId)->update(['order_sheet_status' => 'DONE']);
                 }
             }
 
@@ -438,7 +438,7 @@ class AppointmentService
                     'order_amount_total' => $sku->goods_sku_sales_price * $params['person'],
                     'order_amount_pay' => $sku->goods_sku_sales_price * $params['person'],
                     'order_is_complete' => 'N',
-                    'order_category' => 'OTHER',
+                    'order_category' => $goods->goods_classify,
                     'order_status_system' => 'PAYING',
                     'order_status_payment' => 'PENDING',
                     'order_status_storage' => 'PENDING',
@@ -502,8 +502,9 @@ class AppointmentService
                         $pay['pay_status'] = 'SUCCESS';
                         $pay['join_pay_object_json'] = json_encode(['payment' => ['member_account_id' => $account->member_account_id]]);
                         // 更新订单状态
-                        Order::where('order_id', $orderId)->update(['order_status_system' => 'CONFIRM', 'order_status_payment' => 'SUCCESS']);
-                        OrderSheet::where('join_sheet_order_id', $orderId)->update(['order_sheet_status' => 'CONFIRM']);
+
+                        Order::where('order_id', $orderId)->update(['order_status_system' => 'DONE','order_is_complete'=>'Y', 'order_status_payment' => 'SUCCESS']);
+                        OrderSheet::where('join_sheet_order_id', $orderId)->update(['order_sheet_status' => 'DONE']);
                     }
                     // $pay['pay_category'] = 'CASH';
                     PayDetail::insert($pay);
@@ -525,8 +526,8 @@ class AppointmentService
                         $pay['pay_status'] = 'SUCCESS';
                         $pay['join_pay_object_json'] = json_encode(['payment' => ['member_account_id' => $account->member_account_id]]);
                         // 更新订单状态
-                        Order::where('order_id', $orderId)->update(['order_status_system' => 'CONFIRM', 'order_status_payment' => 'SUCCESS']);
-                        OrderSheet::where('join_sheet_order_id', $orderId)->update(['order_sheet_status' => 'CONFIRM']);
+                        Order::where('order_id', $orderId)->update(['order_status_system' => 'DONE','order_is_complete'=>'Y', 'order_status_payment' => 'SUCCESS']);
+                        OrderSheet::where('join_sheet_order_id', $orderId)->update(['order_sheet_status' => 'DONE']);
                     }
                     // $pay['pay_category'] = 'CASH';
                     PayDetail::insert($pay);
@@ -535,8 +536,8 @@ class AppointmentService
                     $pay['pay_status'] = 'SUCCESS';
                     PayDetail::insert($pay);
                     // 更新订单状态
-                    Order::where('order_id', $orderId)->update(['order_status_system' => 'CONFIRM', 'order_status_payment' => 'SUCCESS']);
-                    OrderSheet::where('join_sheet_order_id', $orderId)->update(['order_sheet_status' => 'CONFIRM']);
+                    Order::where('order_id', $orderId)->update(['order_status_system' => 'DONE','order_is_complete'=>'Y', 'order_status_payment' => 'SUCCESS']);
+                    OrderSheet::where('join_sheet_order_id', $orderId)->update(['order_sheet_status' => 'DONE']);
                 }
 
                 // 回写权益表

app/command/WelfareAccountCommand.php

@@ -39,7 +39,7 @@ class WelfareAccountCommand extends Command
                 Member::where('member_id', $member['member_id'])->update(['member_classify' => 'EMPLOY']);
             }
             // 改所有的充值记录
-            PayDetail::where('join_pay_member_id', $member['member_id'])->where('pay_category', 'RECHARGE')->update(['pay_prepayid' => 'WELFARE']);
+            PayDetail::where('join_pay_member_id', $member['member_id'])->where('pay_category', 'RECHARGE')->where('pay_amount','1000.00')->update(['pay_prepayid' => 'WELFARE']);
 
             // 改所有的付款记录
             PayDetail::where('join_pay_member_id', $member['member_id'])->where('pay_prepayid', $member['member_id'] . '-CASH')->update(['pay_prepayid' => $member['member_id'] . '-WELFARE']);