Browse Source

新客专享

gorden 5 months ago
parent
commit
98346a7f3c

+ 45 - 0
app/admin/controller/goods/PartnerController.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace app\admin\controller\goods;
+
+use app\admin\service\goods\PartnerService;
+use app\admin\validate\goods\GoodsValidate;
+use support\Request;
+use support\Response;
+
+class PartnerController
+{
+    /**
+     * @Desc 商品详情
+     * @Author Gorden
+     * @Date 2024/3/28 10:25
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public function info(Request $request)
+    {
+        $validate = new GoodsValidate();
+        if (!$validate->scene('info')->check($request->get())) {
+            return json_fail($validate->getError());
+        }
+
+        return PartnerService::info($request->get('goods_id'));
+    }
+    /**
+     * @Desc 修改商品
+     * @Author Gorden
+     * @Date 2024/3/28 13:22
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public function update(Request $request): Response
+    {
+        $validate = new GoodsValidate();
+        if (!$validate->scene('update')->check($request->post())) {
+            return json_fail($validate->getError());
+        }
+        return PartnerService::update($request->post());
+    }
+}

+ 45 - 0
app/admin/controller/goods/ReferrerController.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace app\admin\controller\goods;
+
+use app\admin\service\goods\ReferrerService;
+use app\admin\validate\goods\GoodsValidate;
+use support\Request;
+use support\Response;
+
+class ReferrerController
+{
+    /**
+     * @Desc 商品详情
+     * @Author Gorden
+     * @Date 2024/3/28 10:25
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public function info(Request $request)
+    {
+        $validate = new GoodsValidate();
+        if (!$validate->scene('info')->check($request->get())) {
+            return json_fail($validate->getError());
+        }
+
+        return ReferrerService::info($request->get('goods_id'));
+    }
+    /**
+     * @Desc 修改商品
+     * @Author Gorden
+     * @Date 2024/3/28 13:22
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public function update(Request $request): Response
+    {
+        $validate = new GoodsValidate();
+        if (!$validate->scene('update')->check($request->post())) {
+            return json_fail($validate->getError());
+        }
+        return ReferrerService::update($request->post());
+    }
+}

+ 122 - 16
app/admin/controller/order/NewCustomerController.php

@@ -32,6 +32,7 @@ use support\Redis;
 use support\Request;
 use support\Response;
 use Webman\Event\Event;
+use Yansongda\Pay\Pay;
 
 class NewCustomerController extends Curd
 {
@@ -314,16 +315,16 @@ class NewCustomerController extends Curd
             // 支付记录
             $this->insertPayDetail($params);
 
+            Db::commit();
+
             // 分期付完
             if ($params['goods_classify'] == 'COMBINE' && $params['order_status_payment'] == 'SUCCESS' && (!empty($paidOrder) && floatval($paidOrder->order_amount_paid) >= $paidOrder->order_amount_total || floatval($params['order_amount_pay']) >= $params['order_amount_total'])) {
                 $params['member_id'] = $params['join_order_member_id'];
                 Event::dispatch('order.new_custom.grant', $params);
             }
-
-            Db::commit();
             if ($params['settlement_now'] == 'Y' && $params['order_status_payment'] != 'SUCCESS') {
                 _syslog("订单", "支付异常,检查是否有轮询");
-                return json_throw(2001, '支付异常', ['order_id' => $params['orderId']]);
+                return json_throw(2001, '支付异常', ['order_id' => $params['orderId'], 'group_id' => $params['orderGroupId']]);
             }
             _syslog("订单", "创建订单成功");
             return json_success('创建订单成功');
@@ -450,7 +451,7 @@ class NewCustomerController extends Curd
                 // 账户支付的金额
                 $params['order_amount_pay'] = $accountAmount;
             }
-            if ($order->order_status_payment == 'SUCCESS'){
+            if ($order->order_status_payment == 'SUCCESS') {
                 $order->order_amount_paid = $order->order_amount_paid + $params['order_amount_pay'];
                 $order->order_amount_pay = $order->order_amount_paid;
             }
@@ -520,21 +521,21 @@ class NewCustomerController extends Curd
 
             PayDetail::insert($payData);
 
+            Db::commit();
+
             // 分期付款完成
             if ($params['goods_classify'] == 'COMBINE' && $order->order_status_payment == 'SUCCESS' && floatval($order->order_amount_paid) >= $order->order_amount_total) {
                 $params['member_id'] = $params['join_order_member_id'];
                 Event::dispatch('order.new_custom.grant', $params);
             }
 
-            Db::commit();
-
             if ($order->order_is_complete == 'Y' && $order->order_status_payment == 'SUCCESS') {
                 Event::dispatch('order.complete', $params);
             }
 
             if ($order->order_status_payment != 'SUCCESS' && $paymentStatus != 'SUCCESS') {
                 _syslog("订单", "支付异常,检查是否有轮询");
-                return json_throw(2001, '支付异常', ['order_id' => $params['orderId']]);
+                return json_throw(2001, '支付异常', ['order_id' => $params['orderId'], 'group_id' => $params['orderGroupId']]);
             }
             _syslog("订单", "订单支付成功");
             return json_success('支付成功');
@@ -742,7 +743,7 @@ class NewCustomerController extends Curd
                     $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id');
                 },
                 'goods' => function ($query) {
-                    $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify', 'goods_if_express','goods_attribute_json');
+                    $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify', 'goods_if_express', 'goods_attribute_json');
                 },
                 'memberInfo',
                 'cert',
@@ -833,22 +834,22 @@ class NewCustomerController extends Curd
                 }
                 $coupons = [];
                 // 产品携带的优惠券
-                if (!empty($item['goods']['goods_attribute_json'])){
-                    $goodsAttributeJson = json_decode($item['goods']['goods_attribute_json'],true);
-                    if (isset($goodsAttributeJson['coupon'])){
+                if (!empty($item['goods']['goods_attribute_json'])) {
+                    $goodsAttributeJson = json_decode($item['goods']['goods_attribute_json'], true);
+                    if (isset($goodsAttributeJson['coupon'])) {
                         $couponIds = array_keys($goodsAttributeJson['coupon']);
-                        $coupons = Coupon::whereIn('coupon_id',$couponIds)
-                            ->select('coupon_id','coupon_name','coupon_classify','coupon_is_period','coupon_period_json','coupon_addtimes')
+                        $coupons = Coupon::whereIn('coupon_id', $couponIds)
+                            ->select('coupon_id', 'coupon_name', 'coupon_classify', 'coupon_is_period', 'coupon_period_json', 'coupon_addtimes')
                             ->get()
                             ->toArray();
-                        foreach($coupons as &$coupon){
-                            if (isset($goodsAttributeJson['coupon'][$coupon['coupon_id']])){
+                        foreach ($coupons as &$coupon) {
+                            if (isset($goodsAttributeJson['coupon'][$coupon['coupon_id']])) {
                                 $coupon['num'] = $goodsAttributeJson['coupon'][$coupon['coupon_id']]['num'];
                             }
                         }
                     }
                 }
-                
+
                 $item['member']['level'] = '普通会员';
                 if (!empty($item['member']['join_member_role_id'])) {
                     $item['member']['level'] = MemberRole::where('member_role_id', $item['member']['join_member_role_id'])->value('member_role_name');
@@ -1044,4 +1045,109 @@ class NewCustomerController extends Curd
             return json_fail("上传附件失败");
         }
     }
+
+
+    /**
+     * @Desc 查询订单状态
+     * @Author Gorden
+     * @Date 2024/8/19 11:55
+     *
+     * @param Request $request
+     * @return Response|void
+     */
+    public function getOrderPayStatus(Request $request)
+    {
+        $groupId = $request->get('group_id');
+        if (!$groupId) {
+            return json_fail('参数异常');
+        }
+
+        $order = Order::where('order_groupby', $groupId)->first();
+        if (empty($order)) {
+            return json_fail('订单不存在');
+        }
+        $order = $order->toArray();
+        $sheet = OrderSheet::where('join_sheet_order_id', $order['order_id'])
+            ->select('order_sheet_id', 'join_sheet_goods_id', 'join_sheet_goods_sku_id')
+            ->first();
+
+        $payDetailType = PayDetail::where('join_pay_order_id', $groupId)->pluck('pay_prepayid')->toArray();
+        try {
+            Db::beginTransaction();
+            $payStatus = 'N';
+            $payAmount = 0;
+            if (in_array('WXPAY', $payDetailType)) {
+                $result = Pay::wechat(config('payment.wxpay'))->find($groupId, 'pos');
+                $result = json_decode(json_encode($result), true);
+//                $result = '{"return_code":"SUCCESS","return_msg":"OK","result_code":"SUCCESS","mch_id":"1680393367","appid":"wxc6274da7198e3eb4","openid":"o3JAn6Ii_bAlxS-jbNEC4WnPhdwM","is_subscribe":"N","trade_type":"MICROPAY","trade_state":"SUCCESS","bank_type":"OTHERS","total_fee":"2","fee_type":"CNY","cash_fee":"1000","cash_fee_type":"CNY","transaction_id":"4200067718202409250802875650","out_trade_no":"OD24092518408RV7","attach":[],"time_end":"20240925184009","trade_state_desc":"支付成功","nonce_str":"OeGOkjch4eaV5qIt","sign":"6DCB3BFC594EBC018A2BEE2C3DFEA4E3"}';
+//                $result = json_decode($result, true);
+                if (!empty($result['return_code']) && $result['return_code'] == 'SUCCESS' && !empty($result['result_code']) && $result['result_code'] == 'SUCCESS' && !empty($result['trade_state']) && $result['trade_state'] == 'SUCCESS') {
+                    $payStatus = 'Y';
+                    $payAmount = ($result['total_fee'] / 100);
+                    $orderUpdateData['order_status_payment'] = 'PENDING';
+                    $orderUpdateData['order_amount_paid'] = $order['order_amount_paid'] + $payAmount;
+                    $orderUpdateData['order_amount_pay'] = $order['order_amount_pay'] + $payAmount;
+                    if ($order['order_amount_paid'] + $payAmount >= $order['order_amount_total']) {
+                        $orderUpdateData['order_status_payment'] = 'SUCCESS';
+                        $orderUpdateData['order_status_system'] = 'DONE';
+                        $orderUpdateData['order_is_complete'] = 'Y';
+                    }
+                    // 主订单
+                    Order::where('order_groupby', $groupId)->update($orderUpdateData);
+                    // Sheet
+                    OrderSheet::where('join_sheet_order_id', $order['order_id'])->where('order_sheet_status', 'PAYING')->update(['order_sheet_status' => 'DONE']);
+
+                    // 支付记录
+                    PayDetail::where('join_pay_order_id', $order['order_groupby'])->where('pay_prepayid', 'WXPAY')->update(['pay_status' => 'SUCCESS']);
+                }
+            } else if (in_array('ALIPAY', $payDetailType)) {
+                $result = Pay::alipay(config('payment.alipay'))->find($groupId);
+                $result = json_decode(json_encode($result), true);
+//                $result = '{"code":"10000","msg":"Success","buyer_logon_id":"138******93","buyer_pay_amount":"5.87","fund_bill_list":[{"amount":"5.69","fund_channel":"ALIPAYACCOUNT"},{"amount":"0.18","fund_channel":"COUPON"},{"amount":"0.13","fund_channel":"DISCOUNT"}],"invoice_amount":"5.69","out_trade_no":"OD2409251550Q07A","point_amount":"0.00","receipt_amount":"0.01","send_pay_date":"2024-09-25 15:50:22","total_amount":"0.01","trade_no":"2024092523001439431419750998","trade_status":"TRADE_SUCCESS","buyer_open_id":"04309N2aVhSZz4cKwN_DN2DQa7ekM3z5n8kscQHsmIZOJsf"}';
+//                $result = json_decode($result, true);
+                if (!empty($result['code']) && $result['code'] == '10000' && !empty($result['trade_status']) && $result['trade_status'] == 'TRADE_SUCCESS') {
+                    $payStatus = 'Y';
+                    $payAmount = $result['total_amount'];
+                    $orderUpdateData['order_status_payment'] = 'PENDING';
+                    $orderUpdateData['order_amount_paid'] = $order['order_amount_paid'] + $payAmount;
+                    $orderUpdateData['order_amount_pay'] = $order['order_amount_pay'] + $payAmount;
+                    if ($order['order_amount_paid'] + $payAmount >= $order['order_amount_total']) {
+                        $orderUpdateData['order_status_payment'] = 'SUCCESS';
+                        $orderUpdateData['order_status_system'] = 'DONE';
+                        $orderUpdateData['order_is_complete'] = 'Y';
+                    }
+                    // 主订单
+                    Order::where('order_groupby', $groupId)->update($orderUpdateData);
+                    // Sheet
+                    OrderSheet::where('join_sheet_order_id', $order['order_id'])->where('order_sheet_status', 'PAYING')->update(['order_sheet_status' => 'DONE']);
+                    // 支付记录
+                    PayDetail::where('join_pay_order_id', $order['order_groupby'])->where('pay_prepayid', 'ALIPAY')->update(['pay_status' => 'SUCCESS']);
+                }
+            }
+            if ($payStatus == 'Y') {
+                Db::commit();
+
+                if ($order['order_amount_paid'] + $payAmount >= $order['order_amount_total']) {
+                    $params['member_id'] = $order['join_order_member_id'];
+                    $params['join_sheet_goods_id'] = $sheet->join_sheet_goods_id;
+                    Event::dispatch('order.new_custom.grant', $params);
+                }
+
+
+                return json_success('success');
+            }
+
+
+            Db::rollBack();
+            return json_fail('没有查询到记录');
+        } catch (BusinessException $e) {
+            Db::rollBack();
+            _syslog("支付轮询", '订单支付异常:' . $e->getMessage());
+            return json_fail($e->getMessage());
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            Db::rollBack();
+            return json_fail('查询失败');
+        }
+    }
 }

+ 119 - 2
app/admin/controller/order/PartnerController.php

@@ -32,6 +32,7 @@ use support\Redis;
 use support\Request;
 use support\Response;
 use Webman\Event\Event;
+use Yansongda\Pay\Pay;
 
 class PartnerController extends Curd
 {
@@ -314,14 +315,13 @@ class PartnerController extends Curd
             }
             // 支付记录
             $this->insertPayDetail($params);
-
+            Db::commit();
             // 分期付完
             if ($params['goods_classify'] == 'PARTNER' && $params['order_status_payment'] == 'SUCCESS' && (!empty($paidOrder) && floatval($paidOrder->order_amount_paid) >= $paidOrder->order_amount_total || floatval($params['order_amount_pay']) >= $params['order_amount_total'])) {
                 $params['member_id'] = $params['join_order_member_id'];
                 Event::dispatch('order.partner.grant', $params);
             }
 
-            Db::commit();
             if ($params['settlement_now'] == 'Y' && $params['order_status_payment'] != 'SUCCESS') {
                 _syslog("订单", "支付异常,检查是否有轮询");
                 return json_throw(2001, '支付异常', ['order_id' => $params['orderId']]);
@@ -1094,4 +1094,121 @@ class PartnerController extends Curd
             return json_fail("上传附件失败");
         }
     }
+
+    /**
+     * @Desc 查询订单状态
+     * @Author Gorden
+     * @Date 2024/8/19 11:55
+     *
+     * @param Request $request
+     * @return Response|void
+     */
+    public function getOrderPayStatus(Request $request)
+    {
+        $orderId = $request->get('order_id', '');
+        if (!$orderId) {
+            return json_fail('订单不存在');
+        }
+
+        $order = Order::where('order_id', $orderId)->first();
+        if (!$order) {
+            return json_fail('订单不存在');
+        }
+
+        $discountJson = [];
+        if (!empty($order->order_discount_json)) {
+            $discountJson = json_decode($order->order_discount_json, true);
+        }
+
+        if ($order->order_status_payment == 'SUCCESS') {
+            return json_success('success');
+        }
+
+        $payDetailType = PayDetail::where('join_pay_order_id', $order->order_groupby)->pluck('pay_prepayid')->toArray();
+        try {
+            Db::beginTransaction();
+            if (in_array('WXPAY', $payDetailType)) {
+                $result = Pay::wechat(config('payment.wxpay'))->find($order->order_groupby, 'pos');
+                $result = json_decode(json_encode($result), true);
+//                $result = '{"return_code":"SUCCESS","return_msg":"OK","result_code":"SUCCESS","mch_id":"1680393367","appid":"wxc6274da7198e3eb4","openid":"o3JAn6Ii_bAlxS-jbNEC4WnPhdwM","is_subscribe":"N","trade_type":"MICROPAY","trade_state":"SUCCESS","bank_type":"OTHERS","total_fee":"1000","fee_type":"CNY","cash_fee":"1000","cash_fee_type":"CNY","transaction_id":"4200067718202409250802875650","out_trade_no":"OD24092518408RV7","attach":[],"time_end":"20240925184009","trade_state_desc":"支付成功","nonce_str":"OeGOkjch4eaV5qIt","sign":"6DCB3BFC594EBC018A2BEE2C3DFEA4E3"}';
+//                $result = json_decode($result, true);
+                if (!empty($result['return_code']) && $result['return_code'] == 'SUCCESS' && !empty($result['result_code']) && $result['result_code'] == 'SUCCESS' && !empty($result['trade_state']) && $result['trade_state'] == 'SUCCESS') {
+                    $order->order_status_payment = 'SUCCESS';
+                    if (in_array($order->order_category, ['SERVICE', 'CHNMED', 'CHNNCD', 'PACKAGE'])) {
+                        $order->order_status_system = 'WAITING';
+                    } else if (in_array($order->order_category, ['DISHES', 'MEALS'])) {
+                        $order->order_is_complete = 'Y';
+                        $order->order_status_system = 'DONE';
+                    } else if (in_array($order->order_category, ['VIP', 'PARTNER'])) {
+                        $order->order_status_payment = 'PENDING';
+                        $totalFee = $result['total_fee'] / 100;
+                        if ($order->order_amount_paid + $totalFee >= $order->order_amount_total) {
+                            $order->order_amount_paid = $order->order_amount_paid + $totalFee;
+                            $order->order_status_payment = 'SUCCESS';
+                            $order->order_status_system = 'DONE';
+                            $order->order_is_complete = 'Y';
+                        }
+                    } else {
+                        $order->order_status_system = 'SENDING';
+                    }
+                    $order->save();
+                    // Sheet
+                    if ($order->order_status_payment == 'SUCCESS') {
+                        OrderSheet::where('join_sheet_order_id', $orderId)->where('order_sheet_status', 'PAYING')->update(['order_sheet_status' => 'DONE']);
+                    }
+                    // 支付记录
+                    PayDetail::where('join_pay_order_id', $order->order_groupby)->where('pay_prepayid', 'WXPAY')->update(['pay_status' => 'SUCCESS']);
+
+                    // 优惠券标记使用
+                    $this->changeOrderCouponStatus($discountJson, 'USED');
+
+                    Db::commit();
+                    return json_success('success');
+                }
+            } else if (in_array('ALIPAY', $payDetailType)) {
+                $result = Pay::alipay(config('payment.alipay'))->find($order->order_groupby);
+                $result = json_decode(json_encode($result), true);
+//                $result = '{"code":"10000","msg":"Success","buyer_logon_id":"138******93","buyer_pay_amount":"5.87","fund_bill_list":[{"amount":"5.69","fund_channel":"ALIPAYACCOUNT"},{"amount":"0.18","fund_channel":"COUPON"},{"amount":"0.13","fund_channel":"DISCOUNT"}],"invoice_amount":"5.69","out_trade_no":"OD2409251550Q07A","point_amount":"0.00","receipt_amount":"6.00","send_pay_date":"2024-09-25 15:50:22","total_amount":"6.00","trade_no":"2024092523001439431419750998","trade_status":"TRADE_SUCCESS","buyer_open_id":"04309N2aVhSZz4cKwN_DN2DQa7ekM3z5n8kscQHsmIZOJsf"}';
+//                $result = json_decode($result, true);
+                if (!empty($result['code']) && $result['code'] == '10000' && !empty($result['trade_status']) && $result['trade_status'] == 'TRADE_SUCCESS') {
+                    $order->order_status_payment = 'SUCCESS';
+                    if (in_array($order->order_category, ['SERVICE', 'CHNMED', 'CHNNCD', 'PACKAGE'])) {
+                        $order->order_status_system = 'WAITING';
+                    } elseif (in_array($order->order_category, ['DISHES', 'MEALS'])) {
+                        $order->order_is_complete = 'Y';
+                        $order->order_status_system = 'DONE';
+                    } else if (in_array($order->order_category, ['VIP', 'PARTNER'])) {
+                        $order->order_status_payment = 'PENDING';
+                        if ($order->order_amount_paid + $result['total_amount'] >= $order->order_amount_total) {
+                            $order->order_amount_paid = $order->order_amount_paid + $result['total_amount'];
+                            $order->order_status_system = 'DONE';
+                            $order->order_status_payment = 'SUCCESS';
+                            $order->order_is_complete = 'Y';
+                        }
+                    } else {
+                        $order->order_status_system = 'SENDING';
+                    }
+                    $order->save();
+                    // Sheet
+                    if ($order->order_status_payment == 'SUCCESS') {
+                        OrderSheet::where('join_sheet_order_id', $orderId)->where('order_sheet_status', 'PAYING')->update(['order_sheet_status' => 'DONE']);
+                    }
+                    // 支付记录
+                    PayDetail::where('join_pay_order_id', $order->order_groupby)->where('pay_prepayid', 'ALIPAY')->update(['pay_status' => 'SUCCESS']);
+                    // 其他支付方式 扣
+//                    $this->deductAccount($order->order_groupby, 'ALIPAY');
+                    // 优惠券标记使用
+                    $this->changeOrderCouponStatus($discountJson, 'USED');
+                    Db::commit();
+                    return json_success('success');
+                }
+            }
+            Db::rollBack();
+            return json_fail('没有查询到记录');
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            Db::rollBack();
+            return json_fail('查询失败');
+        }
+    }
 }

+ 1 - 1
app/admin/controller/order/WholeController.php

@@ -4877,7 +4877,7 @@ class WholeController extends Curd
                         // Sheet
                         OrderSheet::where('join_sheet_order_id', $order['order_id'])->where('order_sheet_status', 'PAYING')->update(['order_sheet_status' => 'DONE']);
                         // 支付记录
-                        PayDetail::where('join_pay_order_id', $order->order_groupby)->where('pay_prepayid', 'ALIPAY')->update(['pay_status' => 'SUCCESS']);
+                        PayDetail::where('join_pay_order_id', $order['order_groupby'])->where('pay_prepayid', 'ALIPAY')->update(['pay_status' => 'SUCCESS']);
                         // 优惠券标记使用
                         $discountJson = [];
                         if (!empty($orders[0]['order_discount_json'])) {

+ 82 - 3
app/admin/service/coupon/CouponService.php

@@ -4,7 +4,10 @@ namespace app\admin\service\coupon;
 
 use app\model\Coupon;
 use app\model\CouponDetail;
+use app\model\Goods;
 use support\Db;
+use support\exception\BusinessException;
+use support\Log;
 
 class CouponService
 {
@@ -45,7 +48,7 @@ class CouponService
                     continue;
                 }
                 $details = CouponDetail::where('join_detail_coupon_id', $coupon['coupon_id'])
-                    ->where('join_coupon_detail_member_id','<>','')
+                    ->where('join_coupon_detail_member_id', '<>', '')
                     ->selectRaw('join_coupon_detail_member_id,COUNT(*) as count')
                     ->groupBy('join_coupon_detail_member_id')
                     ->get();
@@ -101,11 +104,11 @@ class CouponService
                             }
                         }
                     }
-                    if (CouponDetail::whereIn('coupon_detail_status',['INIT','PENDING'])->exists()){
+                    if (CouponDetail::whereIn('coupon_detail_status', ['INIT', 'PENDING'])->exists()) {
                         // 匹配已发行的优惠券
                         $params['chooseCouponNbr'] = 1;
                         CouponDetailService::customSendCouponHave($params);
-                    }else{
+                    } else {
                         // 写入优惠券
                         CouponDetailService::customSendCoupon($params);
                     }
@@ -167,4 +170,80 @@ class CouponService
         }
 
     }
+
+    /**
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/9/28 14:00
+     *
+     * @param $params
+     *          join_sheet_goods_id  关联测产品
+     *          member_id   接收人
+     * @return void
+     * @throws BusinessException
+     */
+    public static function autoSendCouponByGoods($params)
+    {
+        try {
+
+            $goods = Goods::where('goods_id', $params['join_sheet_goods_id'])->select('goods_attribute_json')->first();
+            if (!empty($goods) && !empty($goods->goods_attribute_json)) {
+                $goodsAttributeJson = json_decode($goods->goods_attribute_json, true);
+                if (!empty($goodsAttributeJson['coupon'])) {
+                    foreach ($goodsAttributeJson['coupon'] as $key => $coupon) {
+                        $couponModel = Coupon::where('coupon_id', $key)->select('coupon_id', 'coupon_validdate_day', 'coupon_validdate_end', 'coupon_is_period', 'coupon_number')->first();
+                        if (empty($couponModel)) {
+                            continue;
+                        }
+                        // 券是否过期
+                        if (!empty($couponModel->coupon_validdate_end) && strtotime($couponModel->coupon_validdate_end) < time()) {
+                            continue;
+                        }
+                        // 发周期券
+                        if ($couponModel->coupon_is_period == 'Y') {
+                            // 发券参数
+                            $couponSendParams = ['gettype' => 'PARTNER', 'coupon_id' => $key, 'member_id' => $params['member_id']];
+                            Log::info("发周期券参数", $couponSendParams);
+                            CouponDetailService::sendPeriodCoupon($couponSendParams);
+                            continue;
+                        }
+                        $couponResidue = 'all';
+                        if ($couponModel->coupon_number != 0) {
+                            $couponResidue = CouponDetail::where('join_detail_coupon_id', $key)->whereIn('coupon_detail_status', ['INIT', 'PENDING'])->count();
+                            // 超出优惠券设置的数量
+                            if ($couponResidue < $coupon['num']) {
+                                continue;
+                            }
+                        }
+                        $endDate = '';
+                        if (!empty($couponModel->coupon_validdate_end)) {
+                            $endDate = $couponModel->coupon_validdate_end;
+                        } elseif ($couponModel->coupon_validdate_day > 0) {
+                            $endDate = date('Y-m-d H:i:s', time() + ($couponModel->coupon_validdate_day * 24 * 3600) - 1);
+                        }
+                        // 发券参数
+                        $couponSendParams = [
+                            'gettype' => 'PARTNER',
+                            'coupon_id' => $key,
+                            'chooseCouponNbr' => $coupon['num'],
+                            'member_id' => $params['member_id'],
+                            'coupon_detail_gain_datetime' => date('Y-m-d H:i:s'),
+                            'coupon_detail_deadline_datetime' => $endDate,
+                        ];
+
+                        Log::info("发普通券参数", $couponSendParams);
+                        if ($couponResidue != 'all' && $couponResidue - $coupon['num'] >= 0) {
+                            CouponDetailService::customSendCouponHave($couponSendParams);
+                        } else {
+                            for ($i = 0; $i < $coupon['num']; $i++) {
+                                CouponDetailService::customSendCoupon($couponSendParams);
+                            }
+                        }
+                    }
+                }
+            }
+        }catch (\Exception $e){
+            throw new BusinessException("优惠券发放失败");
+        }
+    }
 }

+ 2118 - 0
app/admin/service/goods/PartnerService.php

@@ -0,0 +1,2118 @@
+<?php
+
+namespace app\admin\service\goods;
+
+use app\common\Tree;
+use app\model\Appointment;
+use app\model\Coupon;
+use app\model\Goods;
+use app\model\GoodsComponent;
+use app\model\GoodsDetail;
+use app\model\GoodsLabel;
+use app\model\GoodsRunning;
+use app\model\GoodsSku;
+use app\model\OrderSheet;
+use app\model\Supplier;
+use app\model\SysCategory;
+use app\model\SysDept;
+use app\model\SysSerial;
+use app\model\SysUser;
+use support\Db;
+use support\exception\BusinessException;
+use support\Redis;
+use support\Request;
+use support\Response;
+use Tinywan\Jwt\JwtToken;
+
+class PartnerService
+{
+    public static function selectAll($goodsIds)
+    {
+        $goods = Goods::where('goods_status', 'ON')
+            ->when($goodsIds != '', function ($query) use ($goodsIds) {
+                $query->whereIn('goods_id', $goodsIds);
+            })
+            ->select('goods_id', 'goods_name')
+            ->get();
+
+        return json_success('', $goods);
+    }
+
+    public static function selectAllByGoodsName($goodsName)
+    {
+        $goods = Goods::with('sku')
+            ->where('goods_status', 'ON')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where('goods_name', 'like', "%" . $goodsName . '%');
+            })
+            ->select('goods_id', 'goods_name', 'goods_classify')
+            ->get()
+            ->toArray();
+        foreach ($goods as &$item) {
+            if (!empty($item['sku'])) {
+                foreach ($item['sku'] as $key => $sku) {
+                    $specsJson = json_decode($sku['goods_sku_specs_json'], true);
+                    $skuTitle = '';
+                    foreach ($specsJson as $item2) {
+                        if (is_array($item2)) {
+                            $item2 = implode(',', $item2);
+                        }
+                        $skuTitle .= $item2 . '-';
+                    }
+                    $item['sku'][$key]['goods_sku_id'] = strval($item['sku'][$key]['goods_sku_id']);
+                    $item['sku'][$key]['goods_sku_title'] = rtrim($skuTitle, '-');
+                }
+            }
+        }
+
+        return json_success('', $goods);
+    }
+
+    public static function selectAllByCategoryForRuleAddComponent($category = "GOODS")
+    {
+        $categoryIds = [];
+        $categorySuperIds = [];
+        if ($category == 'GOODS') {
+            $categorySuperIds = [5];
+        } elseif ($category == 'SERVICE') {
+            $categorySuperIds = [31, 154, 42, 65, 30, 66, 72, 70];
+        }
+        $categorys = SysCategory::whereIn('category_id', $categorySuperIds)->get()->toArray();
+        foreach ($categorys as $item) {
+            if (empty($item['category_super_path'])) {
+                $item['category_super_path'] = '#' . $item['category_id'] . '#';
+            } else {
+                $item['category_super_path'] = $item['category_super_path'] . '#' . $item['category_id'] . '#';
+            }
+
+            $categoryIds = SysCategory::where('category_super_path', 'like', '%' . $item['category_super_path'] . '%')->pluck('category_id');
+            $categoryIds = $categoryIds ? $categoryIds->toArray() : [];
+            $categorySuperIds = array_merge($categorySuperIds, $categoryIds);
+        }
+
+        $categoryIds = array_unique($categorySuperIds);
+
+        $goods = Goods::with('sku')
+//            ->where('goods_classify', $category)
+            ->when(!empty($categoryIds), function ($query) use ($categoryIds) {
+                $query->whereIn('join_goods_category_id', $categoryIds);
+            })->when(empty($categoryIds), function ($query) {
+                $query->where('goods_classify', '<>', 'RECHARGE');
+            })->where('goods_status', 'ON')
+            ->select('goods_id', 'goods_name', 'join_goods_category_id')
+            ->get()
+            ->toArray();
+
+        foreach ($goods as &$good) {
+            if (!empty($good['sku'])) {
+                foreach ($good['sku'] as $key => $sku) {
+                    if (!empty($sku['goods_sku_specs_json'])) {
+                        $specsJson = json_decode($sku['goods_sku_specs_json'], true);
+                        $skuTitle = '';
+                        foreach ($specsJson as $item) {
+                            if (is_array($item)) {
+                                $item = implode(',', $item);
+                            }
+                            $skuTitle .= $item . '-';
+                        }
+                        $good['sku'][$key]['goods_sku_id'] = strval($good['sku'][$key]['goods_sku_id']);
+                        $good['sku'][$key]['goods_sku_title'] = rtrim($skuTitle, '-');
+                    }
+                    unset($good['sku'][$key]['goods_sku_specs_json'], $good['sku'][$key]['join_sku_goods_id']);
+                }
+            } else {
+                $good['sku'] = [];
+            }
+
+        }
+
+        return json_success('', $goods);
+    }
+
+    public static function selectPremisesByGoodsId($goodsId)
+    {
+        $goods = Goods::where('goods_id', $goodsId)
+            ->select('goods_id', 'goods_attribute_json')
+            ->first();
+        $premisses = [];
+        if (!empty($goods->goods_attribute_json)) {
+            $attributeJson = json_decode($goods->goods_attribute_json, true);
+            if (isset($attributeJson['premisses'])) {
+                $premisses = SysDept::whereIn('dept_id', $attributeJson['premisses'])
+                    ->select('dept_id', 'dept_name')
+                    ->get()
+                    ->toArray();
+            }
+        }
+
+        return json_success('', $premisses);
+    }
+
+    public static function select(Request $request, $classify = "GOODS")
+    {
+        $page = $request->get('page', 1);
+        $pageSize = $request->get('pageSize', 20);
+        $goodsName = $request->get('goods_name', '');
+        $categoryId = $request->get('join_goods_category_id', null);
+        $goodsCategory = $request->get('goods_category', null);
+        $goodsSupplierId = $request->get('join_goods_supplier_id', null);
+        $goodsStatus = $request->get('goods_status', null);
+        $type = $request->get('type', '');
+        if ($categoryId != null) {
+            $categoryPath = SysCategory::where('category_id', $categoryId)->value('category_super_path');
+            $categoryPath .= '#' . $categoryId . '#';
+            $categoryIds = SysCategory::where('category_super_path', 'like', $categoryPath . '%')->pluck('category_id')->toArray();
+            $categoryIds[] = intval($categoryId);
+            if (!empty($categoryIds)) {
+                $categoryId = $categoryIds;
+            } else {
+                $categoryId = [intval($categoryId)];
+            }
+        }
+
+        $rows = Goods::with([
+            'category' => function ($query) {
+                $query->select('category_id', 'category_name');
+            },
+            'running' => function ($query) {
+                $query->select('join_running_goods_id', 'goods_running_storage');
+            },
+            'supplier' => function ($query) {
+                $query->select('supplier_id', 'supplier_name');
+            },
+            'user' => function ($query) {
+                $query->select('user_id', 'user_name');
+            }
+        ])->leftJoin('goods_running', 'goods_running.join_running_goods_id', '=', 'goods.goods_id')
+            ->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_attribute_json', 'goods_addtimes', 'goods_updatetimes')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where(function ($q) use ($goodsName) {
+                    $q->where('goods_name', 'like', '%' . $goodsName . '%');
+//                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                });
+            })->when($categoryId != null, function ($query) use ($categoryId) {
+                $query->whereIn('join_goods_category_id', $categoryId);
+            })->when($goodsCategory != null, function ($query) use ($goodsCategory) {
+                $query->where('goods_category', $goodsCategory);
+            })
+            ->when($classify != '', function ($query) use ($classify, $categoryId) {
+                if ($classify == 'GOODS' && empty($categoryId)) {
+                    $query->whereIn('join_goods_category_id', ['6', '7', '8', '9', '10', '11', '12', '30']);
+                } else if ($classify != 'GOODS' && empty($categoryId)) {
+                    $query->where('goods_classify', $classify);
+                }
+            })->when(!empty($type), function ($query) use ($type) {
+                if ($type == 'storageWarning') {
+                    $query->where('goods_running.goods_running_storage', '<=', 2);
+                }
+            })->when(!empty($goodsSupplierId), function ($query) use ($goodsSupplierId) {
+                $query->where('join_goods_supplier_id', $goodsSupplierId);
+            })->when(!empty($goodsStatus), function ($query) use ($goodsStatus) {
+                $query->where('goods_status', $goodsStatus);
+            })
+            ->orderBy('goods_sort', 'DESC')
+            ->orderBy('goods_addtimes', 'DESC')
+            ->forPage($page, $pageSize)
+            ->get()
+            ->toArray();
+
+        $total = Goods::leftJoin('goods_running', 'goods_running.join_running_goods_id', '=', 'goods.goods_id')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where(function ($q) use ($goodsName) {
+                    $q->where('goods_name', 'like', '%' . $goodsName . '%');
+//                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                });
+            })->when($categoryId != null, function ($query) use ($categoryId) {
+                $query->whereIn('join_goods_category_id', $categoryId);
+            })->when($goodsCategory != null, function ($query) use ($goodsCategory) {
+                $query->where('goods_category', $goodsCategory);
+            })->when($classify != '', function ($query) use ($classify, $categoryId) {
+                if ($classify == 'GOODS' && empty($categoryId)) {
+                    $query->whereIn('join_goods_category_id', ['6', '7', '8', '9', '10', '11', '12', '30']);
+                } else if ($classify != 'GOODS' && empty($categoryId)) {
+                    $query->where('goods_classify', $classify);
+                }
+            })->when(!empty($type), function ($query) use ($type) {
+                if ($type == 'storageWarning') {
+                    $query->where('goods_running.goods_running_storage', '<=', 2);
+                }
+            })->when(!empty($goodsSupplierId), function ($query) use ($goodsSupplierId) {
+                $query->where('join_goods_supplier_id', $goodsSupplierId);
+            })->when(!empty($goodsStatus), function ($query) use ($goodsStatus) {
+                $query->where('goods_status', $goodsStatus);
+            })
+            ->count();
+
+        foreach ($rows as &$row) {
+            $row['goods_cover'] = getenv('STORAGE_DOMAIN') . $row['goods_cover'];
+            if (isset($row['running'])) {
+                $row['running']['goods_running_storage'] = intval($row['running']['goods_running_storage']);
+            }
+            if (!empty($row['goods_attribute_json'])) {
+                $row['goods_attribute_json'] = json_decode($row['goods_attribute_json']);
+            }
+            if (!empty($row['goods_category']) && $row['goods_category'] == 'INDEX') {
+                $row['goods_recommend_index'] = 'INDEX';
+            }
+        }
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+    }
+
+    public static function selectSpecial(Request $request)
+    {
+        $page = $request->get('page');
+        $pageSize = $request->get('pageSize');
+        $goodsName = $request->get('goods_name', '');
+        $categoryId = $request->get('join_goods_category_id', null);
+        if ($categoryId == null) {
+            $categoryId = [65, 43];
+        } elseif (is_string($categoryId)) {
+            $categoryId = [$categoryId];
+        }
+
+        $rows = Goods::with([
+            'category' => function ($query) {
+                $query->select('category_id', 'category_name');
+            },
+            'running' => function ($query) {
+                $query->select('join_running_goods_id', 'goods_running_storage');
+            },
+            'supplier' => function ($query) {
+                $query->select('supplier_id', 'supplier_name');
+            },
+            'user' => function ($query) {
+                $query->select('user_id', 'user_name');
+            }
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where(function ($q) use ($goodsName) {
+                    $q->where('goods_name', 'like', '%' . $goodsName . '%');
+//                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                });
+            })->whereIn('join_goods_category_id', $categoryId)
+            ->orderBy('goods_sort', 'DESC')
+            ->orderBy('goods_addtimes', 'DESC')
+            ->forPage($page, $pageSize)
+            ->get()
+            ->toArray();
+        $total = Goods::when($goodsName != '', function ($query) use ($goodsName) {
+            $query->where(function ($q) use ($goodsName) {
+                $q->where('goods_name', 'like', '%' . $goodsName . '%');
+//                    ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+            });
+        })->whereIn('join_goods_category_id', $categoryId)->count();
+
+        foreach ($rows as &$row) {
+            $row['goods_cover'] = getenv('STORAGE_DOMAIN') . $row['goods_cover'];
+            if (isset($row['running'])) {
+                $row['running']['goods_running_storage'] = intval($row['running']['goods_running_storage']);
+            }
+        }
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+    }
+
+    public static function selectPicking(Request $request)
+    {
+        $page = $request->get('page');
+        $pageSize = $request->get('pageSize');
+        $goodsName = $request->get('goods_name', '');
+
+        $categorySuperId = $request->get('category_super_id', '');
+        $categoryIds = $request->get('join_goods_category_id', []);
+        if (!empty($categorySuperId) && is_array($categoryIds)) {
+            $category = SysCategory::where('category_id', $categorySuperId)->first();
+            if (empty($category->category_super_path)) {
+                $category->category_super_path = '#' . $categorySuperId . '#';
+            } else {
+                $category->category_super_path = $category->category_super_path . '#' . $categorySuperId . '#';
+            }
+            $categoryIds = SysCategory::where('category_super_path', 'like', '%' . $category->category_super_path)->pluck('category_id');
+            $categoryIds = $categoryIds ? $categoryIds->toArray() : [];
+            $categoryIds = array_merge($categoryIds, [$categorySuperId]);
+        } elseif (!is_array($categoryIds)) {
+            $categoryIds = [$categoryIds];
+        }
+
+        $rows = Goods::with([
+            'category' => function ($query) {
+                $query->select('category_id', 'category_name');
+            },
+            'running' => function ($query) {
+                $query->select('join_running_goods_id', 'goods_running_storage');
+            },
+            'supplier' => function ($query) {
+                $query->select('supplier_id', 'supplier_name');
+            },
+            'user' => function ($query) {
+                $query->select('user_id', 'user_name');
+            }
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where(function ($q) use ($goodsName) {
+                    $q->where('goods_name', 'like', '%' . $goodsName . '%')
+                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                });
+            })->whereIn('join_goods_category_id', $categoryIds)
+            ->orderBy('goods_sort', 'DESC')
+            ->orderBy('goods_addtimes', 'DESC')
+            ->forPage($page, $pageSize)
+            ->get()
+            ->toArray();
+        $total = Goods::when($goodsName != '', function ($query) use ($goodsName) {
+            $query->where(function ($q) use ($goodsName) {
+                $q->where('goods_name', 'like', '%' . $goodsName . '%')
+                    ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+            });
+        })->whereIn('join_goods_category_id', $categoryIds)
+            ->count();
+
+        foreach ($rows as &$row) {
+            $row['goods_cover'] = getenv('STORAGE_DOMAIN') . $row['goods_cover'];
+            if (isset($row['running'])) {
+                $row['running']['goods_running_storage'] = intval($row['running']['goods_running_storage']);
+            }
+        }
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+    }
+
+    public static function selectPackage(Request $request)
+    {
+        $page = $request->get('page');
+        $pageSize = $request->get('pageSize');
+        $goodsName = $request->get('goods_name', '');
+        $categoryId = $request->get('join_goods_category_id', null);
+
+        $rows = Goods::with([
+            'category' => function ($query) {
+                $query->select('category_id', 'category_name');
+            },
+            'running' => function ($query) {
+                $query->select('join_running_goods_id', 'goods_running_storage');
+            },
+            'supplier' => function ($query) {
+                $query->select('supplier_id', 'supplier_name');
+            },
+            'user' => function ($query) {
+                $query->select('user_id', 'user_name');
+            }
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where(function ($q) use ($goodsName) {
+                    $q->where('goods_name', 'like', '%' . $goodsName . '%')
+                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                });
+            })->when($categoryId != null, function ($query) use ($categoryId) {
+                $query->where('join_goods_category_id', $categoryId);
+            })
+            ->where('goods_classify', 'PACKAGE')
+            ->orderBy('goods_sort', 'DESC')
+            ->orderBy('goods_addtimes', 'DESC')
+            ->forPage($page, $pageSize)
+            ->get()
+            ->toArray();
+        $total = Goods::when($goodsName != '', function ($query) use ($goodsName) {
+            $query->where(function ($q) use ($goodsName) {
+                $q->where('goods_name', 'like', '%' . $goodsName . '%')
+                    ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+            });
+        })->when($categoryId != null, function ($query) use ($categoryId) {
+            $query->where('join_goods_category_id', $categoryId);
+        })->where('goods_classify', 'PACKAGE')->count();
+
+        foreach ($rows as &$row) {
+            $row['goods_cover'] = getenv('STORAGE_DOMAIN') . $row['goods_cover'];
+            if (isset($row['running'])) {
+                $row['running']['goods_running_storage'] = intval($row['running']['goods_running_storage']);
+            }
+//            if (!empty($row['component'])) {
+//                $ids = [];
+//                $contentList = [];
+//                foreach ($row['component'] as $component) {
+//                    $ids[] = $component['join_component_goods_id'];
+//                    $configJson = json_decode($component['goods_component_config_json'], true);
+//                    $contentList[] = [
+//                        'goods_name' => $configJson['goods_name'] ?? '',
+//                        'goods_sales_price' => $component['goods_component_price'],
+//                        'nbr' => $configJson['nbr'] ?? 0
+//                    ];
+//                }
+//
+//                $row['join_component_goods_id'] = $ids;
+//                $row['goodsContentList'] = $contentList;
+//            }
+        }
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+    }
+
+    /**
+     * @Desc 下拉选择服务商品
+     * @Author Gorden
+     * @Date 2024/4/24 13:32
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public static function selectList(Request $request, $goodsClassify = "SERVICE")
+    {
+        $keywords = $request->get('keywords', '');
+        $isSupportAppointment = $request->get('is_support_appointment', '');
+//        if (!$keywords){
+//            return json_success('暂无数据');
+//        }
+
+//        $categoryIds = SysCategory::whereIn('category_super_id', [5, 31, 32, 42, 66, 70, 72])->pluck('category_id');
+
+        $goods = Goods::with('sku')
+//            ->whereIn('join_goods_category_id', $categoryIds)
+            ->when($keywords != '', function ($query) use ($keywords) {
+                $query->where('goods_name', 'like', "%" . $keywords . "%");
+            })
+            ->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);
+                }
+
+            })
+            ->when($isSupportAppointment != '', function ($query) use ($isSupportAppointment) {
+                $query->where('is_support_appointment', $isSupportAppointment);
+            })
+            ->select('goods_id', 'goods_name', 'goods_sales_price', 'join_goods_category_id', 'goods_attribute_json')
+            ->get()
+            ->toArray();
+
+        foreach ($goods as &$good) {
+            if (!empty($good['sku'])) {
+                foreach ($good['sku'] as $key => $sku) {
+                    if (!empty($sku['goods_sku_specs_json'])) {
+                        $good['sku'][$key]['goods_sku_specs_json'] = json_decode($sku['goods_sku_specs_json']);
+
+                        $skuName = '';
+                        foreach ($good['sku'][$key]['goods_sku_specs_json'] as $specsKey => $skuSpecs) {
+                            if (is_array($skuSpecs)) {
+                                $skuName = $skuName . ' ' . $specsKey . ':' . implode(' ', $skuSpecs) . ';';
+                            } else {
+                                $skuName = $skuName . ' ' . $specsKey . ':' . $skuSpecs . ';';
+                            }
+                        }
+                        $good['sku'][$key]['sku_name'] = $skuName;
+                    }
+                }
+            } else {
+                $good['sku'] = [];
+            }
+            $good['premisses'] = [];
+            if (!empty($good['goods_attribute_json'])) {
+                $attributeJson = json_decode($good['goods_attribute_json'], true);
+                if (isset($attributeJson['premisses'])) {
+                    $premisses = SysDept::when(!empty($attributeJson['premisses']), function ($query) use ($attributeJson) {
+                        $query->whereIn('dept_id', $attributeJson['premisses']);
+                    })->where('dept_category', '营业场所')
+                        ->select('dept_id', 'dept_name')
+                        ->get();
+                    $good['premisses'] = $premisses;
+                }
+            }
+        }
+
+        return json_success('', $goods);
+
+    }
+
+    public static function selectCascaderList(Request $request)
+    {
+        $categoryIds = $request->get('category_id', '');
+        $categorySuperId = $request->get('category_super_id', '');
+        $joinGoodsCategoryId = $request->get('join_goods_category_id', '');
+        $type = $request->get('type', '');
+        if (!$categoryIds && !$categorySuperId && !$joinGoodsCategoryId) {
+            return json_fail('参数异常');
+        }
+        $data = [];
+        $categorys = [];
+        if (!empty($categoryIds)) {
+            $categorys = SysCategory::whereIn('category_id', $categoryIds)
+                ->where('category_status', 'ACTIVED')
+                ->select('category_id as id', 'category_name as name', 'category_super_id as pid', 'category_super_path')
+                ->orderBy('category_sort', 'DESC')
+                ->get()
+                ->toArray();
+            $data = array_merge($data, $categorys);
+        } else if (!empty($categorySuperId)) {
+            $categorys = SysCategory::where('category_super_id', $categorySuperId)
+                ->where('category_status', 'ACTIVED')
+                ->select('category_id as id', 'category_name as name', 'category_super_id as pid', 'category_super_path')
+                ->orderBy('category_sort', 'DESC')
+                ->get()
+                ->toArray();
+            $data = array_merge($data, $categorys);
+        }
+
+        foreach ($categorys as $category) {
+            // if(empty($category['category_super_path'])){
+            $category['category_super_path'] = '#' . $category['id'] . '#';
+            // }
+            $subCategory = SysCategory::where('category_super_path', 'like', '%' . $category['category_super_path'] . '%')
+                ->where('category_status', 'ACTIVED')
+                ->select('category_id as id', 'category_name as name', 'category_super_id as pid', 'category_super_path')
+                ->orderBy('category_sort', 'DESC')
+                ->get()
+                ->toArray();
+            $data = array_merge($data, $subCategory);
+        }
+        if (empty($data) && !empty($joinGoodsCategoryId)) {
+            $goodsCategoryIds = $joinGoodsCategoryId;
+        } else {
+            $goodsCategoryIds = array_column($data, 'id');
+        }
+        $goods = Goods::with([
+            'sku' => function($query){
+                $query->where('goods_sku_status','ON');
+            }
+        ])
+            ->leftJoin('goods_running', 'goods_running.join_running_goods_id', '=', 'goods.goods_id')
+            ->where('goods_running.goods_running_storage', '>', 0)
+            ->whereIn('join_goods_category_id', $goodsCategoryIds)
+            ->where('goods_status', 'ON');
+
+        if ($type == 'dishes') {
+            $uid = JwtToken::getCurrentId();
+            $user = SysUser::where('user_id', $uid)->first();
+            $restaurant = SysDept::where('dept_category', '餐厅')->where(function ($query) use ($user) {
+                $query->where('dept_id', $user->join_user_dept_id)->orWhere('dept_super_id', $user->join_user_dept_id);
+            })->first();
+            $supplier = Supplier::where('join_supplier_dept_id', $restaurant->dept_id)->first();
+            if ($supplier) {
+                $goods = $goods->where('join_goods_supplier_id', $supplier->supplier_id);
+            }
+        }
+
+
+        $goods = $goods->select('goods_id', 'goods_id as id', 'goods_name as name', 'join_goods_category_id as pid', 'goods_attribute_json', 'goods_classify', 'goods_sales_price', 'goods_cover', 'goods_running.goods_running_storage')
+            ->orderBy('goods_sort', 'DESC')
+            ->orderBy('goods_addtimes', 'DESC')
+            ->get()
+            ->toArray();
+        foreach ($goods as &$good) {
+            $good['goods_cover'] = getenv('STORAGE_DOMAIN') . $good['goods_cover'];
+            $good['goods_running_storage'] = intval($good['goods_running_storage']);
+            $good['nbr'] = 0;
+            if (!empty($good['sku'])) {
+                foreach ($good['sku'] as $key => $sku) {
+                    if (!empty($sku['goods_sku_specs_json'])) {
+                        $good['sku'][$key]['goods_sku_specs_json'] = json_decode($sku['goods_sku_specs_json']);
+
+                        $skuName = '';
+                        foreach ($good['sku'][$key]['goods_sku_specs_json'] as $specsKey => $skuSpecs) {
+                            $keyStr = ($specsKey == '规格') ? '' : ($specsKey . ':');
+                            if (is_array($skuSpecs)) {
+                                $skuName = $skuName . $keyStr . ' ' . implode(' ', $skuSpecs) . '; ';
+                            } else {
+                                $skuName = $skuName . $keyStr . ' ' . $skuSpecs . '; ';
+                            }
+                        }
+                        $good['sku'][$key]['sku_name'] = rtrim($skuName, '; ');
+                    }
+                }
+            } else {
+                $good['sku'] = [];
+            }
+            $good['premisses'] = [];
+            if (!empty($good['goods_attribute_json'])) {
+                $attributeJson = json_decode($good['goods_attribute_json'], true);
+                if (isset($attributeJson['premisses'])) {
+                    $premisses = SysDept::when(!empty($attributeJson['premisses']), function ($query) use ($attributeJson) {
+                        $query->whereIn('dept_id', $attributeJson['premisses']);
+                    })->where('dept_category', '营业场所')
+                        ->select('dept_id', 'dept_name')
+                        ->get();
+                    $good['premisses'] = $premisses;
+                }
+            }
+        }
+
+        $data = array_merge($data, $goods);
+        $tree = new Tree($data);
+        $cascaderData = $tree->getTree();
+
+        foreach ($cascaderData as $key1 => $cascader1) {
+            if (isset($cascader1['children'])) {
+                foreach ($cascader1['children'] as $key2 => $cascader2) {
+                    if (isset($cascader2['children'])) {
+                        foreach ($cascader2['children'] as $key3 => $cascader3) {
+                            if (isset($cascader3['children'])) {
+                                foreach ($cascader3['children'] as $key4 => $cascader4) {
+                                    if (!isset($cascader4['goods_id'])) {
+                                        unset($cascaderData[$key1]['children'][$key2]['children'][$key3]['children'][$key4]);
+                                    }
+                                    if (isset($cascader4['goods_id']) && empty($cascader4['sku'])){
+                                        unset($cascaderData[$key1]['children'][$key2]['children'][$key3]['children'][$key4]);
+                                    }
+                                }
+                            } else if (!isset($cascader3['goods_id'])) {
+                                unset($cascaderData[$key1]['children'][$key2]['children'][$key3]);
+                            }
+                            if (isset($cascader3['goods_id']) && empty($cascader3['sku'])){
+                                unset($cascaderData[$key1]['children'][$key2]['children'][$key3]);
+                                continue;
+                            }
+                            if (isset($cascader3['children']) && count($cascaderData[$key1]['children'][$key2]['children']) == 0) {
+                                unset($cascaderData[$key1]['children'][$key2]);
+                            }
+                            if (isset($cascader3['children']) && count($cascaderData[$key1]['children'][$key2]['children'][$key3]['children']) > 0) {
+                                $cascaderData[$key1]['children'][$key2]['children'][$key3]['children'] = array_values($cascaderData[$key1]['children'][$key2]['children'][$key3]['children']);
+                            }
+                        }
+                    } else if (!isset($cascader2['goods_id'])) {
+                        unset($cascaderData[$key1]['children'][$key2]);
+                    }
+                    if (isset($cascader2['goods_id']) && empty($cascader2['sku'])){
+                        unset($cascaderData[$key1]['children'][$key2]);
+                        continue;
+                    }
+                    if (isset($cascader2['children']) && count($cascaderData[$key1]['children'][$key2]['children']) == 0) {
+                        unset($cascaderData[$key1]['children'][$key2]);
+                    }
+                    if (isset($cascader2['children']) && isset($cascaderData[$key1]['children'][$key2]) && count($cascaderData[$key1]['children'][$key2]['children']) > 0) {
+                        $cascaderData[$key1]['children'][$key2]['children'] = array_values($cascaderData[$key1]['children'][$key2]['children']);
+                    }
+                }
+            } else if (!isset($cascader1['goods_id'])) {
+                unset($cascaderData[$key1]);
+            }
+            if (isset($cascader1['goods_id']) && empty($cascader1['sku'])){
+                unset($cascaderData[$key1]);
+                continue;
+            }
+            if (isset($cascader1['children']) && count($cascaderData[$key1]['children']) == 0) {
+
+                unset($cascaderData[$key1]);
+            }
+            if (isset($cascader1['children']) && isset($cascaderData[$key1]) && count($cascaderData[$key1]['children']) > 0) {
+                $cascaderData[$key1]['children'] = array_values($cascaderData[$key1]['children']);
+            }
+        }
+        $cascaderData = array_values($cascaderData);
+
+        return json_success('success', $cascaderData);
+    }
+
+    /**
+     * @Desc 商品详情
+     * @Author Gorden
+     * @Date 2024/3/28 10:25
+     *
+     * @param $goodsId
+     * @return Response
+     */
+    public static function info($goodsId)
+    {
+        try {
+            // 商品主表
+            $main = Goods::with('category')->where('goods_id', $goodsId)->first();
+            if (!empty($main)) {
+                $main = $main->toArray();
+                $main['goods_sku_json'] = json_decode($main['goods_sku_json'], true);
+                $main['specList'] = [];
+                foreach ($main['goods_sku_json'] as $key => $sku) {
+                    $main['specList'][] = [
+                        'label' => $key,
+                        'tags' => $sku
+                    ];
+                }
+
+            } else {
+                $main = [];
+            }
+            // 详情表
+            $detail = GoodsDetail::where('join_detail_goods_id', $goodsId)->first();
+            if (!empty($detail)) {
+                $detail = $detail->toArray();
+            } else {
+                $detail = [];
+            }
+            // 标签表
+            $label = GoodsLabel::where('join_label_goods_id', $goodsId)->first();
+            if (!empty($label)) {
+                $label = $label->toArray();
+            } else {
+                $label = [];
+            }
+            // Running表
+            $running = GoodsRunning::where('join_running_goods_id', $goodsId)->first();
+            if (!empty($running)) {
+                $running = $running->toArray();
+                if (!empty($running['goods_running_off_json']) && is_json($running['goods_running_off_json'])) {
+                    $goodsRunningOffJson = json_decode($running['goods_running_off_json'], true);
+                    $running['goods_off_addtimes'] = isset($goodsRunningOffJson['time']) ? date("Y-m-d H:i", $goodsRunningOffJson['time']) : '';
+                }
+                $running['goods_running_storage'] = !empty($running['goods_running_storage']) ? intval($running['goods_running_storage']) : '';
+                $running['goods_running_sale'] = !empty($running['goods_running_sale']) ? intval($running['goods_running_sale']) : '';
+            } else {
+                $running = [];
+            }
+            // Sku表
+            $skus = GoodsSku::where('join_sku_goods_id', $goodsId)->where('goods_sku_status','ON')->get();
+            if (!empty($skus)) {
+                $skus = $skus->toArray();
+                $submitList = [];
+                foreach ($skus as $key => $sku) {
+                    $skuSpecsJson = json_decode($sku['goods_sku_specs_json'], true);
+                    $skuSpecs = '';
+                    $skuNameValue = [];
+                    $i = 1;
+                    foreach ($skuSpecsJson as $k => $item) {
+                        if (is_array($item)) {
+                            $item = implode(',', $item);
+                        }
+                        $skuSpecs = $skuSpecs . $item . ',';
+                        $skuNameKey = 'skuName' . $i;
+                        $skuValueKey = 'skuValue' . $i;
+                        $skuNameValue[$skuNameKey] = $k;
+                        $skuNameValue[$skuValueKey] = $item;
+                        $skuNameValue[$k] = $item;
+                        $i++;
+                    }
+                    $storage = json_decode($sku['goods_sku_storage_json'], true);
+                    $priceStorage = [
+                        'sku_id' => $sku['goods_sku_id'],
+                        'sku' => rtrim($skuSpecs, ',') ?? '',
+                        'stock' => $storage['storage'] ?? '',
+                        'price' => $sku['goods_sku_sales_price'] ?? '',
+                    ];
+
+                    $submitList[] = array_merge($skuNameValue, $priceStorage);
+                }
+                $skus['submitList'] = $submitList;
+            } else {
+                $skus = [];
+            }
+
+            // 合并数据
+            $data = array_merge($main, $detail, $label, $running, ['sku' => $skus]);
+            $data['goods_sku_json_label'] = [];
+
+            $data['goods_label'] = !empty($data['goods_label']) ? explode(',', $data['goods_label']) : [];
+            $data['goods_json'] = $data['goods_json'] ? json_decode($data['goods_json'], true) : [];
+            $data['goods_cover'] = getenv('STORAGE_DOMAIN') . $data['goods_cover'];
+            if (!empty($data['goods_category']) && $data['goods_category'] == 'INDEX') {
+                $data['goods_recommend_index'] = 'INDEX';
+            }
+
+            // 创建者
+            $data['creator_username'] = '';
+            if (!empty($data['creator_user_id'])) {
+                $data['creator_username'] = SysUser::where('user_id', $data['creator_user_id'])->value('user_name');
+            }
+
+            if (!empty($data['goods_detail_slider_json'])) {
+                $data['goods_detail_slider_json'] = json_decode($data['goods_detail_slider_json'], true);
+                // ……
+                if (isset($data['goods_detail_slider_json']['slider'])) {
+                    $data['goods_detail_slider_json'] = explode(',', $data['goods_detail_slider_json']['slider']);
+                }
+
+                $slider = '';
+                foreach ($data['goods_detail_slider_json'] as $item) {
+                    $slider .= getenv('STORAGE_DOMAIN') . $item . ',';
+                }
+                $data['goods_detail_slider_json'] = rtrim($slider, ',');
+            }
+            $extendJson = [];
+            if (!empty($data['goods_attribute_json'])) {
+                $extendJson = json_decode($data['goods_attribute_json'], true);
+                $data['goods_attribute_json'] = $extendJson;
+            }
+            if (!empty($extendJson['coupon'])) {
+                $data['coupon_list'] = $extendJson['coupon'];
+            }
+
+            $data['express_json'] = [];
+            if (!empty($data['goods_express_json'])) {
+                $goodsExpressJson = json_decode($data['goods_express_json'], true);
+                if (isset($goodsExpressJson['express']) && $goodsExpressJson['express'] == 'Y') {
+                    $data['express_json'][] = 'express';
+                }
+                if (isset($goodsExpressJson['self']) && $goodsExpressJson['self'] == 'Y') {
+                    $data['express_json'][] = 'self';
+                }
+                if (isset($goodsExpressJson['arrival']) && $goodsExpressJson['arrival'] == 'Y') {
+                    $data['express_json'][] = 'arrival';
+                }
+            }
+            // 详情表数据
+            if (!empty($data['goods_detail_specs_json'])) {
+                $specsJson = json_decode($data['goods_detail_specs_json'], true);
+                foreach ($specsJson as $itemSpecsJson) {
+                    if (isset($itemSpecsJson['key']) && $itemSpecsJson['key'] == '课时') {
+                        $data['curriculum']['period'] = $itemSpecsJson['val'];
+                    } elseif (isset($itemSpecsJson['key']) && $itemSpecsJson['key'] == '群体') {
+                        $data['curriculum']['group'] = $itemSpecsJson['val'];
+                    } elseif (isset($itemSpecsJson['key']) && $itemSpecsJson['key'] == '课程') {
+                        $data['curriculum']['course'] = $itemSpecsJson['val'];
+                    }
+                }
+            }
+
+            return json_success('', $data);
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            return json_fail("查询错误~");
+        }
+    }
+
+    /**
+     * @Desc 添加商品
+     * @Author Gorden
+     * @Date 2024/3/11 10:20
+     *
+     * @param $params
+     * @return Response
+     */
+    public static function insert($params): Response
+    {
+        Db::beginTransaction();
+        try {
+            $params['goods_id'] = "GD" . date('ymdHi') . random_string(4, 'up');
+            // 主表
+            self::mainInsert($params);
+            // 商品详情表
+            self::detailInsert($params);
+            // 商品标签表
+            self::labelInsert($params);
+            // 产品运行控制信息表
+            self::goodsRunningInsert($params);
+            // sku表
+            self::goodsSkuSet($params, 'insert');
+            // 待上架状态,上架时间大于当前时间
+            if ($params['goods_status'] == 'PENDING' && strtotime($params['goods_on_addtimes']) > time()) {
+                $redis = Redis::connection();
+                $key = date('YmdHi', strtotime($params['goods_on_addtimes']));
+                $redis->sAdd(Goods::LISTING_KEY_PREFIX . $key, $params['goods_id']);
+            }
+            // 自动下架
+            if (!empty($params['goods_running_off_type']) && $params['goods_running_off_type'] == 'T' && !empty($params['goods_off_addtimes'])) {
+                $redis = Redis::connection();
+                $key = Goods::LISTING_OFF_KEY_PREFIX . date('YmdHi', strtotime($params['goods_off_addtimes']));
+                $redis->sAdd($key, $params['goods_id']);
+            }
+            Db::commit();
+        } catch (\PDOException $e) {
+            Db::rollBack();
+            dump($e->getFile() . '(' . $e->getLine() . '):' . $e->getMessage());
+            return json_fail('数据写入失败~');
+        } catch (BusinessException $e) {
+            Db::rollBack();
+            dump($e->getFile() . '(' . $e->getLine() . '):' . $e->getMessage());
+            return json_fail($e->getMessage());
+        } catch (\Exception $e) {
+            Db::rollBack();
+            dump($e->getTrace());
+            return json_fail('数据写入失败~');
+        }
+
+        _syslog("添加商品", "商品名【" . $params['goods_name'] . "】");
+
+        return json_success('success');
+    }
+
+    public static function insertRecharge($params)
+    {
+        try {
+            Db::beginTransaction();
+            $goods = new Goods();
+            $goods->goods_id = "GD" . date('ymdHi') . random_string(4, 'up');
+            $goods->join_goods_category_id = 59;
+            $goods->goods_classify = 'RECHARGE';
+            $goods->goods_status = $params['goods_status'];
+            $goods->goods_sort = $params['goods_sort'];
+            $goods->goods_category = $params['goods_category'];
+            $goods->goods_name = $params['goods_name'];
+            $goods->goods_market_price = $params['goods_sales_price'];
+            $goods->goods_sales_price = $params['goods_sales_price'];
+            $goods->goods_sku_json = json_encode(['规格' => [$params['goods_sales_price'] . '元']]);
+            $goods->goods_attribute_json = json_encode(['added' => ['nbr' => $params['goods_rate'] / 100, 'mode' => 'rate'], 'min-count' => 1]);
+            $goods->goods_cover = '/images/app/common/null-service.png';
+            $goods->goods_process_json = json_encode(['mode' => 'do_shopping']);
+            $goods->goods_addtimes = time();
+            $goods->save();
+
+            $sku = new GoodsSku();
+            $sku->join_sku_goods_id = $goods->goods_id;
+            $sku->goods_sku_status = $params['goods_status'];
+            $sku->goods_sku_specs_json = json_encode(['规格' => $params['goods_sales_price'] . '元']);
+            $sku->goods_sku_market_price = $params['goods_sales_price'];
+            $sku->goods_sku_sales_price = $params['goods_sales_price'];
+            $sku->goods_sku_storage_json = json_encode(['storage' => 9999]);
+            $sku->save();
+
+            Db::commit();
+
+            return json_success('success');
+        } catch (\Exception $e) {
+
+            Db::rollBack();
+
+            return json_fail('添加充值产品失败');
+        }
+    }
+
+    public static function updateRecharge($params)
+    {
+        try {
+            Db::beginTransaction();
+            $goods = Goods::where('goods_id', $params['goods_id'])->first();
+            if (!$goods) {
+                return json_fail("数据异常");
+            }
+            $goods->goods_market_price = $params['goods_sales_price'];
+            $goods->goods_sales_price = $params['goods_sales_price'];
+            $goods->goods_status = $params['goods_status'];
+            $goods->goods_sku_json = json_encode(['规格' => [$params['goods_sales_price'] . '元']]);
+            $goods->goods_sort = $params['goods_sort'];
+            if (!empty($goods->goods_attribute_json)) {
+                $attributeJson = json_decode($goods->goods_attribute_json, true);
+                $attributeJson['added']['nbr'] = $params['goods_rate'] / 100;
+                $goods->goods_attribute_json = json_encode($attributeJson);
+            }
+            $goods->save();
+            $sku = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->where('goods_sku_status','ON')->first();
+            $sku->goods_sku_status = $params['goods_status'];
+            $sku->goods_sku_specs_json = json_encode(['规格' => $params['goods_sales_price'] . '元']);
+            $sku->goods_sku_market_price = $params['goods_sales_price'];
+            $sku->goods_sku_sales_price = $params['goods_sales_price'];
+            $sku->save();
+
+            Db::commit();
+
+            return json_success("success");
+        } catch (\Exception $e) {
+            Db::rollBack();
+            dump($e->getMessage());
+            return json_fail('编辑充值产品失败');
+        }
+    }
+
+    public static function insertPackage($params): Response
+    {
+        Db::beginTransaction();
+        try {
+            $params['goods_id'] = "GD" . date('ymdHi') . random_string(4, 'up');
+            // 主表
+            self::mainInsert($params);
+            // 商品详情表
+            self::detailInsert($params);
+            // 套包组件表
+            self::componentUpdate($params, 'insert');
+            // 商品标签表
+            self::labelInsert($params);
+            // 产品运行控制信息表
+            self::goodsRunningInsert($params);
+            // sku表
+//            self::goodsSkuSet($params, 'insert');
+            // 待上架状态,上架时间大于当前时间
+            if ($params['goods_status'] == 'PENDING' && strtotime($params['goods_on_addtimes']) > time()) {
+                $redis = Redis::connection();
+                $key = date('YmdHi', strtotime($params['goods_on_addtimes']));
+                $redis->sAdd(Goods::LISTING_KEY_PREFIX . $key, $params['goods_id']);
+            }
+            Db::commit();
+        } catch (\PDOException $e) {
+            Db::rollBack();
+            dump($e->getMessage());
+            return json_fail('数据写入失败~');
+        } catch (BusinessException $e) {
+            Db::rollBack();
+            dump($e->getMessage());
+            return json_fail($e->getMessage());
+        } catch (\Exception $e) {
+            Db::rollBack();
+            dump($e->getTrace());
+            return json_fail('数据写入失败~');
+        }
+
+        _syslog("添加套餐", "商品名【" . $params['goods_name'] . "】");
+
+        return json_success('success');
+    }
+
+    public static function update($params)
+    {
+        Db::beginTransaction();
+        try {
+            // 主表
+            self::mainUpdate($params);
+            // 商品详情表
+            self::detailUpdate($params);
+            // 商品标签表
+            self::labelUpdate($params);
+            // 产品运行控制信息表
+            self::goodsRunningUpdate($params);
+            // sku表
+            self::goodsSkuSet($params, 'update');
+
+            Db::commit();
+        } catch (BusinessException $e) {
+            Db::rollBack();
+            return json_fail($e->getMessage());
+        } catch (\Exception $e) {
+            Db::rollBack();
+            return json_fail('数据更新失败~');
+        }
+
+        _syslog("编辑商品", "商品名【" . $params['goods_name'] . "】" ?? "商品ID:【" . $params['goods_id'] . "】");
+
+        return json_success('success');
+    }
+
+    public static function changeStatus($params)
+    {
+        try {
+            Goods::where('goods_id', $params['goods_id'])->update(['goods_status' => $params['goods_status']]);
+
+            return json_success('修改成功');
+        } catch (\Exception $e) {
+            return json_fail('修改状态失败');
+        }
+    }
+
+
+    public static function updatePackage($params)
+    {
+        Db::beginTransaction();
+        try {
+            // 主表
+            self::mainUpdate($params);
+            // 商品详情表
+            self::detailUpdate($params);
+            // 套包组件表
+            self::componentUpdate($params, 'update');
+            // 商品标签表
+            self::labelUpdate($params);
+            // 产品运行控制信息表
+            self::goodsRunningUpdate($params);
+            // sku表
+            self::goodsSkuSet($params, 'update');
+
+            Db::commit();
+        } catch (BusinessException $e) {
+            Db::rollBack();
+            return json_fail($e->getMessage());
+        } catch (\Exception $e) {
+            Db::rollBack();
+            dump($e->getTrace());
+            return json_fail('数据更新失败~');
+        }
+        _syslog("编辑套餐", "商品名【" . $params['goods_name'] . "】" ?? "商品ID:【" . $params['goods_id'] . "】");
+
+        return json_success('success');
+    }
+
+    /**
+     * @Desc 删除商品
+     * @Author Gorden
+     * @Date 2024/3/28 13:20
+     *
+     * @param $ids
+     * @return Response
+     */
+    public static function delete($ids)
+    {
+        if (!$ids) {
+            return json_fail("数据错误~");
+        }
+        if (!is_array($ids)) {
+            $ids = [$ids];
+        }
+
+        $goods = Goods::whereIn('goods_id', $ids)->get()->toArray();
+        if (!$goods) {
+            return json_fail("数据错误~");
+        }
+
+        // 是否在套包里
+        if (GoodsComponent::whereIn('join_component_goods_id', $ids)->exists()) {
+            return json_fail("当前商品存在于套包中,请先在套包中删除");
+        }
+        // 是否已被购买过
+        if (OrderSheet::whereIn('join_sheet_goods_id', $ids)->exists()) {
+            return json_fail("当前商品已有购买历史,如不在APP显示,请选择【下架】操作");
+        }
+        // 是否预约过
+        if (Appointment::whereIn('join_appointment_goods_id', $ids)->exists()) {
+
+            return json_fail("当前商品已有预约历史,如不在APP显示,请选择【下架】操作");
+        }
+
+        Db::beginTransaction();
+        try {
+            Goods::whereIn('goods_id', $ids)->delete();
+            GoodsDetail::whereIn('join_detail_goods_id', $ids)->delete();
+            GoodsLabel::whereIn('join_label_goods_id', $ids)->delete();
+            GoodsRunning::whereIn('join_running_goods_id', $ids)->delete();
+            GoodsSku::whereIn('join_sku_goods_id', $ids)->delete();
+
+            Db::commit();
+
+            _syslog("删除商品 / 套餐", "ID:【" . implode(',', $ids) . "】", $goods);
+
+            return json_success("商品删除成功");
+        } catch (\Exception $e) {
+            Db::rollBack();
+
+            return json_fail("商品删除失败~");
+        }
+    }
+
+    /**
+     * @Desc 商品主表
+     * @Author Gorden
+     * @Date 2024/3/11 11:20
+     *
+     * @param $params
+     * @return mixed|string
+     * @throws BusinessException
+     */
+    public static function mainInsert($params)
+    {
+        if (!empty($params['goods_cover'])) {
+            $params['goods_cover'] = str_replace(getenv('STORAGE_DOMAIN'), '', $params['goods_cover']);
+        }
+        // 如果产品是待处理状态
+        if ($params['goods_status'] == 'PENDING') {
+            if (strtotime($params['goods_on_addtimes']) <= time()) {
+                $params['goods_status'] = 'ON';
+            }
+        }
+        $category = SysCategory::where('category_id', $params['join_goods_category_id'])->first();
+        if (!$category) {
+            throw new BusinessException("产品分类不存在~");
+        }
+        if (empty($params['goods_category'])) {
+            $params['goods_category'] = $category->category_classify;
+        }
+
+        try {
+            $model = new Goods();
+            $model->goods_id = $params['goods_id'];
+            $model->join_goods_category_id = $params['join_goods_category_id'] ?? 0;
+            $model->join_goods_supplier_id = $params['join_goods_supplier_id'] ?? 0;
+            $model->goods_classify = $params['goods_classify'] ?? '';
+            $model->goods_status = $params['goods_status'] ?? '';
+            $model->goods_category = $params['goods_category'] ?? '';
+//            $model->goods_prefix = $params['goods_prefix'] ?? 】($category->category_name ? '【' . $category->category_name . '' : '');
+            $model->goods_prefix = $params['goods_prefix'] ?? '';
+            $model->goods_name = $params['goods_name'];
+            $model->goods_market_price = $params['goods_market_price'] ?? 0;
+            $model->goods_sales_price = $params['goods_sales_price'] ?? 0;
+            $model->goods_sku_json = !empty($params['goods_sku_json_label']) ? json_encode($params['goods_sku_json_label']) : json_encode(['规格' => ['标准']]);
+            $model->goods_attribute_json = !empty($params['goods_attribute_json']) ? $params['goods_attribute_json'] : '[]';
+            $model->goods_title = $params['goods_title'] ?? '';
+            $model->goods_cover = $params['goods_cover'] ?? '';
+            $model->goods_on_addtimes = isset($params['goods_on_addtimes']) ? strtotime($params['goods_on_addtimes']) : null;
+            $model->goods_sort = $params['goods_sort'] ?? null;
+            $model->goods_groupby = $params['goods_groupby'] ?? '';
+            $model->goods_remark = $params['goods_remark'] ?? '';
+            $model->goods_extend_json = $params['goods_extend_json'] ?? '{}';
+            $model->is_support_appointment = $params['is_support_appointment'] ?? 'N';
+            $model->creator_user_id = JwtToken::getCurrentId();
+            $model->goods_addtimes = time();
+            $model->goods_updatetimes = time();
+            // {"express":"Y","self":"Y","arrival":"Y"}
+            $expressJson = [];
+            if (!empty($params['express_json'])) {
+                if (in_array('express', $params['express_json'])) {
+                    $expressJson['express'] = 'Y';
+                } else {
+                    $expressJson['express'] = 'N';
+                }
+                if (in_array('self', $params['express_json'])) {
+                    $expressJson['self'] = 'Y';
+                } else {
+                    $expressJson['self'] = 'N';
+                }
+                if (in_array('arrival', $params['express_json'])) {
+                    $expressJson['arrival'] = 'Y';
+                } else {
+                    $expressJson['arrival'] = 'N';
+                }
+
+                $model->goods_express_json = json_encode($expressJson);
+            }
+
+            if (!empty($params['is_support_appointment']) && $params['is_support_appointment'] == 'Y' && !empty($params['appointment_times']) && $params['goods_category'] != 'TRAVEL') {
+                $times = [];
+                $attributeJsonTimeArr = [];
+                $personTotal = 0;
+                foreach ($params['appointment_times'] as $time) {
+                    $attributeJsonTimeArr[] = strtotime(date('Y-m-d ') . $time['appointmentTimeStart']);
+                    $attributeJsonTimeArr[] = strtotime(date('Y-m-d ') . $time['appointmentTimeEnd']);
+                    $personTotal += $time['person'];
+                    $times[$time['appointmentTimeStart']] = [
+                        'person' => $time['person'],
+                        'duration' => $time['appointmentTimeStart'] . '-' . $time['appointmentTimeEnd']
+                    ];
+                }
+                $attributeJsonTime = date('H:i', min($attributeJsonTimeArr)) . '至' . date('H:i', max($attributeJsonTimeArr));
+
+                $newDates = [];
+                foreach ($params['dates'] as $date) {
+                    $key = self::$week[$date];
+                    $newDates[$key] = $date;
+                }
+                ksort($newDates);
+
+
+                $currentDate = current($newDates);
+                $lastDate = end($newDates);
+
+                $attributeJsonDate = '';
+                if (self::$week[$lastDate] - self::$week[$currentDate] + 1 > count($newDates)) {
+                    $attributeJsonDate = implode(',', $newDates);
+                } else if (self::$week[$lastDate] - self::$week[$currentDate] + 1 == count($newDates)) {
+                    $attributeJsonDate = $currentDate . '至' . $lastDate;
+                }
+
+                // if (isset($params['work_time'])){
+                //     $workTimeStart = date('H:i',strtotime($params['work_time'][0]));
+                //     $workTimeEnd = date('H:i',strtotime($params['work_time'][1]));
+                //     $attributeJsonTime = $workTimeStart.'至'.$workTimeEnd;
+                // }
+
+                $attributeJson = [
+                    'icon' => $model->goods_cover,
+                    'date' => $attributeJsonDate,
+                    // 'time' => $attributeJsonTime,
+                    'dates' => $newDates ? array_values($newDates) : [],
+                    'times' => $times,
+                    'person' => $personTotal
+                ];
+                // if(isset($params['address'])){
+                //     $attributeJson['address'] = $params['address'];
+                // }
+                // if (isset($params['min_count'])){
+                //     $attributeJson['min-count'] = $params['min_count'];
+                // }else{
+                //     $attributeJson['min-count'] = 1;
+                // }
+                // if (isset($params['teachers'])){
+                //     $attributeJson['teachers'] = $params['teachers'];
+                // }
+                if (!empty($params['appointment_label'])) {
+                    $attributeJson['label'] = $params['appointment_label'];
+                }
+                // if (!empty($params['address'])) {
+                //     $attributeJson['address'] = $params['address'];
+                // }
+                // if (!empty($params['position'])){
+                //     $attributeJson['position'] = $params['position'];
+                // }
+                // if (isset($params['goods_service_premises'])){
+                //     $attributeJson['service_premises_id'] = $params['goods_service_premises'];
+                // }
+                $model->goods_attribute_json = json_encode($attributeJson, JSON_UNESCAPED_UNICODE);
+
+//                $times = [];
+//                foreach ($params['appointment_times'] as $time) {
+//                    $times[$time['appointmentTimeStart']] = [
+//                        'person' => $time['person'],
+//                        'duration' => $time['appointmentTimeStart'] . '-' . $time['appointmentTimeEnd']
+//                    ];
+//                }
+//                $model->goods_attribute_json = json_encode([
+//                    'icon' => '',
+//                    'dates' => $params['dates'] ?? [],
+//                    'times' => $times
+//                ]);
+            }
+            if (!empty($params['is_support_appointment']) && $params['is_support_appointment'] == 'Y' && !empty($params['appointment_times']) && $params['goods_category'] == 'TRAVEL') {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['travel-day'] = $params['travel_day'];
+                $attributeJson['travel-begin'] = $params['travel_begin'];
+                $attributeJson['travel-night'] = $params['travel_night'];
+                $attributeJson['travel-trans'] = $params['travel_trans'];
+
+                $unixs = [];
+                foreach ($params['appointment_times'] as $times) {
+                    $unix = strtotime($times['days']);
+                    $unixs[$unix] = $times['person'];
+                }
+                ksort($unixs);
+                $months = [];
+                foreach ($unixs as $key => $unix) {
+                    $month = date('Ym', $key);
+                    $day = date('d', $key);
+                    $months[$month][$day] = $unix;
+                }
+                $attributeJson['month'] = $months;
+                $model->goods_attribute_json = json_encode($attributeJson, JSON_UNESCAPED_UNICODE);
+            }
+            if (!empty($params['goods_json']) && $params['join_goods_category_id'] == 65) {
+                $goodsJson = json_decode($params['goods_json'], true);
+//                foreach ($goodsJson as $key => $item) {
+//                    $goodsJson[$key]['color'] = hexToRgb($item['color']);
+//                }
+//
+                $model->goods_json = json_encode($goodsJson);
+            } elseif (!empty($params['goods_json']) && $params['join_goods_category_id'] == 43) {
+                $goodsJson = json_decode($params['goods_json'], true);
+                $newGoodsJson = [];
+                foreach ($goodsJson as $item1) {
+                    if (empty($item1['title'])) {
+                        continue;
+                    }
+                    $newItem1 = [];
+                    foreach ($item1['items'] as $item2) {
+                        $newParams = [];
+                        foreach ($item2['params'] as $param) {
+                            if (!empty($param[0]) || !empty($param[1])) {
+                                $newParams[] = $param;
+                            }
+                        }
+                        $newItem1['items'][$item2['key']] = $newParams;
+                    }
+                    $newItem1['service'] = $item1['service'] ?? '';
+                    $newGoodsJson[$item1['title']] = $newItem1;
+                }
+                $model->goods_json = json_encode($newGoodsJson);
+            } else {
+                $model->goods_json = '[]';
+            }
+
+            if (!empty($params['goods_premisses'])) {
+                $attributeJson = [];
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['premisses'] = $params['goods_premisses'];
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+
+            if (!empty($params['goods_theme_color']) && !empty($params['goods_theme_icon'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['bg'] = $params['goods_theme_color'];
+                $attributeJson['icon'] = str_replace(getenv('STORAGE_DOMAIN'), '', $params['goods_theme_icon']);
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (!empty($params['address'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['address'] = $params['address'];
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (!empty($params['position'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['position'] = $params['position'];
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (isset($params['goods_service_premises'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['service_premises_id'] = $params['goods_service_premises'];
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (isset($params['min_count'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['min-count'] = $params['min_count'];
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (isset($params['teachers'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['teachers'] = $params['teachers'];
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (isset($params['work_time'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+
+                $workTimeStart = date('H:i', strtotime($params['work_time'][0]));
+                $workTimeEnd = date('H:i', strtotime($params['work_time'][1]));
+                $attributeJsonTime = $workTimeStart . '至' . $workTimeEnd;
+
+                $attributeJson['time'] = $attributeJsonTime;
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (!empty($params['coupon_id']) && !empty($params['coupon_nbr'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $coupons = Coupon::whereIn('coupon_id', $params['coupon_id'])
+                    ->select('coupon_id', 'coupon_name')
+                    ->get()
+                    ->toArray();
+                $couponList = [];
+                foreach ($coupons as $coupon) {
+                    if (isset($params['coupon_nbr'][$coupon['coupon_id']])) {
+                        $couponList[$coupon['coupon_id']] = [
+                            'num' => $params['coupon_nbr'][$coupon['coupon_id']],
+                            'name' => $coupon['coupon_name']
+                        ];
+                    }
+                }
+                $attributeJson['coupon'] = $couponList;
+                $model->goods_attribute_json = json_encode($attributeJson, JSON_UNESCAPED_UNICODE);
+            }
+            if ($model->save()) {
+                return $model->goods_id;
+            }
+            // 异常
+            throw new BusinessException("数据写入失败~");
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            throw new BusinessException("数据写入失败~");
+        }
+    }
+
+    /**
+     * @Desc 详情表
+     * @Author Gorden
+     * @Date 2024/3/11 11:19
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function detailInsert($params)
+    {
+        if (!empty($params['goods_detail_slider_json'])) {
+            $params['goods_detail_slider_json'] = str_replace(getenv('STORAGE_DOMAIN'), '', $params['goods_detail_slider_json']);
+            $params['goods_detail_slider_json'] = json_encode(['slider' => $params['goods_detail_slider_json']]);
+        }
+
+        if (isset($params['curriculum'])) {
+            $params['goods_detail_specs_json'] = json_encode([
+                [
+                    'key' => '课时',
+                    'val' => $params['curriculum']['period'] ?? '',
+                ],
+                [
+                    'key' => '群体',
+                    'val' => $params['curriculum']['group'] ?? '',
+                ],
+                [
+                    'key' => '课程',
+                    'val' => $params['curriculum']['course'] ?? '',
+                ],
+            ]);
+        }
+        try {
+            $model = new GoodsDetail();
+            $model->join_detail_goods_id = $params['goods_id'];
+            $model->goods_detail_code_json = $params['goods_detail_code_json'] ?? '{}';
+            $model->goods_detail_slider_json = $params['goods_detail_slider_json'] ?? '{}';
+            $model->goods_detail_specs_json = $params['goods_detail_specs_json'] ?? '{}';
+            $model->goods_detail_content = $params['goods_detail_content'] ?? '';
+            if (!$model->save()) {
+                // 异常
+                throw new BusinessException("轮播图/详情数据写入失败~");
+            }
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            throw new BusinessException("轮播图/详情数据写入失败~");
+        }
+    }
+
+    public static function componentUpdate($params, $type = 'insert')
+    {
+        Db::beginTransaction();
+        try {
+            $goodsSku = '';
+            // 有先删除
+            if ($type == 'update') {
+                GoodsComponent::where('join_component_master_goods_id', $params['goods_id'])->delete();
+                $goodsSku = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->first();
+                if ($goodsSku) {
+                    $goodsSku->goods_sku_market_price = $params['goods_market_price'] ?? 0;
+                    $goodsSku->goods_sku_sales_price = $params['goods_sales_price'] ?? 0;
+                    $goodsSku->save();
+                }
+            }
+            if ($type == 'insert' || !$goodsSku) {
+                Goods::where('goods_id', $params['goods_id'])->update(['goods_sku_json' => '{"规格": ["标准"]}']);
+                $skuData = [
+                    'join_sku_goods_id' => $params['goods_id'],
+                    'goods_sku_status' => 'ON',
+                    'goods_sku_specs_json' => '{"规格": "标准"}',
+                    'goods_sku_title' => "标准" . $params['goods_name'],
+                    'goods_sku_market_price' => $params['goods_market_price'] ?? 0,
+                    'goods_sku_sales_price' => $params['goods_sales_price'] ?? 0,
+                ];
+                GoodsSku::insert($skuData);
+            }
+            $data = [];
+            foreach ($params['goods_content_list'] as $item) {
+                if (!in_array($item['goods_id'], $params['join_component_goods_id'])) {
+                    continue;
+                }
+                $goods = Goods::where('goods_id', $params['goods_id'])->first();
+                if (!$goods) {
+                    continue;
+                }
+
+                $data[] = [
+                    'join_component_master_goods_id' => $params['goods_id'],
+                    'join_component_goods_id' => $item['goods_id'] ?? '',
+                    'join_component_goods_sku_id' => $item['sku_id'] ?? '',
+                    'goods_component_price' => $item['goods_sales_price'] ?? '',
+                    'goods_component_cover' => $goods->goods_cover,
+                    'goods_component_json' => json_encode(['goods_name' => $item['goods_name'], 'nbr' => $item['nbr'], 'sku_id' => $item['sku_id'] ?? '']),
+                    'goods_component_addtimes' => time()
+                ];
+            }
+
+            if ($data) {
+                GoodsComponent::insert($data);
+            }
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollBack();
+            dump($e->getMessage());
+            throw new BusinessException("数据写入失败~");
+        }
+    }
+
+    /**
+     * @Desc 标签表
+     * @Author Gorden
+     * @Date 2024/3/11 11:32
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function labelInsert($params)
+    {
+        $model = new GoodsLabel();
+        $model->join_label_goods_id = $params['goods_id'];
+        $model->goods_label = $params['goods_label'] ? implode(',', $params['goods_label']) : '';
+        $model->goods_label_extend_json = !empty($params['goods_label_extend_json']) ? $params['goods_label_extend_json'] : '{}';
+        if (!$model->save()) {
+            // 异常
+            throw new BusinessException('数据写入失败~');
+        }
+    }
+
+    /**
+     * @Desc 产品运行控制信息表
+     * @Author Gorden
+     * @Date 2024/3/11 11:38
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function goodsRunningInsert($params)
+    {
+        try {
+            $model = new GoodsRunning();
+            $model->join_running_goods_id = $params['goods_id'];
+            $model->goods_running_storage = $params['goods_running_storage'] ?? 0;
+            $model->goods_running_sale = $params['goods_running_sale'] ?? 0;
+            $model->goods_running_off_type = !empty($params['goods_running_off_type']) ? $params['goods_running_off_type'] : '';
+            $model->goods_running_off_json = !empty($params['goods_running_off_type']) && $params['goods_running_off_type'] == 'T' && !empty($params['goods_off_addtimes']) ? json_encode(['time' => strtotime($params['goods_off_addtimes'])]) : '[]';
+            if (!$model->save()) {
+                throw new BusinessException('数据写入失败');
+            }
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            throw new BusinessException('数据写入失败');
+        }
+    }
+
+    /**
+     * @Desc SKU
+     * @Author Gorden
+     * @Date 2024/3/11 12:01
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function skuInsert($params)
+    {
+        $model = new GoodsSku();
+        $model->join_sku_goods_id = $params['goods_id'];
+        $model->goods_sku_status = $params['goods_sku_status'];
+        $model->goods_sku_specs_json = $params['goods_sku_specs_json'];
+        $model->goods_sku_title = $params['goods_sku_title'];
+        $model->goods_sku_images_json = $params['goods_sku_images_json'];
+        $model->goods_sku_content = $params['goods_sku_content'];
+        $model->goods_sku_market_price = $params['goods_sku_market_price'];
+        $model->goods_sku_sales_price = $params['goods_sku_sales_price'];
+        $model->goods_sku_storage_json = $params['goods_sku_storage_json'];
+        $model->goods_sku_service_json = $params['goods_sku_service_json'];
+        $model->goods_sku_extend_json = $params['goods_sku_extend_json'];
+        if (!$model->save()) {
+            throw new BusinessException('规格数据写入失败~');
+        }
+    }
+
+    /**
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/3/12 8:44
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function mainUpdate($params)
+    {
+        try {
+            $data = self::inputFilter($params, new Goods());
+            if (!empty($data['goods_cover'])) {
+                $data['goods_cover'] = str_replace(getenv('STORAGE_DOMAIN'), '', $data['goods_cover']);
+            }
+            $data['goods_on_addtimes'] = isset($data['goods_on_addtimes']) ? strtotime($data['goods_on_addtimes']) : 0;
+            $data['goods_sku_json'] = !empty($params['goods_sku_json_label']) ? json_encode($params['goods_sku_json_label']) : json_encode(['规格' => ['标准']]);
+
+            $row = Goods::find($data['goods_id']);
+            if ($row->join_goods_category_id != $data['join_goods_category_id']) {
+                $category = SysCategory::where('category_id', $params['join_goods_category_id'])->first();
+                if (!$category) {
+                    throw new BusinessException("产品分类不存在~");
+                }
+                $data['goods_category'] = $category->category_classify ?? '';
+                $data['goods_prefix'] = $data['goods_prefix'] ?? ($category->category_name ? '【' . $category->category_name . '】' : '');
+            }
+
+            $expressJson = [];
+            if (!empty($params['express_json'])) {
+                if (in_array('express', $params['express_json'])) {
+                    $expressJson['express'] = 'Y';
+                } else {
+                    $expressJson['express'] = 'N';
+                }
+                if (in_array('self', $params['express_json'])) {
+                    $expressJson['self'] = 'Y';
+                } else {
+                    $expressJson['self'] = 'N';
+                }
+                if (in_array('arrival', $params['express_json'])) {
+                    $expressJson['arrival'] = 'Y';
+                } else {
+                    $expressJson['arrival'] = 'N';
+                }
+
+                $data['goods_express_json'] = json_encode($expressJson);
+            }
+            $attributeJson = [];
+            if (!empty($row->goods_attribute_json)) {
+                $attributeJson = json_decode($row->goods_attribute_json, true);
+            }
+            if (!empty($params['coupon_id']) && !empty($params['coupon_nbr'])) {
+                $coupons = Coupon::whereIn('coupon_id', $params['coupon_id'])
+                    ->select('coupon_id', 'coupon_name')
+                    ->get()
+                    ->toArray();
+                $couponList = [];
+                foreach ($coupons as $coupon) {
+                    if (isset($params['coupon_nbr'][$coupon['coupon_id']])) {
+                        $couponList[$coupon['coupon_id']] = [
+                            'num' => $params['coupon_nbr'][$coupon['coupon_id']],
+                            'name' => $coupon['coupon_name']
+                        ];
+                    }
+                }
+                $attributeJson['coupon'] = $couponList;
+            }
+            if (!empty($params['attribute_account'])){
+                $attributeJson['account'] = $params['attribute_account'];
+            }
+            if (!empty($params['attribute_control'])){
+                $attributeJson['control'] = $params['attribute_control'];
+            }
+
+            $data['goods_attribute_json'] = json_encode($attributeJson, JSON_UNESCAPED_UNICODE);
+
+            foreach ($data as $key => $val) {
+                $row->{$key} = $val;
+            }
+            $row->goods_updatetimes = time();
+            $row->save();
+        } catch (BusinessException $e) {
+            throw new BusinessException($e->getMessage());
+        } catch (\Exception $e) {
+            dump($e->getTrace());
+            throw new BusinessException('数据更新异常~1');
+        }
+    }
+
+    /**
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/3/12 9:57
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function detailUpdate($params)
+    {
+        try {
+            $data = self::inputFilter($params, new GoodsDetail());
+            if (!empty($data['goods_detail_slider_json'])) {
+                $data['goods_detail_slider_json'] = str_replace(getenv('STORAGE_DOMAIN'), '', $data['goods_detail_slider_json']);
+                $data['goods_detail_slider_json'] = json_encode(['slider' => $data['goods_detail_slider_json']]);
+            }
+            if (isset($params['curriculum'])) {
+                $data['goods_detail_specs_json'] = json_encode([
+                    [
+                        'key' => '课时',
+                        'val' => $params['curriculum']['period'] ?? '',
+                    ],
+                    [
+                        'key' => '群体',
+                        'val' => $params['curriculum']['group'] ?? '',
+                    ],
+                    [
+                        'key' => '课程',
+                        'val' => $params['curriculum']['course'] ?? '',
+                    ],
+                ]);
+            }
+            // 根据goods_id 查详情ID
+            $detail = GoodsDetail::where('join_detail_goods_id', $params['goods_id'])->first();
+            if ($detail) {
+                self::doUpdate($detail->join_detail_goods_id, $data, new GoodsDetail());
+            } else {
+                $data['join_detail_goods_id'] = $params['goods_id'];
+                GoodsDetail::insert($data);
+            }
+        } catch (BusinessException $e) {
+            throw new BusinessException($e->getMessage());
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            throw new BusinessException('轮播图/详情数据更新异常~');
+        }
+    }
+
+    /**
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/3/12 9:58
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function labelUpdate($params)
+    {
+        try {
+            $data = self::inputFilter($params, new GoodsLabel());
+            // 根据goods_id 查详情ID
+            $detail = GoodsLabel::where('join_label_goods_id', $params['goods_id'])->first();
+            if ($detail) {
+                self::doUpdate($detail->goods_label_id, $data, new GoodsLabel());
+            } else {
+                $data['join_label_goods_id'] = $params['goods_id'];
+                GoodsLabel::insert($data);
+            }
+        } catch (BusinessException $e) {
+            throw new BusinessException($e->getMessage());
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            throw new BusinessException('数据更新异常~3');
+        }
+    }
+
+    /**
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/3/12 9:59
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function goodsRunningUpdate($params)
+    {
+        try {
+            $data = self::inputFilter($params, new GoodsRunning());
+            // 根据goods_id 查详情ID
+            $detail = GoodsRunning::where('join_running_goods_id', $params['goods_id'])->first();
+            if (!empty($params['goods_running_off_type']) && $params['goods_running_off_type'] == 'T') {
+                $redis = Redis::connection();
+                if (!empty($detail->goods_running_off_json)) {
+                    $goodsRunningOffJson = json_decode($detail->goods_running_off_json, true);
+                    if (isset($goodsRunningOffJson['time'])) {
+                        $oldKey = Goods::LISTING_OFF_KEY_PREFIX . date('YmdHi', $goodsRunningOffJson['time']);
+                        $goodsRunningOffJson['time'] = strtotime($params['goods_off_addtimes']);
+                        $data['goods_running_off_json'] = json_encode($goodsRunningOffJson);
+                        // 有老的下架时间,删除老的
+                        $redis->srem($oldKey, $params['goods_id']);
+                    } else {
+                        $goodsRunningOffJson['time'] = strtotime($params['goods_off_addtimes']);
+                        $data['goods_running_off_json'] = json_encode($goodsRunningOffJson);
+                    }
+                } else {
+                    $data['goods_running_off_json'] = json_encode(['time' => strtotime($params['goods_off_addtimes'])]);
+                }
+                // 加入自动下架
+                $newKey = Goods::LISTING_OFF_KEY_PREFIX . date('YmdHi', strtotime($params['goods_off_addtimes']));
+                $redis->sAdd($newKey, $params['goods_id']);
+
+            } else if (!empty($params['goods_running_off_type']) && !empty($detail->goods_running_off_type) && $params['goods_running_off_type'] == 'H' && $detail->goods_running_off_type == 'T') {
+                $goodsRunningOffJson = json_decode($detail->goods_running_off_json, true);
+                if (isset($goodsRunningOffJson['time'])) {
+                    $oldKey = Goods::LISTING_OFF_KEY_PREFIX . date('YmdHi', $goodsRunningOffJson['time']);
+                    $redis = Redis::connection();
+                    $redis->srem($oldKey, $params['goods_id']);
+                }
+            }
+            if ($detail) {
+                self::doUpdate($detail->join_running_goods_id, $data, new GoodsRunning());
+            } else {
+                // 兼容老数据……
+                $data['join_running_goods_id'] = $params['goods_id'];
+                GoodsRunning::insert($data);
+            }
+
+        } catch (BusinessException $e) {
+            throw new BusinessException($e->getMessage());
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            throw new BusinessException('数据更新异常~');
+        }
+    }
+
+    /**
+     * @Desc sku 设置
+     * @Author Gorden
+     * @Date 2024/4/10 10:43
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function goodsSkuSet($params, $operation = 'insert')
+    {
+        try {
+            Db::beginTransaction();
+            $skusOldIds = [];
+            if ($operation == 'update') {
+                // 查出所有的
+                $skusOldIds = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->pluck('goods_sku_id', 'goods_sku_id');
+
+                // 删掉原有的
+//                GoodsSku::where('join_sku_goods_id', $params['goods_id'])->delete();
+            }
+            if (empty($skusOldIds) && empty($params['goods_sku_json_value'])) {
+                $skuData = [
+                    'join_sku_goods_id' => $params['goods_id'],
+                    'goods_sku_status' => 'ON',
+                    'goods_sku_specs_json' => '{"规格": "标准"}',
+                    'goods_sku_title' => "标准" . $params['goods_name'],
+                    'goods_sku_market_price' => $params['goods_market_price'] ?? 0,
+                    'goods_sku_sales_price' => $params['goods_sales_price'] ?? 0,
+                ];
+                GoodsSku::insert($skuData);
+            }
+            // 入新的
+            if (!empty($params['goods_sku_json_value'])) {
+                foreach ($params['goods_sku_json_value'] as $item) {
+                    $skus = explode(',', $item['sku']);
+                    $skuArr = [];
+                    for ($i = 1; $i <= count($skus); $i++) {
+                        $skuName = "skuName" . $i;
+                        $key = $item[$skuName];
+                        $skuArr[$key] = $skus[$i - 1];
+                    }
+                    $specsJson = json_encode($skuArr);
+                    $skuTitle = str_replace('-', ',', $item['sku']) . $params['goods_name'];
+                    if ($operation == 'update' && !empty($item['sku_id'])) {
+                        $model = GoodsSku::where('goods_sku_id', $item['sku_id'])->where('goods_sku_status','ON')->first();
+                        if (!$model) {
+                            $model = new GoodsSku();
+                        } else {
+                            unset($skusOldIds[$model->goods_sku_id]);
+                        }
+                    } else {
+                        $model = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->where('goods_sku_status','ON')->where('goods_sku_title', $skuTitle)->first();
+                        if (!$model) {
+                            $model = new GoodsSku();
+                        } else {
+                            unset($skusOldIds[$model->goods_sku_id]);
+                        }
+
+                    }
+
+                    $model->join_sku_goods_id = $params['goods_id'];
+                    $model->goods_sku_status = $params['goods_status'];
+                    $model->goods_sku_specs_json = $specsJson;
+                    $model->goods_sku_title = $skuTitle;
+                    $model->goods_sku_market_price = $params['goods_market_price'] ?? 0;
+                    $model->goods_sku_sales_price = $item['price'];
+                    $model->goods_sku_storage_json = json_encode(['storage' => $item['stock']]);
+                    $model->save();
+
+                }
+            }
+            if ($operation == 'update' && !empty($skusOldIds)) {
+                // GoodsSku::whereIn('goods_sku_id', $skusOldIds)->delete();
+                GoodsSku::whereIn('goods_sku_id', $skusOldIds)->update(['goods_sku_status' => 'DISABLED']);
+            }
+
+            Db::commit();
+        } catch (\Exception $e) {
+            dump($e->getTrace());
+            Db::rollBack();
+
+            throw new BusinessException('规格数据更新异常~');
+        }
+    }
+
+    /**
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/3/12 8:45
+     *
+     * @param array $data
+     * @param $model
+     * @return array
+     * @throws BusinessException
+     */
+    private static function inputFilter(array $data, $model): array
+    {
+        $table = config('database.connections.mysql.prefix') . $model->getTable();
+        $allow_column = $model->getConnection()->select("desc `$table`");
+        if (!$allow_column) {
+            throw new BusinessException('表不存在', 2);
+        }
+        $columns = array_column($allow_column, 'Type', 'Field');
+        foreach ($data as $col => $item) {
+            if (!isset($columns[$col])) {
+                unset($data[$col]);
+                continue;
+            }
+            // 非字符串类型传空则为null
+            if ($item === '' && strpos(strtolower($columns[$col]), 'varchar') === false && strpos(strtolower($columns[$col]), 'text') === false) {
+                $data[$col] = null;
+            }
+            if (is_array($item)) {
+                $data[$col] = implode(',', $item);
+            }
+            if ($item != '' && (strpos(strtolower($columns[$col]), 'varchar') || strpos(strtolower($columns[$col]), 'text'))) {
+//                $data[$col] = htmlspecialchars($item);
+            }
+        }
+        if (empty($data['created_at'])) {
+            unset($data['created_at']);
+        }
+        if (empty($data['updated_at'])) {
+            unset($data['updated_at']);
+        }
+        return $data;
+    }
+
+    /**
+     * @Desc 执行更新
+     * @Author Gorden
+     * @Date 2024/3/12 8:43
+     *
+     * @param $id
+     * @param $data
+     * @param $model
+     * @return void
+     */
+    private static function doUpdate($id, $data, $model)
+    {
+        $row = $model->find($id);
+        foreach ($data as $key => $val) {
+            $row->{$key} = $val;
+        }
+        $row->save();
+    }
+
+    /**
+     * @Desc 上架定时
+     * @Author Gorden
+     * @Date 2024/4/11 15:13
+     *
+     * @return void
+     */
+    public static function checkListing()
+    {
+        $key = Goods::LISTING_KEY_PREFIX . date('YmdHi');
+        $redis = Redis::connection();
+        if (!$redis->exists($key)) {
+            return;
+        }
+
+        $goodsIds = $redis->sMembers($key);
+        if (Goods::whereIn('goods_id', $goodsIds)->update(['goods_status' => 'ON'])) {
+            $redis->del($key);
+        }
+    }
+
+    /**
+     * @Desc 自动下架
+     * @Author Gorden
+     * @Date 2024/4/26 15:26
+     *
+     * @return void
+     */
+    public static function checkOffListing()
+    {
+        $key = Goods::LISTING_OFF_KEY_PREFIX . date('YmdHi');
+        $redis = Redis::connection();
+        if (!$redis->exists($key)) {
+            return;
+        }
+
+        $goodsIds = $redis->sMembers($key);
+        if (Goods::whereIn('goods_id', $goodsIds)->update(['goods_status' => 'OFF'])) {
+            $redis->del($key);
+        }
+    }
+
+    public static $week = [
+        '周一' => 1,
+        '周二' => 2,
+        '周三' => 3,
+        '周四' => 4,
+        '周五' => 5,
+        '周六' => 6,
+        '周日' => 7,
+    ];
+}

+ 2118 - 0
app/admin/service/goods/ReferrerService.php

@@ -0,0 +1,2118 @@
+<?php
+
+namespace app\admin\service\goods;
+
+use app\common\Tree;
+use app\model\Appointment;
+use app\model\Coupon;
+use app\model\Goods;
+use app\model\GoodsComponent;
+use app\model\GoodsDetail;
+use app\model\GoodsLabel;
+use app\model\GoodsRunning;
+use app\model\GoodsSku;
+use app\model\OrderSheet;
+use app\model\Supplier;
+use app\model\SysCategory;
+use app\model\SysDept;
+use app\model\SysSerial;
+use app\model\SysUser;
+use support\Db;
+use support\exception\BusinessException;
+use support\Redis;
+use support\Request;
+use support\Response;
+use Tinywan\Jwt\JwtToken;
+
+class ReferrerService
+{
+    public static function selectAll($goodsIds)
+    {
+        $goods = Goods::where('goods_status', 'ON')
+            ->when($goodsIds != '', function ($query) use ($goodsIds) {
+                $query->whereIn('goods_id', $goodsIds);
+            })
+            ->select('goods_id', 'goods_name')
+            ->get();
+
+        return json_success('', $goods);
+    }
+
+    public static function selectAllByGoodsName($goodsName)
+    {
+        $goods = Goods::with('sku')
+            ->where('goods_status', 'ON')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where('goods_name', 'like', "%" . $goodsName . '%');
+            })
+            ->select('goods_id', 'goods_name', 'goods_classify')
+            ->get()
+            ->toArray();
+        foreach ($goods as &$item) {
+            if (!empty($item['sku'])) {
+                foreach ($item['sku'] as $key => $sku) {
+                    $specsJson = json_decode($sku['goods_sku_specs_json'], true);
+                    $skuTitle = '';
+                    foreach ($specsJson as $item2) {
+                        if (is_array($item2)) {
+                            $item2 = implode(',', $item2);
+                        }
+                        $skuTitle .= $item2 . '-';
+                    }
+                    $item['sku'][$key]['goods_sku_id'] = strval($item['sku'][$key]['goods_sku_id']);
+                    $item['sku'][$key]['goods_sku_title'] = rtrim($skuTitle, '-');
+                }
+            }
+        }
+
+        return json_success('', $goods);
+    }
+
+    public static function selectAllByCategoryForRuleAddComponent($category = "GOODS")
+    {
+        $categoryIds = [];
+        $categorySuperIds = [];
+        if ($category == 'GOODS') {
+            $categorySuperIds = [5];
+        } elseif ($category == 'SERVICE') {
+            $categorySuperIds = [31, 154, 42, 65, 30, 66, 72, 70];
+        }
+        $categorys = SysCategory::whereIn('category_id', $categorySuperIds)->get()->toArray();
+        foreach ($categorys as $item) {
+            if (empty($item['category_super_path'])) {
+                $item['category_super_path'] = '#' . $item['category_id'] . '#';
+            } else {
+                $item['category_super_path'] = $item['category_super_path'] . '#' . $item['category_id'] . '#';
+            }
+
+            $categoryIds = SysCategory::where('category_super_path', 'like', '%' . $item['category_super_path'] . '%')->pluck('category_id');
+            $categoryIds = $categoryIds ? $categoryIds->toArray() : [];
+            $categorySuperIds = array_merge($categorySuperIds, $categoryIds);
+        }
+
+        $categoryIds = array_unique($categorySuperIds);
+
+        $goods = Goods::with('sku')
+//            ->where('goods_classify', $category)
+            ->when(!empty($categoryIds), function ($query) use ($categoryIds) {
+                $query->whereIn('join_goods_category_id', $categoryIds);
+            })->when(empty($categoryIds), function ($query) {
+                $query->where('goods_classify', '<>', 'RECHARGE');
+            })->where('goods_status', 'ON')
+            ->select('goods_id', 'goods_name', 'join_goods_category_id')
+            ->get()
+            ->toArray();
+
+        foreach ($goods as &$good) {
+            if (!empty($good['sku'])) {
+                foreach ($good['sku'] as $key => $sku) {
+                    if (!empty($sku['goods_sku_specs_json'])) {
+                        $specsJson = json_decode($sku['goods_sku_specs_json'], true);
+                        $skuTitle = '';
+                        foreach ($specsJson as $item) {
+                            if (is_array($item)) {
+                                $item = implode(',', $item);
+                            }
+                            $skuTitle .= $item . '-';
+                        }
+                        $good['sku'][$key]['goods_sku_id'] = strval($good['sku'][$key]['goods_sku_id']);
+                        $good['sku'][$key]['goods_sku_title'] = rtrim($skuTitle, '-');
+                    }
+                    unset($good['sku'][$key]['goods_sku_specs_json'], $good['sku'][$key]['join_sku_goods_id']);
+                }
+            } else {
+                $good['sku'] = [];
+            }
+
+        }
+
+        return json_success('', $goods);
+    }
+
+    public static function selectPremisesByGoodsId($goodsId)
+    {
+        $goods = Goods::where('goods_id', $goodsId)
+            ->select('goods_id', 'goods_attribute_json')
+            ->first();
+        $premisses = [];
+        if (!empty($goods->goods_attribute_json)) {
+            $attributeJson = json_decode($goods->goods_attribute_json, true);
+            if (isset($attributeJson['premisses'])) {
+                $premisses = SysDept::whereIn('dept_id', $attributeJson['premisses'])
+                    ->select('dept_id', 'dept_name')
+                    ->get()
+                    ->toArray();
+            }
+        }
+
+        return json_success('', $premisses);
+    }
+
+    public static function select(Request $request, $classify = "GOODS")
+    {
+        $page = $request->get('page', 1);
+        $pageSize = $request->get('pageSize', 20);
+        $goodsName = $request->get('goods_name', '');
+        $categoryId = $request->get('join_goods_category_id', null);
+        $goodsCategory = $request->get('goods_category', null);
+        $goodsSupplierId = $request->get('join_goods_supplier_id', null);
+        $goodsStatus = $request->get('goods_status', null);
+        $type = $request->get('type', '');
+        if ($categoryId != null) {
+            $categoryPath = SysCategory::where('category_id', $categoryId)->value('category_super_path');
+            $categoryPath .= '#' . $categoryId . '#';
+            $categoryIds = SysCategory::where('category_super_path', 'like', $categoryPath . '%')->pluck('category_id')->toArray();
+            $categoryIds[] = intval($categoryId);
+            if (!empty($categoryIds)) {
+                $categoryId = $categoryIds;
+            } else {
+                $categoryId = [intval($categoryId)];
+            }
+        }
+
+        $rows = Goods::with([
+            'category' => function ($query) {
+                $query->select('category_id', 'category_name');
+            },
+            'running' => function ($query) {
+                $query->select('join_running_goods_id', 'goods_running_storage');
+            },
+            'supplier' => function ($query) {
+                $query->select('supplier_id', 'supplier_name');
+            },
+            'user' => function ($query) {
+                $query->select('user_id', 'user_name');
+            }
+        ])->leftJoin('goods_running', 'goods_running.join_running_goods_id', '=', 'goods.goods_id')
+            ->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_attribute_json', 'goods_addtimes', 'goods_updatetimes')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where(function ($q) use ($goodsName) {
+                    $q->where('goods_name', 'like', '%' . $goodsName . '%');
+//                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                });
+            })->when($categoryId != null, function ($query) use ($categoryId) {
+                $query->whereIn('join_goods_category_id', $categoryId);
+            })->when($goodsCategory != null, function ($query) use ($goodsCategory) {
+                $query->where('goods_category', $goodsCategory);
+            })
+            ->when($classify != '', function ($query) use ($classify, $categoryId) {
+                if ($classify == 'GOODS' && empty($categoryId)) {
+                    $query->whereIn('join_goods_category_id', ['6', '7', '8', '9', '10', '11', '12', '30']);
+                } else if ($classify != 'GOODS' && empty($categoryId)) {
+                    $query->where('goods_classify', $classify);
+                }
+            })->when(!empty($type), function ($query) use ($type) {
+                if ($type == 'storageWarning') {
+                    $query->where('goods_running.goods_running_storage', '<=', 2);
+                }
+            })->when(!empty($goodsSupplierId), function ($query) use ($goodsSupplierId) {
+                $query->where('join_goods_supplier_id', $goodsSupplierId);
+            })->when(!empty($goodsStatus), function ($query) use ($goodsStatus) {
+                $query->where('goods_status', $goodsStatus);
+            })
+            ->orderBy('goods_sort', 'DESC')
+            ->orderBy('goods_addtimes', 'DESC')
+            ->forPage($page, $pageSize)
+            ->get()
+            ->toArray();
+
+        $total = Goods::leftJoin('goods_running', 'goods_running.join_running_goods_id', '=', 'goods.goods_id')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where(function ($q) use ($goodsName) {
+                    $q->where('goods_name', 'like', '%' . $goodsName . '%');
+//                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                });
+            })->when($categoryId != null, function ($query) use ($categoryId) {
+                $query->whereIn('join_goods_category_id', $categoryId);
+            })->when($goodsCategory != null, function ($query) use ($goodsCategory) {
+                $query->where('goods_category', $goodsCategory);
+            })->when($classify != '', function ($query) use ($classify, $categoryId) {
+                if ($classify == 'GOODS' && empty($categoryId)) {
+                    $query->whereIn('join_goods_category_id', ['6', '7', '8', '9', '10', '11', '12', '30']);
+                } else if ($classify != 'GOODS' && empty($categoryId)) {
+                    $query->where('goods_classify', $classify);
+                }
+            })->when(!empty($type), function ($query) use ($type) {
+                if ($type == 'storageWarning') {
+                    $query->where('goods_running.goods_running_storage', '<=', 2);
+                }
+            })->when(!empty($goodsSupplierId), function ($query) use ($goodsSupplierId) {
+                $query->where('join_goods_supplier_id', $goodsSupplierId);
+            })->when(!empty($goodsStatus), function ($query) use ($goodsStatus) {
+                $query->where('goods_status', $goodsStatus);
+            })
+            ->count();
+
+        foreach ($rows as &$row) {
+            $row['goods_cover'] = getenv('STORAGE_DOMAIN') . $row['goods_cover'];
+            if (isset($row['running'])) {
+                $row['running']['goods_running_storage'] = intval($row['running']['goods_running_storage']);
+            }
+            if (!empty($row['goods_attribute_json'])) {
+                $row['goods_attribute_json'] = json_decode($row['goods_attribute_json']);
+            }
+            if (!empty($row['goods_category']) && $row['goods_category'] == 'INDEX') {
+                $row['goods_recommend_index'] = 'INDEX';
+            }
+        }
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+    }
+
+    public static function selectSpecial(Request $request)
+    {
+        $page = $request->get('page');
+        $pageSize = $request->get('pageSize');
+        $goodsName = $request->get('goods_name', '');
+        $categoryId = $request->get('join_goods_category_id', null);
+        if ($categoryId == null) {
+            $categoryId = [65, 43];
+        } elseif (is_string($categoryId)) {
+            $categoryId = [$categoryId];
+        }
+
+        $rows = Goods::with([
+            'category' => function ($query) {
+                $query->select('category_id', 'category_name');
+            },
+            'running' => function ($query) {
+                $query->select('join_running_goods_id', 'goods_running_storage');
+            },
+            'supplier' => function ($query) {
+                $query->select('supplier_id', 'supplier_name');
+            },
+            'user' => function ($query) {
+                $query->select('user_id', 'user_name');
+            }
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where(function ($q) use ($goodsName) {
+                    $q->where('goods_name', 'like', '%' . $goodsName . '%');
+//                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                });
+            })->whereIn('join_goods_category_id', $categoryId)
+            ->orderBy('goods_sort', 'DESC')
+            ->orderBy('goods_addtimes', 'DESC')
+            ->forPage($page, $pageSize)
+            ->get()
+            ->toArray();
+        $total = Goods::when($goodsName != '', function ($query) use ($goodsName) {
+            $query->where(function ($q) use ($goodsName) {
+                $q->where('goods_name', 'like', '%' . $goodsName . '%');
+//                    ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+            });
+        })->whereIn('join_goods_category_id', $categoryId)->count();
+
+        foreach ($rows as &$row) {
+            $row['goods_cover'] = getenv('STORAGE_DOMAIN') . $row['goods_cover'];
+            if (isset($row['running'])) {
+                $row['running']['goods_running_storage'] = intval($row['running']['goods_running_storage']);
+            }
+        }
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+    }
+
+    public static function selectPicking(Request $request)
+    {
+        $page = $request->get('page');
+        $pageSize = $request->get('pageSize');
+        $goodsName = $request->get('goods_name', '');
+
+        $categorySuperId = $request->get('category_super_id', '');
+        $categoryIds = $request->get('join_goods_category_id', []);
+        if (!empty($categorySuperId) && is_array($categoryIds)) {
+            $category = SysCategory::where('category_id', $categorySuperId)->first();
+            if (empty($category->category_super_path)) {
+                $category->category_super_path = '#' . $categorySuperId . '#';
+            } else {
+                $category->category_super_path = $category->category_super_path . '#' . $categorySuperId . '#';
+            }
+            $categoryIds = SysCategory::where('category_super_path', 'like', '%' . $category->category_super_path)->pluck('category_id');
+            $categoryIds = $categoryIds ? $categoryIds->toArray() : [];
+            $categoryIds = array_merge($categoryIds, [$categorySuperId]);
+        } elseif (!is_array($categoryIds)) {
+            $categoryIds = [$categoryIds];
+        }
+
+        $rows = Goods::with([
+            'category' => function ($query) {
+                $query->select('category_id', 'category_name');
+            },
+            'running' => function ($query) {
+                $query->select('join_running_goods_id', 'goods_running_storage');
+            },
+            'supplier' => function ($query) {
+                $query->select('supplier_id', 'supplier_name');
+            },
+            'user' => function ($query) {
+                $query->select('user_id', 'user_name');
+            }
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where(function ($q) use ($goodsName) {
+                    $q->where('goods_name', 'like', '%' . $goodsName . '%')
+                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                });
+            })->whereIn('join_goods_category_id', $categoryIds)
+            ->orderBy('goods_sort', 'DESC')
+            ->orderBy('goods_addtimes', 'DESC')
+            ->forPage($page, $pageSize)
+            ->get()
+            ->toArray();
+        $total = Goods::when($goodsName != '', function ($query) use ($goodsName) {
+            $query->where(function ($q) use ($goodsName) {
+                $q->where('goods_name', 'like', '%' . $goodsName . '%')
+                    ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+            });
+        })->whereIn('join_goods_category_id', $categoryIds)
+            ->count();
+
+        foreach ($rows as &$row) {
+            $row['goods_cover'] = getenv('STORAGE_DOMAIN') . $row['goods_cover'];
+            if (isset($row['running'])) {
+                $row['running']['goods_running_storage'] = intval($row['running']['goods_running_storage']);
+            }
+        }
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+    }
+
+    public static function selectPackage(Request $request)
+    {
+        $page = $request->get('page');
+        $pageSize = $request->get('pageSize');
+        $goodsName = $request->get('goods_name', '');
+        $categoryId = $request->get('join_goods_category_id', null);
+
+        $rows = Goods::with([
+            'category' => function ($query) {
+                $query->select('category_id', 'category_name');
+            },
+            'running' => function ($query) {
+                $query->select('join_running_goods_id', 'goods_running_storage');
+            },
+            'supplier' => function ($query) {
+                $query->select('supplier_id', 'supplier_name');
+            },
+            'user' => function ($query) {
+                $query->select('user_id', 'user_name');
+            }
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'creator_user_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes', 'goods_updatetimes')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where(function ($q) use ($goodsName) {
+                    $q->where('goods_name', 'like', '%' . $goodsName . '%')
+                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                });
+            })->when($categoryId != null, function ($query) use ($categoryId) {
+                $query->where('join_goods_category_id', $categoryId);
+            })
+            ->where('goods_classify', 'PACKAGE')
+            ->orderBy('goods_sort', 'DESC')
+            ->orderBy('goods_addtimes', 'DESC')
+            ->forPage($page, $pageSize)
+            ->get()
+            ->toArray();
+        $total = Goods::when($goodsName != '', function ($query) use ($goodsName) {
+            $query->where(function ($q) use ($goodsName) {
+                $q->where('goods_name', 'like', '%' . $goodsName . '%')
+                    ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+            });
+        })->when($categoryId != null, function ($query) use ($categoryId) {
+            $query->where('join_goods_category_id', $categoryId);
+        })->where('goods_classify', 'PACKAGE')->count();
+
+        foreach ($rows as &$row) {
+            $row['goods_cover'] = getenv('STORAGE_DOMAIN') . $row['goods_cover'];
+            if (isset($row['running'])) {
+                $row['running']['goods_running_storage'] = intval($row['running']['goods_running_storage']);
+            }
+//            if (!empty($row['component'])) {
+//                $ids = [];
+//                $contentList = [];
+//                foreach ($row['component'] as $component) {
+//                    $ids[] = $component['join_component_goods_id'];
+//                    $configJson = json_decode($component['goods_component_config_json'], true);
+//                    $contentList[] = [
+//                        'goods_name' => $configJson['goods_name'] ?? '',
+//                        'goods_sales_price' => $component['goods_component_price'],
+//                        'nbr' => $configJson['nbr'] ?? 0
+//                    ];
+//                }
+//
+//                $row['join_component_goods_id'] = $ids;
+//                $row['goodsContentList'] = $contentList;
+//            }
+        }
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+    }
+
+    /**
+     * @Desc 下拉选择服务商品
+     * @Author Gorden
+     * @Date 2024/4/24 13:32
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public static function selectList(Request $request, $goodsClassify = "SERVICE")
+    {
+        $keywords = $request->get('keywords', '');
+        $isSupportAppointment = $request->get('is_support_appointment', '');
+//        if (!$keywords){
+//            return json_success('暂无数据');
+//        }
+
+//        $categoryIds = SysCategory::whereIn('category_super_id', [5, 31, 32, 42, 66, 70, 72])->pluck('category_id');
+
+        $goods = Goods::with('sku')
+//            ->whereIn('join_goods_category_id', $categoryIds)
+            ->when($keywords != '', function ($query) use ($keywords) {
+                $query->where('goods_name', 'like', "%" . $keywords . "%");
+            })
+            ->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);
+                }
+
+            })
+            ->when($isSupportAppointment != '', function ($query) use ($isSupportAppointment) {
+                $query->where('is_support_appointment', $isSupportAppointment);
+            })
+            ->select('goods_id', 'goods_name', 'goods_sales_price', 'join_goods_category_id', 'goods_attribute_json')
+            ->get()
+            ->toArray();
+
+        foreach ($goods as &$good) {
+            if (!empty($good['sku'])) {
+                foreach ($good['sku'] as $key => $sku) {
+                    if (!empty($sku['goods_sku_specs_json'])) {
+                        $good['sku'][$key]['goods_sku_specs_json'] = json_decode($sku['goods_sku_specs_json']);
+
+                        $skuName = '';
+                        foreach ($good['sku'][$key]['goods_sku_specs_json'] as $specsKey => $skuSpecs) {
+                            if (is_array($skuSpecs)) {
+                                $skuName = $skuName . ' ' . $specsKey . ':' . implode(' ', $skuSpecs) . ';';
+                            } else {
+                                $skuName = $skuName . ' ' . $specsKey . ':' . $skuSpecs . ';';
+                            }
+                        }
+                        $good['sku'][$key]['sku_name'] = $skuName;
+                    }
+                }
+            } else {
+                $good['sku'] = [];
+            }
+            $good['premisses'] = [];
+            if (!empty($good['goods_attribute_json'])) {
+                $attributeJson = json_decode($good['goods_attribute_json'], true);
+                if (isset($attributeJson['premisses'])) {
+                    $premisses = SysDept::when(!empty($attributeJson['premisses']), function ($query) use ($attributeJson) {
+                        $query->whereIn('dept_id', $attributeJson['premisses']);
+                    })->where('dept_category', '营业场所')
+                        ->select('dept_id', 'dept_name')
+                        ->get();
+                    $good['premisses'] = $premisses;
+                }
+            }
+        }
+
+        return json_success('', $goods);
+
+    }
+
+    public static function selectCascaderList(Request $request)
+    {
+        $categoryIds = $request->get('category_id', '');
+        $categorySuperId = $request->get('category_super_id', '');
+        $joinGoodsCategoryId = $request->get('join_goods_category_id', '');
+        $type = $request->get('type', '');
+        if (!$categoryIds && !$categorySuperId && !$joinGoodsCategoryId) {
+            return json_fail('参数异常');
+        }
+        $data = [];
+        $categorys = [];
+        if (!empty($categoryIds)) {
+            $categorys = SysCategory::whereIn('category_id', $categoryIds)
+                ->where('category_status', 'ACTIVED')
+                ->select('category_id as id', 'category_name as name', 'category_super_id as pid', 'category_super_path')
+                ->orderBy('category_sort', 'DESC')
+                ->get()
+                ->toArray();
+            $data = array_merge($data, $categorys);
+        } else if (!empty($categorySuperId)) {
+            $categorys = SysCategory::where('category_super_id', $categorySuperId)
+                ->where('category_status', 'ACTIVED')
+                ->select('category_id as id', 'category_name as name', 'category_super_id as pid', 'category_super_path')
+                ->orderBy('category_sort', 'DESC')
+                ->get()
+                ->toArray();
+            $data = array_merge($data, $categorys);
+        }
+
+        foreach ($categorys as $category) {
+            // if(empty($category['category_super_path'])){
+            $category['category_super_path'] = '#' . $category['id'] . '#';
+            // }
+            $subCategory = SysCategory::where('category_super_path', 'like', '%' . $category['category_super_path'] . '%')
+                ->where('category_status', 'ACTIVED')
+                ->select('category_id as id', 'category_name as name', 'category_super_id as pid', 'category_super_path')
+                ->orderBy('category_sort', 'DESC')
+                ->get()
+                ->toArray();
+            $data = array_merge($data, $subCategory);
+        }
+        if (empty($data) && !empty($joinGoodsCategoryId)) {
+            $goodsCategoryIds = $joinGoodsCategoryId;
+        } else {
+            $goodsCategoryIds = array_column($data, 'id');
+        }
+        $goods = Goods::with([
+            'sku' => function($query){
+                $query->where('goods_sku_status','ON');
+            }
+        ])
+            ->leftJoin('goods_running', 'goods_running.join_running_goods_id', '=', 'goods.goods_id')
+            ->where('goods_running.goods_running_storage', '>', 0)
+            ->whereIn('join_goods_category_id', $goodsCategoryIds)
+            ->where('goods_status', 'ON');
+
+        if ($type == 'dishes') {
+            $uid = JwtToken::getCurrentId();
+            $user = SysUser::where('user_id', $uid)->first();
+            $restaurant = SysDept::where('dept_category', '餐厅')->where(function ($query) use ($user) {
+                $query->where('dept_id', $user->join_user_dept_id)->orWhere('dept_super_id', $user->join_user_dept_id);
+            })->first();
+            $supplier = Supplier::where('join_supplier_dept_id', $restaurant->dept_id)->first();
+            if ($supplier) {
+                $goods = $goods->where('join_goods_supplier_id', $supplier->supplier_id);
+            }
+        }
+
+
+        $goods = $goods->select('goods_id', 'goods_id as id', 'goods_name as name', 'join_goods_category_id as pid', 'goods_attribute_json', 'goods_classify', 'goods_sales_price', 'goods_cover', 'goods_running.goods_running_storage')
+            ->orderBy('goods_sort', 'DESC')
+            ->orderBy('goods_addtimes', 'DESC')
+            ->get()
+            ->toArray();
+        foreach ($goods as &$good) {
+            $good['goods_cover'] = getenv('STORAGE_DOMAIN') . $good['goods_cover'];
+            $good['goods_running_storage'] = intval($good['goods_running_storage']);
+            $good['nbr'] = 0;
+            if (!empty($good['sku'])) {
+                foreach ($good['sku'] as $key => $sku) {
+                    if (!empty($sku['goods_sku_specs_json'])) {
+                        $good['sku'][$key]['goods_sku_specs_json'] = json_decode($sku['goods_sku_specs_json']);
+
+                        $skuName = '';
+                        foreach ($good['sku'][$key]['goods_sku_specs_json'] as $specsKey => $skuSpecs) {
+                            $keyStr = ($specsKey == '规格') ? '' : ($specsKey . ':');
+                            if (is_array($skuSpecs)) {
+                                $skuName = $skuName . $keyStr . ' ' . implode(' ', $skuSpecs) . '; ';
+                            } else {
+                                $skuName = $skuName . $keyStr . ' ' . $skuSpecs . '; ';
+                            }
+                        }
+                        $good['sku'][$key]['sku_name'] = rtrim($skuName, '; ');
+                    }
+                }
+            } else {
+                $good['sku'] = [];
+            }
+            $good['premisses'] = [];
+            if (!empty($good['goods_attribute_json'])) {
+                $attributeJson = json_decode($good['goods_attribute_json'], true);
+                if (isset($attributeJson['premisses'])) {
+                    $premisses = SysDept::when(!empty($attributeJson['premisses']), function ($query) use ($attributeJson) {
+                        $query->whereIn('dept_id', $attributeJson['premisses']);
+                    })->where('dept_category', '营业场所')
+                        ->select('dept_id', 'dept_name')
+                        ->get();
+                    $good['premisses'] = $premisses;
+                }
+            }
+        }
+
+        $data = array_merge($data, $goods);
+        $tree = new Tree($data);
+        $cascaderData = $tree->getTree();
+
+        foreach ($cascaderData as $key1 => $cascader1) {
+            if (isset($cascader1['children'])) {
+                foreach ($cascader1['children'] as $key2 => $cascader2) {
+                    if (isset($cascader2['children'])) {
+                        foreach ($cascader2['children'] as $key3 => $cascader3) {
+                            if (isset($cascader3['children'])) {
+                                foreach ($cascader3['children'] as $key4 => $cascader4) {
+                                    if (!isset($cascader4['goods_id'])) {
+                                        unset($cascaderData[$key1]['children'][$key2]['children'][$key3]['children'][$key4]);
+                                    }
+                                    if (isset($cascader4['goods_id']) && empty($cascader4['sku'])){
+                                        unset($cascaderData[$key1]['children'][$key2]['children'][$key3]['children'][$key4]);
+                                    }
+                                }
+                            } else if (!isset($cascader3['goods_id'])) {
+                                unset($cascaderData[$key1]['children'][$key2]['children'][$key3]);
+                            }
+                            if (isset($cascader3['goods_id']) && empty($cascader3['sku'])){
+                                unset($cascaderData[$key1]['children'][$key2]['children'][$key3]);
+                                continue;
+                            }
+                            if (isset($cascader3['children']) && count($cascaderData[$key1]['children'][$key2]['children']) == 0) {
+                                unset($cascaderData[$key1]['children'][$key2]);
+                            }
+                            if (isset($cascader3['children']) && count($cascaderData[$key1]['children'][$key2]['children'][$key3]['children']) > 0) {
+                                $cascaderData[$key1]['children'][$key2]['children'][$key3]['children'] = array_values($cascaderData[$key1]['children'][$key2]['children'][$key3]['children']);
+                            }
+                        }
+                    } else if (!isset($cascader2['goods_id'])) {
+                        unset($cascaderData[$key1]['children'][$key2]);
+                    }
+                    if (isset($cascader2['goods_id']) && empty($cascader2['sku'])){
+                        unset($cascaderData[$key1]['children'][$key2]);
+                        continue;
+                    }
+                    if (isset($cascader2['children']) && count($cascaderData[$key1]['children'][$key2]['children']) == 0) {
+                        unset($cascaderData[$key1]['children'][$key2]);
+                    }
+                    if (isset($cascader2['children']) && isset($cascaderData[$key1]['children'][$key2]) && count($cascaderData[$key1]['children'][$key2]['children']) > 0) {
+                        $cascaderData[$key1]['children'][$key2]['children'] = array_values($cascaderData[$key1]['children'][$key2]['children']);
+                    }
+                }
+            } else if (!isset($cascader1['goods_id'])) {
+                unset($cascaderData[$key1]);
+            }
+            if (isset($cascader1['goods_id']) && empty($cascader1['sku'])){
+                unset($cascaderData[$key1]);
+                continue;
+            }
+            if (isset($cascader1['children']) && count($cascaderData[$key1]['children']) == 0) {
+
+                unset($cascaderData[$key1]);
+            }
+            if (isset($cascader1['children']) && isset($cascaderData[$key1]) && count($cascaderData[$key1]['children']) > 0) {
+                $cascaderData[$key1]['children'] = array_values($cascaderData[$key1]['children']);
+            }
+        }
+        $cascaderData = array_values($cascaderData);
+
+        return json_success('success', $cascaderData);
+    }
+
+    /**
+     * @Desc 商品详情
+     * @Author Gorden
+     * @Date 2024/3/28 10:25
+     *
+     * @param $goodsId
+     * @return Response
+     */
+    public static function info($goodsId)
+    {
+        try {
+            // 商品主表
+            $main = Goods::with('category')->where('goods_id', $goodsId)->first();
+            if (!empty($main)) {
+                $main = $main->toArray();
+                $main['goods_sku_json'] = json_decode($main['goods_sku_json'], true);
+                $main['specList'] = [];
+                foreach ($main['goods_sku_json'] as $key => $sku) {
+                    $main['specList'][] = [
+                        'label' => $key,
+                        'tags' => $sku
+                    ];
+                }
+
+            } else {
+                $main = [];
+            }
+            // 详情表
+            $detail = GoodsDetail::where('join_detail_goods_id', $goodsId)->first();
+            if (!empty($detail)) {
+                $detail = $detail->toArray();
+            } else {
+                $detail = [];
+            }
+            // 标签表
+            $label = GoodsLabel::where('join_label_goods_id', $goodsId)->first();
+            if (!empty($label)) {
+                $label = $label->toArray();
+            } else {
+                $label = [];
+            }
+            // Running表
+            $running = GoodsRunning::where('join_running_goods_id', $goodsId)->first();
+            if (!empty($running)) {
+                $running = $running->toArray();
+                if (!empty($running['goods_running_off_json']) && is_json($running['goods_running_off_json'])) {
+                    $goodsRunningOffJson = json_decode($running['goods_running_off_json'], true);
+                    $running['goods_off_addtimes'] = isset($goodsRunningOffJson['time']) ? date("Y-m-d H:i", $goodsRunningOffJson['time']) : '';
+                }
+                $running['goods_running_storage'] = !empty($running['goods_running_storage']) ? intval($running['goods_running_storage']) : '';
+                $running['goods_running_sale'] = !empty($running['goods_running_sale']) ? intval($running['goods_running_sale']) : '';
+            } else {
+                $running = [];
+            }
+            // Sku表
+            $skus = GoodsSku::where('join_sku_goods_id', $goodsId)->where('goods_sku_status','ON')->get();
+            if (!empty($skus)) {
+                $skus = $skus->toArray();
+                $submitList = [];
+                foreach ($skus as $key => $sku) {
+                    $skuSpecsJson = json_decode($sku['goods_sku_specs_json'], true);
+                    $skuSpecs = '';
+                    $skuNameValue = [];
+                    $i = 1;
+                    foreach ($skuSpecsJson as $k => $item) {
+                        if (is_array($item)) {
+                            $item = implode(',', $item);
+                        }
+                        $skuSpecs = $skuSpecs . $item . ',';
+                        $skuNameKey = 'skuName' . $i;
+                        $skuValueKey = 'skuValue' . $i;
+                        $skuNameValue[$skuNameKey] = $k;
+                        $skuNameValue[$skuValueKey] = $item;
+                        $skuNameValue[$k] = $item;
+                        $i++;
+                    }
+                    $storage = json_decode($sku['goods_sku_storage_json'], true);
+                    $priceStorage = [
+                        'sku_id' => $sku['goods_sku_id'],
+                        'sku' => rtrim($skuSpecs, ',') ?? '',
+                        'stock' => $storage['storage'] ?? '',
+                        'price' => $sku['goods_sku_sales_price'] ?? '',
+                    ];
+
+                    $submitList[] = array_merge($skuNameValue, $priceStorage);
+                }
+                $skus['submitList'] = $submitList;
+            } else {
+                $skus = [];
+            }
+
+            // 合并数据
+            $data = array_merge($main, $detail, $label, $running, ['sku' => $skus]);
+            $data['goods_sku_json_label'] = [];
+
+            $data['goods_label'] = !empty($data['goods_label']) ? explode(',', $data['goods_label']) : [];
+            $data['goods_json'] = $data['goods_json'] ? json_decode($data['goods_json'], true) : [];
+            $data['goods_cover'] = getenv('STORAGE_DOMAIN') . $data['goods_cover'];
+            if (!empty($data['goods_category']) && $data['goods_category'] == 'INDEX') {
+                $data['goods_recommend_index'] = 'INDEX';
+            }
+
+            // 创建者
+            $data['creator_username'] = '';
+            if (!empty($data['creator_user_id'])) {
+                $data['creator_username'] = SysUser::where('user_id', $data['creator_user_id'])->value('user_name');
+            }
+
+            if (!empty($data['goods_detail_slider_json'])) {
+                $data['goods_detail_slider_json'] = json_decode($data['goods_detail_slider_json'], true);
+                // ……
+                if (isset($data['goods_detail_slider_json']['slider'])) {
+                    $data['goods_detail_slider_json'] = explode(',', $data['goods_detail_slider_json']['slider']);
+                }
+
+                $slider = '';
+                foreach ($data['goods_detail_slider_json'] as $item) {
+                    $slider .= getenv('STORAGE_DOMAIN') . $item . ',';
+                }
+                $data['goods_detail_slider_json'] = rtrim($slider, ',');
+            }
+            $extendJson = [];
+            if (!empty($data['goods_attribute_json'])) {
+                $extendJson = json_decode($data['goods_attribute_json'], true);
+                $data['goods_attribute_json'] = $extendJson;
+            }
+            if (!empty($extendJson['coupon'])) {
+                $data['coupon_list'] = $extendJson['coupon'];
+            }
+
+            $data['express_json'] = [];
+            if (!empty($data['goods_express_json'])) {
+                $goodsExpressJson = json_decode($data['goods_express_json'], true);
+                if (isset($goodsExpressJson['express']) && $goodsExpressJson['express'] == 'Y') {
+                    $data['express_json'][] = 'express';
+                }
+                if (isset($goodsExpressJson['self']) && $goodsExpressJson['self'] == 'Y') {
+                    $data['express_json'][] = 'self';
+                }
+                if (isset($goodsExpressJson['arrival']) && $goodsExpressJson['arrival'] == 'Y') {
+                    $data['express_json'][] = 'arrival';
+                }
+            }
+            // 详情表数据
+            if (!empty($data['goods_detail_specs_json'])) {
+                $specsJson = json_decode($data['goods_detail_specs_json'], true);
+                foreach ($specsJson as $itemSpecsJson) {
+                    if (isset($itemSpecsJson['key']) && $itemSpecsJson['key'] == '课时') {
+                        $data['curriculum']['period'] = $itemSpecsJson['val'];
+                    } elseif (isset($itemSpecsJson['key']) && $itemSpecsJson['key'] == '群体') {
+                        $data['curriculum']['group'] = $itemSpecsJson['val'];
+                    } elseif (isset($itemSpecsJson['key']) && $itemSpecsJson['key'] == '课程') {
+                        $data['curriculum']['course'] = $itemSpecsJson['val'];
+                    }
+                }
+            }
+
+            return json_success('', $data);
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            return json_fail("查询错误~");
+        }
+    }
+
+    /**
+     * @Desc 添加商品
+     * @Author Gorden
+     * @Date 2024/3/11 10:20
+     *
+     * @param $params
+     * @return Response
+     */
+    public static function insert($params): Response
+    {
+        Db::beginTransaction();
+        try {
+            $params['goods_id'] = "GD" . date('ymdHi') . random_string(4, 'up');
+            // 主表
+            self::mainInsert($params);
+            // 商品详情表
+            self::detailInsert($params);
+            // 商品标签表
+            self::labelInsert($params);
+            // 产品运行控制信息表
+            self::goodsRunningInsert($params);
+            // sku表
+            self::goodsSkuSet($params, 'insert');
+            // 待上架状态,上架时间大于当前时间
+            if ($params['goods_status'] == 'PENDING' && strtotime($params['goods_on_addtimes']) > time()) {
+                $redis = Redis::connection();
+                $key = date('YmdHi', strtotime($params['goods_on_addtimes']));
+                $redis->sAdd(Goods::LISTING_KEY_PREFIX . $key, $params['goods_id']);
+            }
+            // 自动下架
+            if (!empty($params['goods_running_off_type']) && $params['goods_running_off_type'] == 'T' && !empty($params['goods_off_addtimes'])) {
+                $redis = Redis::connection();
+                $key = Goods::LISTING_OFF_KEY_PREFIX . date('YmdHi', strtotime($params['goods_off_addtimes']));
+                $redis->sAdd($key, $params['goods_id']);
+            }
+            Db::commit();
+        } catch (\PDOException $e) {
+            Db::rollBack();
+            dump($e->getFile() . '(' . $e->getLine() . '):' . $e->getMessage());
+            return json_fail('数据写入失败~');
+        } catch (BusinessException $e) {
+            Db::rollBack();
+            dump($e->getFile() . '(' . $e->getLine() . '):' . $e->getMessage());
+            return json_fail($e->getMessage());
+        } catch (\Exception $e) {
+            Db::rollBack();
+            dump($e->getTrace());
+            return json_fail('数据写入失败~');
+        }
+
+        _syslog("添加商品", "商品名【" . $params['goods_name'] . "】");
+
+        return json_success('success');
+    }
+
+    public static function insertRecharge($params)
+    {
+        try {
+            Db::beginTransaction();
+            $goods = new Goods();
+            $goods->goods_id = "GD" . date('ymdHi') . random_string(4, 'up');
+            $goods->join_goods_category_id = 59;
+            $goods->goods_classify = 'RECHARGE';
+            $goods->goods_status = $params['goods_status'];
+            $goods->goods_sort = $params['goods_sort'];
+            $goods->goods_category = $params['goods_category'];
+            $goods->goods_name = $params['goods_name'];
+            $goods->goods_market_price = $params['goods_sales_price'];
+            $goods->goods_sales_price = $params['goods_sales_price'];
+            $goods->goods_sku_json = json_encode(['规格' => [$params['goods_sales_price'] . '元']]);
+            $goods->goods_attribute_json = json_encode(['added' => ['nbr' => $params['goods_rate'] / 100, 'mode' => 'rate'], 'min-count' => 1]);
+            $goods->goods_cover = '/images/app/common/null-service.png';
+            $goods->goods_process_json = json_encode(['mode' => 'do_shopping']);
+            $goods->goods_addtimes = time();
+            $goods->save();
+
+            $sku = new GoodsSku();
+            $sku->join_sku_goods_id = $goods->goods_id;
+            $sku->goods_sku_status = $params['goods_status'];
+            $sku->goods_sku_specs_json = json_encode(['规格' => $params['goods_sales_price'] . '元']);
+            $sku->goods_sku_market_price = $params['goods_sales_price'];
+            $sku->goods_sku_sales_price = $params['goods_sales_price'];
+            $sku->goods_sku_storage_json = json_encode(['storage' => 9999]);
+            $sku->save();
+
+            Db::commit();
+
+            return json_success('success');
+        } catch (\Exception $e) {
+
+            Db::rollBack();
+
+            return json_fail('添加充值产品失败');
+        }
+    }
+
+    public static function updateRecharge($params)
+    {
+        try {
+            Db::beginTransaction();
+            $goods = Goods::where('goods_id', $params['goods_id'])->first();
+            if (!$goods) {
+                return json_fail("数据异常");
+            }
+            $goods->goods_market_price = $params['goods_sales_price'];
+            $goods->goods_sales_price = $params['goods_sales_price'];
+            $goods->goods_status = $params['goods_status'];
+            $goods->goods_sku_json = json_encode(['规格' => [$params['goods_sales_price'] . '元']]);
+            $goods->goods_sort = $params['goods_sort'];
+            if (!empty($goods->goods_attribute_json)) {
+                $attributeJson = json_decode($goods->goods_attribute_json, true);
+                $attributeJson['added']['nbr'] = $params['goods_rate'] / 100;
+                $goods->goods_attribute_json = json_encode($attributeJson);
+            }
+            $goods->save();
+            $sku = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->where('goods_sku_status','ON')->first();
+            $sku->goods_sku_status = $params['goods_status'];
+            $sku->goods_sku_specs_json = json_encode(['规格' => $params['goods_sales_price'] . '元']);
+            $sku->goods_sku_market_price = $params['goods_sales_price'];
+            $sku->goods_sku_sales_price = $params['goods_sales_price'];
+            $sku->save();
+
+            Db::commit();
+
+            return json_success("success");
+        } catch (\Exception $e) {
+            Db::rollBack();
+            dump($e->getMessage());
+            return json_fail('编辑充值产品失败');
+        }
+    }
+
+    public static function insertPackage($params): Response
+    {
+        Db::beginTransaction();
+        try {
+            $params['goods_id'] = "GD" . date('ymdHi') . random_string(4, 'up');
+            // 主表
+            self::mainInsert($params);
+            // 商品详情表
+            self::detailInsert($params);
+            // 套包组件表
+            self::componentUpdate($params, 'insert');
+            // 商品标签表
+            self::labelInsert($params);
+            // 产品运行控制信息表
+            self::goodsRunningInsert($params);
+            // sku表
+//            self::goodsSkuSet($params, 'insert');
+            // 待上架状态,上架时间大于当前时间
+            if ($params['goods_status'] == 'PENDING' && strtotime($params['goods_on_addtimes']) > time()) {
+                $redis = Redis::connection();
+                $key = date('YmdHi', strtotime($params['goods_on_addtimes']));
+                $redis->sAdd(Goods::LISTING_KEY_PREFIX . $key, $params['goods_id']);
+            }
+            Db::commit();
+        } catch (\PDOException $e) {
+            Db::rollBack();
+            dump($e->getMessage());
+            return json_fail('数据写入失败~');
+        } catch (BusinessException $e) {
+            Db::rollBack();
+            dump($e->getMessage());
+            return json_fail($e->getMessage());
+        } catch (\Exception $e) {
+            Db::rollBack();
+            dump($e->getTrace());
+            return json_fail('数据写入失败~');
+        }
+
+        _syslog("添加套餐", "商品名【" . $params['goods_name'] . "】");
+
+        return json_success('success');
+    }
+
+    public static function update($params)
+    {
+        Db::beginTransaction();
+        try {
+            // 主表
+            self::mainUpdate($params);
+            // 商品详情表
+            self::detailUpdate($params);
+            // 商品标签表
+            self::labelUpdate($params);
+            // 产品运行控制信息表
+            self::goodsRunningUpdate($params);
+            // sku表
+            self::goodsSkuSet($params, 'update');
+
+            Db::commit();
+        } catch (BusinessException $e) {
+            Db::rollBack();
+            return json_fail($e->getMessage());
+        } catch (\Exception $e) {
+            Db::rollBack();
+            return json_fail('数据更新失败~');
+        }
+
+        _syslog("编辑商品", "商品名【" . $params['goods_name'] . "】" ?? "商品ID:【" . $params['goods_id'] . "】");
+
+        return json_success('success');
+    }
+
+    public static function changeStatus($params)
+    {
+        try {
+            Goods::where('goods_id', $params['goods_id'])->update(['goods_status' => $params['goods_status']]);
+
+            return json_success('修改成功');
+        } catch (\Exception $e) {
+            return json_fail('修改状态失败');
+        }
+    }
+
+
+    public static function updatePackage($params)
+    {
+        Db::beginTransaction();
+        try {
+            // 主表
+            self::mainUpdate($params);
+            // 商品详情表
+            self::detailUpdate($params);
+            // 套包组件表
+            self::componentUpdate($params, 'update');
+            // 商品标签表
+            self::labelUpdate($params);
+            // 产品运行控制信息表
+            self::goodsRunningUpdate($params);
+            // sku表
+            self::goodsSkuSet($params, 'update');
+
+            Db::commit();
+        } catch (BusinessException $e) {
+            Db::rollBack();
+            return json_fail($e->getMessage());
+        } catch (\Exception $e) {
+            Db::rollBack();
+            dump($e->getTrace());
+            return json_fail('数据更新失败~');
+        }
+        _syslog("编辑套餐", "商品名【" . $params['goods_name'] . "】" ?? "商品ID:【" . $params['goods_id'] . "】");
+
+        return json_success('success');
+    }
+
+    /**
+     * @Desc 删除商品
+     * @Author Gorden
+     * @Date 2024/3/28 13:20
+     *
+     * @param $ids
+     * @return Response
+     */
+    public static function delete($ids)
+    {
+        if (!$ids) {
+            return json_fail("数据错误~");
+        }
+        if (!is_array($ids)) {
+            $ids = [$ids];
+        }
+
+        $goods = Goods::whereIn('goods_id', $ids)->get()->toArray();
+        if (!$goods) {
+            return json_fail("数据错误~");
+        }
+
+        // 是否在套包里
+        if (GoodsComponent::whereIn('join_component_goods_id', $ids)->exists()) {
+            return json_fail("当前商品存在于套包中,请先在套包中删除");
+        }
+        // 是否已被购买过
+        if (OrderSheet::whereIn('join_sheet_goods_id', $ids)->exists()) {
+            return json_fail("当前商品已有购买历史,如不在APP显示,请选择【下架】操作");
+        }
+        // 是否预约过
+        if (Appointment::whereIn('join_appointment_goods_id', $ids)->exists()) {
+
+            return json_fail("当前商品已有预约历史,如不在APP显示,请选择【下架】操作");
+        }
+
+        Db::beginTransaction();
+        try {
+            Goods::whereIn('goods_id', $ids)->delete();
+            GoodsDetail::whereIn('join_detail_goods_id', $ids)->delete();
+            GoodsLabel::whereIn('join_label_goods_id', $ids)->delete();
+            GoodsRunning::whereIn('join_running_goods_id', $ids)->delete();
+            GoodsSku::whereIn('join_sku_goods_id', $ids)->delete();
+
+            Db::commit();
+
+            _syslog("删除商品 / 套餐", "ID:【" . implode(',', $ids) . "】", $goods);
+
+            return json_success("商品删除成功");
+        } catch (\Exception $e) {
+            Db::rollBack();
+
+            return json_fail("商品删除失败~");
+        }
+    }
+
+    /**
+     * @Desc 商品主表
+     * @Author Gorden
+     * @Date 2024/3/11 11:20
+     *
+     * @param $params
+     * @return mixed|string
+     * @throws BusinessException
+     */
+    public static function mainInsert($params)
+    {
+        if (!empty($params['goods_cover'])) {
+            $params['goods_cover'] = str_replace(getenv('STORAGE_DOMAIN'), '', $params['goods_cover']);
+        }
+        // 如果产品是待处理状态
+        if ($params['goods_status'] == 'PENDING') {
+            if (strtotime($params['goods_on_addtimes']) <= time()) {
+                $params['goods_status'] = 'ON';
+            }
+        }
+        $category = SysCategory::where('category_id', $params['join_goods_category_id'])->first();
+        if (!$category) {
+            throw new BusinessException("产品分类不存在~");
+        }
+        if (empty($params['goods_category'])) {
+            $params['goods_category'] = $category->category_classify;
+        }
+
+        try {
+            $model = new Goods();
+            $model->goods_id = $params['goods_id'];
+            $model->join_goods_category_id = $params['join_goods_category_id'] ?? 0;
+            $model->join_goods_supplier_id = $params['join_goods_supplier_id'] ?? 0;
+            $model->goods_classify = $params['goods_classify'] ?? '';
+            $model->goods_status = $params['goods_status'] ?? '';
+            $model->goods_category = $params['goods_category'] ?? '';
+//            $model->goods_prefix = $params['goods_prefix'] ?? 】($category->category_name ? '【' . $category->category_name . '' : '');
+            $model->goods_prefix = $params['goods_prefix'] ?? '';
+            $model->goods_name = $params['goods_name'];
+            $model->goods_market_price = $params['goods_market_price'] ?? 0;
+            $model->goods_sales_price = $params['goods_sales_price'] ?? 0;
+            $model->goods_sku_json = !empty($params['goods_sku_json_label']) ? json_encode($params['goods_sku_json_label']) : json_encode(['规格' => ['标准']]);
+            $model->goods_attribute_json = !empty($params['goods_attribute_json']) ? $params['goods_attribute_json'] : '[]';
+            $model->goods_title = $params['goods_title'] ?? '';
+            $model->goods_cover = $params['goods_cover'] ?? '';
+            $model->goods_on_addtimes = isset($params['goods_on_addtimes']) ? strtotime($params['goods_on_addtimes']) : null;
+            $model->goods_sort = $params['goods_sort'] ?? null;
+            $model->goods_groupby = $params['goods_groupby'] ?? '';
+            $model->goods_remark = $params['goods_remark'] ?? '';
+            $model->goods_extend_json = $params['goods_extend_json'] ?? '{}';
+            $model->is_support_appointment = $params['is_support_appointment'] ?? 'N';
+            $model->creator_user_id = JwtToken::getCurrentId();
+            $model->goods_addtimes = time();
+            $model->goods_updatetimes = time();
+            // {"express":"Y","self":"Y","arrival":"Y"}
+            $expressJson = [];
+            if (!empty($params['express_json'])) {
+                if (in_array('express', $params['express_json'])) {
+                    $expressJson['express'] = 'Y';
+                } else {
+                    $expressJson['express'] = 'N';
+                }
+                if (in_array('self', $params['express_json'])) {
+                    $expressJson['self'] = 'Y';
+                } else {
+                    $expressJson['self'] = 'N';
+                }
+                if (in_array('arrival', $params['express_json'])) {
+                    $expressJson['arrival'] = 'Y';
+                } else {
+                    $expressJson['arrival'] = 'N';
+                }
+
+                $model->goods_express_json = json_encode($expressJson);
+            }
+
+            if (!empty($params['is_support_appointment']) && $params['is_support_appointment'] == 'Y' && !empty($params['appointment_times']) && $params['goods_category'] != 'TRAVEL') {
+                $times = [];
+                $attributeJsonTimeArr = [];
+                $personTotal = 0;
+                foreach ($params['appointment_times'] as $time) {
+                    $attributeJsonTimeArr[] = strtotime(date('Y-m-d ') . $time['appointmentTimeStart']);
+                    $attributeJsonTimeArr[] = strtotime(date('Y-m-d ') . $time['appointmentTimeEnd']);
+                    $personTotal += $time['person'];
+                    $times[$time['appointmentTimeStart']] = [
+                        'person' => $time['person'],
+                        'duration' => $time['appointmentTimeStart'] . '-' . $time['appointmentTimeEnd']
+                    ];
+                }
+                $attributeJsonTime = date('H:i', min($attributeJsonTimeArr)) . '至' . date('H:i', max($attributeJsonTimeArr));
+
+                $newDates = [];
+                foreach ($params['dates'] as $date) {
+                    $key = self::$week[$date];
+                    $newDates[$key] = $date;
+                }
+                ksort($newDates);
+
+
+                $currentDate = current($newDates);
+                $lastDate = end($newDates);
+
+                $attributeJsonDate = '';
+                if (self::$week[$lastDate] - self::$week[$currentDate] + 1 > count($newDates)) {
+                    $attributeJsonDate = implode(',', $newDates);
+                } else if (self::$week[$lastDate] - self::$week[$currentDate] + 1 == count($newDates)) {
+                    $attributeJsonDate = $currentDate . '至' . $lastDate;
+                }
+
+                // if (isset($params['work_time'])){
+                //     $workTimeStart = date('H:i',strtotime($params['work_time'][0]));
+                //     $workTimeEnd = date('H:i',strtotime($params['work_time'][1]));
+                //     $attributeJsonTime = $workTimeStart.'至'.$workTimeEnd;
+                // }
+
+                $attributeJson = [
+                    'icon' => $model->goods_cover,
+                    'date' => $attributeJsonDate,
+                    // 'time' => $attributeJsonTime,
+                    'dates' => $newDates ? array_values($newDates) : [],
+                    'times' => $times,
+                    'person' => $personTotal
+                ];
+                // if(isset($params['address'])){
+                //     $attributeJson['address'] = $params['address'];
+                // }
+                // if (isset($params['min_count'])){
+                //     $attributeJson['min-count'] = $params['min_count'];
+                // }else{
+                //     $attributeJson['min-count'] = 1;
+                // }
+                // if (isset($params['teachers'])){
+                //     $attributeJson['teachers'] = $params['teachers'];
+                // }
+                if (!empty($params['appointment_label'])) {
+                    $attributeJson['label'] = $params['appointment_label'];
+                }
+                // if (!empty($params['address'])) {
+                //     $attributeJson['address'] = $params['address'];
+                // }
+                // if (!empty($params['position'])){
+                //     $attributeJson['position'] = $params['position'];
+                // }
+                // if (isset($params['goods_service_premises'])){
+                //     $attributeJson['service_premises_id'] = $params['goods_service_premises'];
+                // }
+                $model->goods_attribute_json = json_encode($attributeJson, JSON_UNESCAPED_UNICODE);
+
+//                $times = [];
+//                foreach ($params['appointment_times'] as $time) {
+//                    $times[$time['appointmentTimeStart']] = [
+//                        'person' => $time['person'],
+//                        'duration' => $time['appointmentTimeStart'] . '-' . $time['appointmentTimeEnd']
+//                    ];
+//                }
+//                $model->goods_attribute_json = json_encode([
+//                    'icon' => '',
+//                    'dates' => $params['dates'] ?? [],
+//                    'times' => $times
+//                ]);
+            }
+            if (!empty($params['is_support_appointment']) && $params['is_support_appointment'] == 'Y' && !empty($params['appointment_times']) && $params['goods_category'] == 'TRAVEL') {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['travel-day'] = $params['travel_day'];
+                $attributeJson['travel-begin'] = $params['travel_begin'];
+                $attributeJson['travel-night'] = $params['travel_night'];
+                $attributeJson['travel-trans'] = $params['travel_trans'];
+
+                $unixs = [];
+                foreach ($params['appointment_times'] as $times) {
+                    $unix = strtotime($times['days']);
+                    $unixs[$unix] = $times['person'];
+                }
+                ksort($unixs);
+                $months = [];
+                foreach ($unixs as $key => $unix) {
+                    $month = date('Ym', $key);
+                    $day = date('d', $key);
+                    $months[$month][$day] = $unix;
+                }
+                $attributeJson['month'] = $months;
+                $model->goods_attribute_json = json_encode($attributeJson, JSON_UNESCAPED_UNICODE);
+            }
+            if (!empty($params['goods_json']) && $params['join_goods_category_id'] == 65) {
+                $goodsJson = json_decode($params['goods_json'], true);
+//                foreach ($goodsJson as $key => $item) {
+//                    $goodsJson[$key]['color'] = hexToRgb($item['color']);
+//                }
+//
+                $model->goods_json = json_encode($goodsJson);
+            } elseif (!empty($params['goods_json']) && $params['join_goods_category_id'] == 43) {
+                $goodsJson = json_decode($params['goods_json'], true);
+                $newGoodsJson = [];
+                foreach ($goodsJson as $item1) {
+                    if (empty($item1['title'])) {
+                        continue;
+                    }
+                    $newItem1 = [];
+                    foreach ($item1['items'] as $item2) {
+                        $newParams = [];
+                        foreach ($item2['params'] as $param) {
+                            if (!empty($param[0]) || !empty($param[1])) {
+                                $newParams[] = $param;
+                            }
+                        }
+                        $newItem1['items'][$item2['key']] = $newParams;
+                    }
+                    $newItem1['service'] = $item1['service'] ?? '';
+                    $newGoodsJson[$item1['title']] = $newItem1;
+                }
+                $model->goods_json = json_encode($newGoodsJson);
+            } else {
+                $model->goods_json = '[]';
+            }
+
+            if (!empty($params['goods_premisses'])) {
+                $attributeJson = [];
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['premisses'] = $params['goods_premisses'];
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+
+            if (!empty($params['goods_theme_color']) && !empty($params['goods_theme_icon'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['bg'] = $params['goods_theme_color'];
+                $attributeJson['icon'] = str_replace(getenv('STORAGE_DOMAIN'), '', $params['goods_theme_icon']);
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (!empty($params['address'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['address'] = $params['address'];
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (!empty($params['position'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['position'] = $params['position'];
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (isset($params['goods_service_premises'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['service_premises_id'] = $params['goods_service_premises'];
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (isset($params['min_count'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['min-count'] = $params['min_count'];
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (isset($params['teachers'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $attributeJson['teachers'] = $params['teachers'];
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (isset($params['work_time'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+
+                $workTimeStart = date('H:i', strtotime($params['work_time'][0]));
+                $workTimeEnd = date('H:i', strtotime($params['work_time'][1]));
+                $attributeJsonTime = $workTimeStart . '至' . $workTimeEnd;
+
+                $attributeJson['time'] = $attributeJsonTime;
+                $model->goods_attribute_json = json_encode($attributeJson);
+            }
+            if (!empty($params['coupon_id']) && !empty($params['coupon_nbr'])) {
+                if (!empty($model->goods_attribute_json) && !is_array($model->goods_attribute_json)) {
+                    $attributeJson = json_decode($model->goods_attribute_json, true);
+                } elseif (empty($model->goods_attribute_json)) {
+                    $attributeJson = [];
+                }
+                $coupons = Coupon::whereIn('coupon_id', $params['coupon_id'])
+                    ->select('coupon_id', 'coupon_name')
+                    ->get()
+                    ->toArray();
+                $couponList = [];
+                foreach ($coupons as $coupon) {
+                    if (isset($params['coupon_nbr'][$coupon['coupon_id']])) {
+                        $couponList[$coupon['coupon_id']] = [
+                            'num' => $params['coupon_nbr'][$coupon['coupon_id']],
+                            'name' => $coupon['coupon_name']
+                        ];
+                    }
+                }
+                $attributeJson['coupon'] = $couponList;
+                $model->goods_attribute_json = json_encode($attributeJson, JSON_UNESCAPED_UNICODE);
+            }
+            if ($model->save()) {
+                return $model->goods_id;
+            }
+            // 异常
+            throw new BusinessException("数据写入失败~");
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            throw new BusinessException("数据写入失败~");
+        }
+    }
+
+    /**
+     * @Desc 详情表
+     * @Author Gorden
+     * @Date 2024/3/11 11:19
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function detailInsert($params)
+    {
+        if (!empty($params['goods_detail_slider_json'])) {
+            $params['goods_detail_slider_json'] = str_replace(getenv('STORAGE_DOMAIN'), '', $params['goods_detail_slider_json']);
+            $params['goods_detail_slider_json'] = json_encode(['slider' => $params['goods_detail_slider_json']]);
+        }
+
+        if (isset($params['curriculum'])) {
+            $params['goods_detail_specs_json'] = json_encode([
+                [
+                    'key' => '课时',
+                    'val' => $params['curriculum']['period'] ?? '',
+                ],
+                [
+                    'key' => '群体',
+                    'val' => $params['curriculum']['group'] ?? '',
+                ],
+                [
+                    'key' => '课程',
+                    'val' => $params['curriculum']['course'] ?? '',
+                ],
+            ]);
+        }
+        try {
+            $model = new GoodsDetail();
+            $model->join_detail_goods_id = $params['goods_id'];
+            $model->goods_detail_code_json = $params['goods_detail_code_json'] ?? '{}';
+            $model->goods_detail_slider_json = $params['goods_detail_slider_json'] ?? '{}';
+            $model->goods_detail_specs_json = $params['goods_detail_specs_json'] ?? '{}';
+            $model->goods_detail_content = $params['goods_detail_content'] ?? '';
+            if (!$model->save()) {
+                // 异常
+                throw new BusinessException("轮播图/详情数据写入失败~");
+            }
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            throw new BusinessException("轮播图/详情数据写入失败~");
+        }
+    }
+
+    public static function componentUpdate($params, $type = 'insert')
+    {
+        Db::beginTransaction();
+        try {
+            $goodsSku = '';
+            // 有先删除
+            if ($type == 'update') {
+                GoodsComponent::where('join_component_master_goods_id', $params['goods_id'])->delete();
+                $goodsSku = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->first();
+                if ($goodsSku) {
+                    $goodsSku->goods_sku_market_price = $params['goods_market_price'] ?? 0;
+                    $goodsSku->goods_sku_sales_price = $params['goods_sales_price'] ?? 0;
+                    $goodsSku->save();
+                }
+            }
+            if ($type == 'insert' || !$goodsSku) {
+                Goods::where('goods_id', $params['goods_id'])->update(['goods_sku_json' => '{"规格": ["标准"]}']);
+                $skuData = [
+                    'join_sku_goods_id' => $params['goods_id'],
+                    'goods_sku_status' => 'ON',
+                    'goods_sku_specs_json' => '{"规格": "标准"}',
+                    'goods_sku_title' => "标准" . $params['goods_name'],
+                    'goods_sku_market_price' => $params['goods_market_price'] ?? 0,
+                    'goods_sku_sales_price' => $params['goods_sales_price'] ?? 0,
+                ];
+                GoodsSku::insert($skuData);
+            }
+            $data = [];
+            foreach ($params['goods_content_list'] as $item) {
+                if (!in_array($item['goods_id'], $params['join_component_goods_id'])) {
+                    continue;
+                }
+                $goods = Goods::where('goods_id', $params['goods_id'])->first();
+                if (!$goods) {
+                    continue;
+                }
+
+                $data[] = [
+                    'join_component_master_goods_id' => $params['goods_id'],
+                    'join_component_goods_id' => $item['goods_id'] ?? '',
+                    'join_component_goods_sku_id' => $item['sku_id'] ?? '',
+                    'goods_component_price' => $item['goods_sales_price'] ?? '',
+                    'goods_component_cover' => $goods->goods_cover,
+                    'goods_component_json' => json_encode(['goods_name' => $item['goods_name'], 'nbr' => $item['nbr'], 'sku_id' => $item['sku_id'] ?? '']),
+                    'goods_component_addtimes' => time()
+                ];
+            }
+
+            if ($data) {
+                GoodsComponent::insert($data);
+            }
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollBack();
+            dump($e->getMessage());
+            throw new BusinessException("数据写入失败~");
+        }
+    }
+
+    /**
+     * @Desc 标签表
+     * @Author Gorden
+     * @Date 2024/3/11 11:32
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function labelInsert($params)
+    {
+        $model = new GoodsLabel();
+        $model->join_label_goods_id = $params['goods_id'];
+        $model->goods_label = $params['goods_label'] ? implode(',', $params['goods_label']) : '';
+        $model->goods_label_extend_json = !empty($params['goods_label_extend_json']) ? $params['goods_label_extend_json'] : '{}';
+        if (!$model->save()) {
+            // 异常
+            throw new BusinessException('数据写入失败~');
+        }
+    }
+
+    /**
+     * @Desc 产品运行控制信息表
+     * @Author Gorden
+     * @Date 2024/3/11 11:38
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function goodsRunningInsert($params)
+    {
+        try {
+            $model = new GoodsRunning();
+            $model->join_running_goods_id = $params['goods_id'];
+            $model->goods_running_storage = $params['goods_running_storage'] ?? 0;
+            $model->goods_running_sale = $params['goods_running_sale'] ?? 0;
+            $model->goods_running_off_type = !empty($params['goods_running_off_type']) ? $params['goods_running_off_type'] : '';
+            $model->goods_running_off_json = !empty($params['goods_running_off_type']) && $params['goods_running_off_type'] == 'T' && !empty($params['goods_off_addtimes']) ? json_encode(['time' => strtotime($params['goods_off_addtimes'])]) : '[]';
+            if (!$model->save()) {
+                throw new BusinessException('数据写入失败');
+            }
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            throw new BusinessException('数据写入失败');
+        }
+    }
+
+    /**
+     * @Desc SKU
+     * @Author Gorden
+     * @Date 2024/3/11 12:01
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function skuInsert($params)
+    {
+        $model = new GoodsSku();
+        $model->join_sku_goods_id = $params['goods_id'];
+        $model->goods_sku_status = $params['goods_sku_status'];
+        $model->goods_sku_specs_json = $params['goods_sku_specs_json'];
+        $model->goods_sku_title = $params['goods_sku_title'];
+        $model->goods_sku_images_json = $params['goods_sku_images_json'];
+        $model->goods_sku_content = $params['goods_sku_content'];
+        $model->goods_sku_market_price = $params['goods_sku_market_price'];
+        $model->goods_sku_sales_price = $params['goods_sku_sales_price'];
+        $model->goods_sku_storage_json = $params['goods_sku_storage_json'];
+        $model->goods_sku_service_json = $params['goods_sku_service_json'];
+        $model->goods_sku_extend_json = $params['goods_sku_extend_json'];
+        if (!$model->save()) {
+            throw new BusinessException('规格数据写入失败~');
+        }
+    }
+
+    /**
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/3/12 8:44
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function mainUpdate($params)
+    {
+        try {
+            $data = self::inputFilter($params, new Goods());
+            if (!empty($data['goods_cover'])) {
+                $data['goods_cover'] = str_replace(getenv('STORAGE_DOMAIN'), '', $data['goods_cover']);
+            }
+            $data['goods_on_addtimes'] = isset($data['goods_on_addtimes']) ? strtotime($data['goods_on_addtimes']) : 0;
+            $data['goods_sku_json'] = !empty($params['goods_sku_json_label']) ? json_encode($params['goods_sku_json_label']) : json_encode(['规格' => ['标准']]);
+
+            $row = Goods::find($data['goods_id']);
+            if ($row->join_goods_category_id != $data['join_goods_category_id']) {
+                $category = SysCategory::where('category_id', $params['join_goods_category_id'])->first();
+                if (!$category) {
+                    throw new BusinessException("产品分类不存在~");
+                }
+                $data['goods_category'] = $category->category_classify ?? '';
+                $data['goods_prefix'] = $data['goods_prefix'] ?? ($category->category_name ? '【' . $category->category_name . '】' : '');
+            }
+
+            $expressJson = [];
+            if (!empty($params['express_json'])) {
+                if (in_array('express', $params['express_json'])) {
+                    $expressJson['express'] = 'Y';
+                } else {
+                    $expressJson['express'] = 'N';
+                }
+                if (in_array('self', $params['express_json'])) {
+                    $expressJson['self'] = 'Y';
+                } else {
+                    $expressJson['self'] = 'N';
+                }
+                if (in_array('arrival', $params['express_json'])) {
+                    $expressJson['arrival'] = 'Y';
+                } else {
+                    $expressJson['arrival'] = 'N';
+                }
+
+                $data['goods_express_json'] = json_encode($expressJson);
+            }
+            $attributeJson = [];
+            if (!empty($row->goods_attribute_json)) {
+                $attributeJson = json_decode($row->goods_attribute_json, true);
+            }
+            if (!empty($params['coupon_id']) && !empty($params['coupon_nbr'])) {
+                $coupons = Coupon::whereIn('coupon_id', $params['coupon_id'])
+                    ->select('coupon_id', 'coupon_name')
+                    ->get()
+                    ->toArray();
+                $couponList = [];
+                foreach ($coupons as $coupon) {
+                    if (isset($params['coupon_nbr'][$coupon['coupon_id']])) {
+                        $couponList[$coupon['coupon_id']] = [
+                            'num' => $params['coupon_nbr'][$coupon['coupon_id']],
+                            'name' => $coupon['coupon_name']
+                        ];
+                    }
+                }
+                $attributeJson['coupon'] = $couponList;
+            }
+            if (!empty($params['attribute_account'])){
+                $attributeJson['account'] = $params['attribute_account'];
+            }
+            if (!empty($params['attribute_control'])){
+                $attributeJson['control'] = $params['attribute_control'];
+            }
+
+            $data['goods_attribute_json'] = json_encode($attributeJson, JSON_UNESCAPED_UNICODE);
+
+            foreach ($data as $key => $val) {
+                $row->{$key} = $val;
+            }
+            $row->goods_updatetimes = time();
+            $row->save();
+        } catch (BusinessException $e) {
+            throw new BusinessException($e->getMessage());
+        } catch (\Exception $e) {
+            dump($e->getTrace());
+            throw new BusinessException('数据更新异常~1');
+        }
+    }
+
+    /**
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/3/12 9:57
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function detailUpdate($params)
+    {
+        try {
+            $data = self::inputFilter($params, new GoodsDetail());
+            if (!empty($data['goods_detail_slider_json'])) {
+                $data['goods_detail_slider_json'] = str_replace(getenv('STORAGE_DOMAIN'), '', $data['goods_detail_slider_json']);
+                $data['goods_detail_slider_json'] = json_encode(['slider' => $data['goods_detail_slider_json']]);
+            }
+            if (isset($params['curriculum'])) {
+                $data['goods_detail_specs_json'] = json_encode([
+                    [
+                        'key' => '课时',
+                        'val' => $params['curriculum']['period'] ?? '',
+                    ],
+                    [
+                        'key' => '群体',
+                        'val' => $params['curriculum']['group'] ?? '',
+                    ],
+                    [
+                        'key' => '课程',
+                        'val' => $params['curriculum']['course'] ?? '',
+                    ],
+                ]);
+            }
+            // 根据goods_id 查详情ID
+            $detail = GoodsDetail::where('join_detail_goods_id', $params['goods_id'])->first();
+            if ($detail) {
+                self::doUpdate($detail->join_detail_goods_id, $data, new GoodsDetail());
+            } else {
+                $data['join_detail_goods_id'] = $params['goods_id'];
+                GoodsDetail::insert($data);
+            }
+        } catch (BusinessException $e) {
+            throw new BusinessException($e->getMessage());
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            throw new BusinessException('轮播图/详情数据更新异常~');
+        }
+    }
+
+    /**
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/3/12 9:58
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function labelUpdate($params)
+    {
+        try {
+            $data = self::inputFilter($params, new GoodsLabel());
+            // 根据goods_id 查详情ID
+            $detail = GoodsLabel::where('join_label_goods_id', $params['goods_id'])->first();
+            if ($detail) {
+                self::doUpdate($detail->goods_label_id, $data, new GoodsLabel());
+            } else {
+                $data['join_label_goods_id'] = $params['goods_id'];
+                GoodsLabel::insert($data);
+            }
+        } catch (BusinessException $e) {
+            throw new BusinessException($e->getMessage());
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            throw new BusinessException('数据更新异常~3');
+        }
+    }
+
+    /**
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/3/12 9:59
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function goodsRunningUpdate($params)
+    {
+        try {
+            $data = self::inputFilter($params, new GoodsRunning());
+            // 根据goods_id 查详情ID
+            $detail = GoodsRunning::where('join_running_goods_id', $params['goods_id'])->first();
+            if (!empty($params['goods_running_off_type']) && $params['goods_running_off_type'] == 'T') {
+                $redis = Redis::connection();
+                if (!empty($detail->goods_running_off_json)) {
+                    $goodsRunningOffJson = json_decode($detail->goods_running_off_json, true);
+                    if (isset($goodsRunningOffJson['time'])) {
+                        $oldKey = Goods::LISTING_OFF_KEY_PREFIX . date('YmdHi', $goodsRunningOffJson['time']);
+                        $goodsRunningOffJson['time'] = strtotime($params['goods_off_addtimes']);
+                        $data['goods_running_off_json'] = json_encode($goodsRunningOffJson);
+                        // 有老的下架时间,删除老的
+                        $redis->srem($oldKey, $params['goods_id']);
+                    } else {
+                        $goodsRunningOffJson['time'] = strtotime($params['goods_off_addtimes']);
+                        $data['goods_running_off_json'] = json_encode($goodsRunningOffJson);
+                    }
+                } else {
+                    $data['goods_running_off_json'] = json_encode(['time' => strtotime($params['goods_off_addtimes'])]);
+                }
+                // 加入自动下架
+                $newKey = Goods::LISTING_OFF_KEY_PREFIX . date('YmdHi', strtotime($params['goods_off_addtimes']));
+                $redis->sAdd($newKey, $params['goods_id']);
+
+            } else if (!empty($params['goods_running_off_type']) && !empty($detail->goods_running_off_type) && $params['goods_running_off_type'] == 'H' && $detail->goods_running_off_type == 'T') {
+                $goodsRunningOffJson = json_decode($detail->goods_running_off_json, true);
+                if (isset($goodsRunningOffJson['time'])) {
+                    $oldKey = Goods::LISTING_OFF_KEY_PREFIX . date('YmdHi', $goodsRunningOffJson['time']);
+                    $redis = Redis::connection();
+                    $redis->srem($oldKey, $params['goods_id']);
+                }
+            }
+            if ($detail) {
+                self::doUpdate($detail->join_running_goods_id, $data, new GoodsRunning());
+            } else {
+                // 兼容老数据……
+                $data['join_running_goods_id'] = $params['goods_id'];
+                GoodsRunning::insert($data);
+            }
+
+        } catch (BusinessException $e) {
+            throw new BusinessException($e->getMessage());
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            throw new BusinessException('数据更新异常~');
+        }
+    }
+
+    /**
+     * @Desc sku 设置
+     * @Author Gorden
+     * @Date 2024/4/10 10:43
+     *
+     * @param $params
+     * @return void
+     * @throws BusinessException
+     */
+    public static function goodsSkuSet($params, $operation = 'insert')
+    {
+        try {
+            Db::beginTransaction();
+            $skusOldIds = [];
+            if ($operation == 'update') {
+                // 查出所有的
+                $skusOldIds = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->pluck('goods_sku_id', 'goods_sku_id');
+
+                // 删掉原有的
+//                GoodsSku::where('join_sku_goods_id', $params['goods_id'])->delete();
+            }
+            if (empty($skusOldIds) && empty($params['goods_sku_json_value'])) {
+                $skuData = [
+                    'join_sku_goods_id' => $params['goods_id'],
+                    'goods_sku_status' => 'ON',
+                    'goods_sku_specs_json' => '{"规格": "标准"}',
+                    'goods_sku_title' => "标准" . $params['goods_name'],
+                    'goods_sku_market_price' => $params['goods_market_price'] ?? 0,
+                    'goods_sku_sales_price' => $params['goods_sales_price'] ?? 0,
+                ];
+                GoodsSku::insert($skuData);
+            }
+            // 入新的
+            if (!empty($params['goods_sku_json_value'])) {
+                foreach ($params['goods_sku_json_value'] as $item) {
+                    $skus = explode(',', $item['sku']);
+                    $skuArr = [];
+                    for ($i = 1; $i <= count($skus); $i++) {
+                        $skuName = "skuName" . $i;
+                        $key = $item[$skuName];
+                        $skuArr[$key] = $skus[$i - 1];
+                    }
+                    $specsJson = json_encode($skuArr);
+                    $skuTitle = str_replace('-', ',', $item['sku']) . $params['goods_name'];
+                    if ($operation == 'update' && !empty($item['sku_id'])) {
+                        $model = GoodsSku::where('goods_sku_id', $item['sku_id'])->where('goods_sku_status','ON')->first();
+                        if (!$model) {
+                            $model = new GoodsSku();
+                        } else {
+                            unset($skusOldIds[$model->goods_sku_id]);
+                        }
+                    } else {
+                        $model = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->where('goods_sku_status','ON')->where('goods_sku_title', $skuTitle)->first();
+                        if (!$model) {
+                            $model = new GoodsSku();
+                        } else {
+                            unset($skusOldIds[$model->goods_sku_id]);
+                        }
+
+                    }
+
+                    $model->join_sku_goods_id = $params['goods_id'];
+                    $model->goods_sku_status = $params['goods_status'];
+                    $model->goods_sku_specs_json = $specsJson;
+                    $model->goods_sku_title = $skuTitle;
+                    $model->goods_sku_market_price = $params['goods_market_price'] ?? 0;
+                    $model->goods_sku_sales_price = $item['price'];
+                    $model->goods_sku_storage_json = json_encode(['storage' => $item['stock']]);
+                    $model->save();
+
+                }
+            }
+            if ($operation == 'update' && !empty($skusOldIds)) {
+                // GoodsSku::whereIn('goods_sku_id', $skusOldIds)->delete();
+                GoodsSku::whereIn('goods_sku_id', $skusOldIds)->update(['goods_sku_status' => 'DISABLED']);
+            }
+
+            Db::commit();
+        } catch (\Exception $e) {
+            dump($e->getTrace());
+            Db::rollBack();
+
+            throw new BusinessException('规格数据更新异常~');
+        }
+    }
+
+    /**
+     * @Desc
+     * @Author Gorden
+     * @Date 2024/3/12 8:45
+     *
+     * @param array $data
+     * @param $model
+     * @return array
+     * @throws BusinessException
+     */
+    private static function inputFilter(array $data, $model): array
+    {
+        $table = config('database.connections.mysql.prefix') . $model->getTable();
+        $allow_column = $model->getConnection()->select("desc `$table`");
+        if (!$allow_column) {
+            throw new BusinessException('表不存在', 2);
+        }
+        $columns = array_column($allow_column, 'Type', 'Field');
+        foreach ($data as $col => $item) {
+            if (!isset($columns[$col])) {
+                unset($data[$col]);
+                continue;
+            }
+            // 非字符串类型传空则为null
+            if ($item === '' && strpos(strtolower($columns[$col]), 'varchar') === false && strpos(strtolower($columns[$col]), 'text') === false) {
+                $data[$col] = null;
+            }
+            if (is_array($item)) {
+                $data[$col] = implode(',', $item);
+            }
+            if ($item != '' && (strpos(strtolower($columns[$col]), 'varchar') || strpos(strtolower($columns[$col]), 'text'))) {
+//                $data[$col] = htmlspecialchars($item);
+            }
+        }
+        if (empty($data['created_at'])) {
+            unset($data['created_at']);
+        }
+        if (empty($data['updated_at'])) {
+            unset($data['updated_at']);
+        }
+        return $data;
+    }
+
+    /**
+     * @Desc 执行更新
+     * @Author Gorden
+     * @Date 2024/3/12 8:43
+     *
+     * @param $id
+     * @param $data
+     * @param $model
+     * @return void
+     */
+    private static function doUpdate($id, $data, $model)
+    {
+        $row = $model->find($id);
+        foreach ($data as $key => $val) {
+            $row->{$key} = $val;
+        }
+        $row->save();
+    }
+
+    /**
+     * @Desc 上架定时
+     * @Author Gorden
+     * @Date 2024/4/11 15:13
+     *
+     * @return void
+     */
+    public static function checkListing()
+    {
+        $key = Goods::LISTING_KEY_PREFIX . date('YmdHi');
+        $redis = Redis::connection();
+        if (!$redis->exists($key)) {
+            return;
+        }
+
+        $goodsIds = $redis->sMembers($key);
+        if (Goods::whereIn('goods_id', $goodsIds)->update(['goods_status' => 'ON'])) {
+            $redis->del($key);
+        }
+    }
+
+    /**
+     * @Desc 自动下架
+     * @Author Gorden
+     * @Date 2024/4/26 15:26
+     *
+     * @return void
+     */
+    public static function checkOffListing()
+    {
+        $key = Goods::LISTING_OFF_KEY_PREFIX . date('YmdHi');
+        $redis = Redis::connection();
+        if (!$redis->exists($key)) {
+            return;
+        }
+
+        $goodsIds = $redis->sMembers($key);
+        if (Goods::whereIn('goods_id', $goodsIds)->update(['goods_status' => 'OFF'])) {
+            $redis->del($key);
+        }
+    }
+
+    public static $week = [
+        '周一' => 1,
+        '周二' => 2,
+        '周三' => 3,
+        '周四' => 4,
+        '周五' => 5,
+        '周六' => 6,
+        '周日' => 7,
+    ];
+}

+ 25 - 5
app/admin/service/member/MemberService.php

@@ -898,7 +898,7 @@ class MemberService
 
         $info = PayDetail::where(function ($query) use ($memberId) {
             $query->where('join_pay_member_id', $memberId)
-                ->whereIn('pay_category', ['RECHARGE','PARTNER'])
+                ->whereIn('pay_category', ['RECHARGE', 'PARTNER'])
                 ->where('pay_prepayid', '<>', $memberId . '-WELFARE')
                 ->where('pay_status', 'SUCCESS');
         })->orWhere(function ($query) use ($memberId) {
@@ -912,9 +912,9 @@ class MemberService
 //        dump($info);
         $data = [];
         foreach ($info as $key => $item) {
-            if ($item['pay_category'] == 'PARTNER'){
-                $payObjectJson = json_decode($item['join_pay_object_json'],true);
-                if (!Order::where('order_id',$payObjectJson['order_id'])->where('order_is_complete','Y')->exists()){
+            if ($item['pay_category'] == 'PARTNER') {
+                $payObjectJson = json_decode($item['join_pay_object_json'], true);
+                if (!Order::where('order_id', $payObjectJson['order_id'])->where('order_is_complete', 'Y')->exists()) {
                     continue;
                 }
             }
@@ -977,7 +977,7 @@ class MemberService
                 continue;
             }
 
-            if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE', 'PARTNER','COMBINE'])) {
+            if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE', 'PARTNER', 'COMBINE'])) {
                 if (!empty($item['pay_extend_json'])) {
                     $extendJson = json_decode($item['pay_extend_json'], true);
                     if (isset($extendJson['added_amount']) && floatval($extendJson['added_amount']) > 0) {
@@ -1559,4 +1559,24 @@ class MemberService
             return $code;
         }
     }
+
+    /**
+     * @Desc 获取身份-合伙人,推荐官
+     * @Author Gorden
+     * @Date 2024/9/28 13:41
+     *
+     * @param $isPartner
+     * @param $isReferrer
+     * @return string
+     */
+    public static function getIdentity($isPartner, $isReferrer)
+    {
+        if ($isPartner == 'Y'){
+            return "PARTNER";
+        }elseif ($isReferrer == 'Y'){
+            return "REFERRER";
+        }else{
+            return 'NON';
+        }
+    }
 }

+ 81 - 0
app/admin/service/order/CommissionService.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace app\admin\service\order;
+
+use app\admin\service\member\MemberService;
+use app\model\Member;
+use app\model\MemberAccount;
+use app\model\MemberAccountList;
+use support\Log;
+
+class CommissionService
+{
+
+    public static function commission($config, $memberId, $orderId, $amount, $accountListCategory)
+    {
+        Log::info("开始处理提成", ['config' => $config, 'member_id' => $memberId, 'amount' => $amount]);
+        try {
+            $member = Member::where('member_id', $memberId)->first();
+            if (!empty($member->join_invite_member_id)) {
+                $member1 = Member::where('member_id', $member->join_invite_member_id)->first();
+                if (!empty($member1->join_invite_member_id)) {
+                    $member2 = Member::where('member_id', $member1->join_invite_member_id)->first();
+                }
+            }
+            // 提成记录JSON
+            $accountListJson = [
+                'line' => 'relate-consum',
+                'amount' => $amount,
+                'order_id' => $orderId,
+                'master_member_id' => $memberId
+            ];
+            // 直属提成
+            if (!empty($member1) && ($member1->member_is_partner == 'Y' || $member1->member_is_referrer == 'Y')) {
+                $accountListJson['identity'] = MemberService::getIdentity($member1->member_is_partner, $member1->member_is_referrer);
+                $member1CommissionAmount = $config['commission']['direct'] * $amount;
+                self::commissionToMember($member1->member_id, $accountListJson, $member1CommissionAmount, $accountListCategory);
+
+            }
+            // 间属提成
+            if (!empty($member2) && ($member2->member_is_partner == 'Y' || $member2->member_is_referrer == 'Y')) {
+                $accountListJson['identity'] = MemberService::getIdentity($member2->member_is_partner, $member2->member_is_referrer);
+                $member2CommissionAmount = $config['commission']['direct'] * $amount;
+                self::commissionToMember($member2->member_id, $accountListJson, $member2CommissionAmount, $accountListCategory);
+
+            }
+        } catch (\Exception $e) {
+
+        }
+    }
+
+    /**
+     * @Desc 提成到账户
+     * @Author Gorden
+     * @Date 2024/9/25 15:14
+     *
+     * @param $memberId
+     * @param $accountListJson
+     * @param $money
+     * @return void
+     */
+    private static function commissionToMember($memberId, $accountListJson, $money, $accountListCategory)
+    {
+        $account = MemberAccount::where('join_account_member_id', $memberId)->where('member_account_classify', 'CASH')->first();
+        $account->member_account_income = $account->member_account_income + $money;
+        $account->member_account_surplus = $account->member_account_surplus + $money;
+        $account->save();
+
+        MemberAccountList::insert([
+            'join_list_member_account_nbr' => $memberId . '-CASH',
+            'join_member_account_list_member_id' => $memberId,
+            'member_account_list_status' => 'ACTIVED',
+            'member_account_list_attr' => 'IN',
+            'member_account_list_classify' => $accountListJson['identity'],
+            'member_account_list_category' => $accountListCategory,
+            'member_account_list_datetime' => date('Y-m-d H:i:s'),
+            'member_account_list_amount' => $money,
+            'member_account_list_json' => json_encode($accountListJson),
+            'member_account_list_addtimes' => time()
+        ]);
+    }
+}

+ 3 - 2
app/admin/service/order/OrderService.php

@@ -318,7 +318,8 @@ class OrderService
                 $result = self::findAlipay($params['orderGroupId'], 0);
             } catch (\Exception $e) {
                 $log->error("ALIPAY", ['msg' => $e->getMessage()]);
-                throw new BusinessException("支付失败");
+                throw new BusinessException("支付失败:".$e->getMessage());
+//                $result['key'] = 'value';
             }
 
             try {
@@ -405,7 +406,7 @@ class OrderService
     {
         foreach ($params['goodsContentList'] as $goods) {
             // 减库存,规格和总库存
-            if (!isset($params['submit_goods_classify']) || !in_array($params['submit_goods_classify'], ['MEALS', 'PACKAGE','COMBINE'])) {
+            if (!isset($params['submit_goods_classify']) || !in_array($params['submit_goods_classify'], ['MEALS', 'PACKAGE', 'COMBINE'])) {
                 $goodsSku = GoodsSku::where('goods_sku_id', $goods['sku_id'])->first();
                 $skuStorageJson = json_decode($goodsSku->goods_sku_storage_json, true);
                 if (isset($skuStorageJson['storage']) && !empty($skuStorageJson['storage'])) {

+ 46 - 46
app/event/order/CommissionEvent.php

@@ -46,52 +46,52 @@ class CommissionEvent
     public function order($params)
     {
         // 提成设置
-//        $config = SysConfig::where('config_key', 'app-identity-partner-config')->first();
-//        $configParams = json_decode($config->config_value_json, true);
-//        Db::beginTransaction();
-//        try {
-//            $order = Order::where('order_id', $params['orderId'])->where('order_status_payment', 'SUCCESS')->first();
-//            // 有传过来的
-//            if (!empty($params['join_invite_member_id'])) {
-//                $inviteMemberId = $params['join_invite_member_id'];
-//            } else {
-//                // 下单人
-//                $member = Member::where('member_id', $order->join_order_member_id)->first();
-//                if (empty($member->join_invite_member_id)) {
-//                    throw new BusinessException("没有直属上级");
-//                }
-//                $inviteMemberId = $member->join_invite_member_id;
-//            }
-//            // 上级
-//            $memberUp = Member::where('member_id', $inviteMemberId)->first();
-//            if ($memberUp->member_is_partner == 'Y') {
-//                $identity = 'PARTNER';
-//            } elseif ($memberUp->member_is_referrer == 'Y') {
-//                $identity = 'REFERRER';
-//            }else{
-//                throw new BusinessException("直属上级非合伙人或者推荐官");
-//            }
-//            // 记录的JSON
-//            $accountListJson = [
-//                'line' => 'relate-consum',
-//                'amount' => $order->order_amount_pay,
-//                'identity' => $identity,
-//                'order_id' => $order->order_id,
-//                'master_member_id' => $order->join_order_member_id
-//            ];
-//            // 提成
-//            $this->commissionToMember($inviteMemberId, $accountListJson, round($configParams['commission']['relate-consum'] * $order->order_amount_pay, 2), '消费');
-//
-//            Db::commit();
-//            _syslog("提成", "计算提成成功");
-//        } catch (BusinessException $e) {
-//            Db::rollBack();
-//            _syslog("提成", "计算提成失败:" . $e->getMessage());
-//        } catch (\Exception $e) {
-//            dump($e->getMessage());
-//            Db::rollBack();
-//            _syslog("提成", "计算提成失败");
-//        }
+        $config = SysConfig::where('config_key', 'app-identity-partner-config')->first();
+        $configParams = json_decode($config->config_value_json, true);
+        Db::beginTransaction();
+        try {
+            $order = Order::where('order_id', $params['orderId'])->where('order_status_payment', 'SUCCESS')->first();
+            // 有传过来的
+            if (!empty($params['join_invite_member_id'])) {
+                $inviteMemberId = $params['join_invite_member_id'];
+            } else {
+                // 下单人
+                $member = Member::where('member_id', $order->join_order_member_id)->first();
+                if (empty($member->join_invite_member_id)) {
+                    throw new BusinessException("没有直属上级");
+                }
+                $inviteMemberId = $member->join_invite_member_id;
+            }
+            // 上级
+            $memberUp = Member::where('member_id', $inviteMemberId)->first();
+            if ($memberUp->member_is_partner == 'Y') {
+                $identity = 'PARTNER';
+            } elseif ($memberUp->member_is_referrer == 'Y') {
+                $identity = 'REFERRER';
+            }else{
+                throw new BusinessException("直属上级非合伙人或者推荐官");
+            }
+            // 记录的JSON
+            $accountListJson = [
+                'line' => 'relate-consum',
+                'amount' => $order->order_amount_pay,
+                'identity' => $identity,
+                'order_id' => $order->order_id,
+                'master_member_id' => $order->join_order_member_id
+            ];
+            // 提成
+            $this->commissionToMember($inviteMemberId, $accountListJson, round($configParams['commission']['relate-consum'] * $order->order_amount_pay, 2), '消费');
+
+            Db::commit();
+            _syslog("提成", "计算提成成功");
+        } catch (BusinessException $e) {
+            Db::rollBack();
+            _syslog("提成", "计算提成失败:" . $e->getMessage());
+        } catch (\Exception $e) {
+            dump($e->getMessage());
+            Db::rollBack();
+            _syslog("提成", "计算提成失败");
+        }
     }
 
     /**

+ 95 - 85
app/event/order/NewCustomerEvent.php

@@ -10,6 +10,7 @@ use app\model\Member;
 use app\model\MemberAccount;
 use app\model\PayDetail;
 use app\model\SysSerial;
+use support\Db;
 use support\exception\BusinessException;
 use support\Log;
 
@@ -17,104 +18,113 @@ class NewCustomerEvent
 {
     public function grant($params)
     {
-        Log::info("进入新客专享事件", $params);
-        // 余额账户
-        $memberAccount = MemberAccount::where('join_account_member_id', $params['member_id'])->where('member_account_classify', 'CASH')->first();
-        // 分期付款
-        if (isset($params['order_amount_paid']) && $params['order_amount_paid'] > 0) {
-            $params['order_amount_pay'] = $params['order_amount_paid'] + $params['order_amount_pay'];
-        }
+        Db::beginTransaction();
+        try {
+            Log::info("进入新客专享事件", $params);
+            // 余额账户
+            $memberAccount = MemberAccount::where('join_account_member_id', $params['member_id'])->where('member_account_classify', 'CASH')->first();
+            // 分期付款
+            if (isset($params['order_amount_paid']) && $params['order_amount_paid'] > 0) {
+                $params['order_amount_pay'] = $params['order_amount_paid'] + $params['order_amount_pay'];
+            }
 
-        //发放优惠券
-        $goods = Goods::where('goods_id', $params['join_sheet_goods_id'])->select('goods_attribute_json')->first();
-        if (!empty($goods) && !empty($goods->goods_attribute_json)) {
-            $goodsAttributeJson = json_decode($goods->goods_attribute_json, true);
-            if (isset($goodsAttributeJson['account'])) {
-                $memberAccount->member_account_income = $memberAccount->member_account_income + $goodsAttributeJson['account']['amount'];
-                $memberAccount->member_account_surplus = $memberAccount->member_account_surplus + $goodsAttributeJson['account']['amount'];
-                $memberAccount->save();
+            //发放优惠券
+            $goods = Goods::where('goods_id', $params['join_sheet_goods_id'])->select('goods_attribute_json')->first();
+            if (!empty($goods) && !empty($goods->goods_attribute_json)) {
+                $goodsAttributeJson = json_decode($goods->goods_attribute_json, true);
+                if (isset($goodsAttributeJson['account'])) {
+                    $memberAccount->member_account_income = $memberAccount->member_account_income + $goodsAttributeJson['account']['amount'];
+                    $memberAccount->member_account_surplus = $memberAccount->member_account_surplus + $goodsAttributeJson['account']['amount'];
+                    $memberAccount->save();
 
-                Log::info("余额账户入账:" . $goodsAttributeJson['account']['amount']);
+                    Log::info("余额账户入账:" . $goodsAttributeJson['account']['amount']);
 
-                // PayDetail 里写条充值记录
-                PayDetail::insert([
-                    'join_pay_member_id' => $params['member_id'],
-                    'join_pay_order_id' => 'COMBINE',
-                    'join_pay_object_json' => json_encode([
-                        'recharge_config' => ['nbr' => 0],
-                        'recharge_goods_id' => $goods->goods_id,
-                        'recharge_goods_name' => $goods->goods_name
-                    ]),
-                    'pay_status' => 'SUCCESS',
-                    'pay_category' => 'RECHARGE',
-                    'pay_amount' => $goodsAttributeJson['account']['amount'],
-                    'pay_paytimes' => date('Y-m-d H:i:s'),
-                    'pay_prepayid' => $params['member_id'] . '-CASH',
-                    'pay_json_request' => '[]',
-                    'pay_json_response' => '[]',
-                    'pay_extend_json' => '[]',
-                    'pay_addtimes' => time()
-                ]);
-            }
-            if (!empty($goodsAttributeJson['coupon'])) {
-                foreach ($goodsAttributeJson['coupon'] as $key => $coupon) {
-                    $couponModel = Coupon::where('coupon_id', $key)->select('coupon_id', 'coupon_validdate_day', 'coupon_validdate_end', 'coupon_is_period', 'coupon_number')->first();
-                    if (empty($couponModel)) {
-                        continue;
-                    }
-                    // 券是否过期
-                    if (!empty($couponModel->coupon_validdate_end) && strtotime($couponModel->coupon_validdate_end) < time()) {
-                        continue;
-                    }
-                    // 发周期券
-                    if ($couponModel->coupon_is_period == 'Y') {
+                    // PayDetail 里写条充值记录
+                    PayDetail::insert([
+                        'join_pay_member_id' => $params['member_id'],
+                        'join_pay_order_id' => 'COMBINE',
+                        'join_pay_object_json' => json_encode([
+                            'recharge_config' => ['nbr' => 0],
+                            'recharge_goods_id' => $goods->goods_id,
+                            'recharge_goods_name' => $goods->goods_name
+                        ]),
+                        'pay_status' => 'SUCCESS',
+                        'pay_category' => 'RECHARGE',
+                        'pay_amount' => $goodsAttributeJson['account']['amount'],
+                        'pay_paytimes' => date('Y-m-d H:i:s'),
+                        'pay_prepayid' => $params['member_id'] . '-CASH',
+                        'pay_json_request' => '[]',
+                        'pay_json_response' => '[]',
+                        'pay_extend_json' => '[]',
+                        'pay_addtimes' => time()
+                    ]);
+                }
+                if (!empty($goodsAttributeJson['coupon'])) {
+                    foreach ($goodsAttributeJson['coupon'] as $key => $coupon) {
+                        $couponModel = Coupon::where('coupon_id', $key)->select('coupon_id', 'coupon_validdate_day', 'coupon_validdate_end', 'coupon_is_period', 'coupon_number')->first();
+                        if (empty($couponModel)) {
+                            continue;
+                        }
+                        // 券是否过期
+                        if (!empty($couponModel->coupon_validdate_end) && strtotime($couponModel->coupon_validdate_end) < time()) {
+                            continue;
+                        }
+                        // 发周期券
+                        if ($couponModel->coupon_is_period == 'Y') {
+                            // 发券参数
+                            $couponSendParams = [
+                                'gettype' => 'COMBINE',
+                                'coupon_id' => $key,
+                                'member_id' => $params['member_id']
+                            ];
+
+                            Log::info("发周期券参数", $couponSendParams);
+
+                            CouponDetailService::sendPeriodCoupon($couponSendParams);
+                            continue;
+                        }
+
+                        $couponResidue = 'all';
+                        if ($couponModel->coupon_number != 0) {
+                            $couponResidue = CouponDetail::where('join_detail_coupon_id', $key)->whereIn('coupon_detail_status', ['INIT', 'PENDING'])->count();
+                            // 超出优惠券设置的数量
+                            if ($couponResidue < $coupon['num']) {
+                                continue;
+                            }
+                        }
+                        $endDate = '';
+                        if (!empty($couponModel->coupon_validdate_end)) {
+                            $endDate = $couponModel->coupon_validdate_end;
+                        } elseif ($couponModel->coupon_validdate_day > 0) {
+                            $endDate = date('Y-m-d H:i:s', time() + ($couponModel->coupon_validdate_day * 24 * 3600) - 1);
+                        }
                         // 发券参数
                         $couponSendParams = [
                             'gettype' => 'COMBINE',
                             'coupon_id' => $key,
-                            'member_id' => $params['member_id']
+                            'chooseCouponNbr' => $coupon['num'],
+                            'member_id' => $params['member_id'],
+                            'coupon_detail_gain_datetime' => date('Y-m-d H:i:s'),
+                            'coupon_detail_deadline_datetime' => $endDate,
                         ];
 
-                        Log::info("发周期券参数", $couponSendParams);
-
-                        CouponDetailService::sendPeriodCoupon($couponSendParams);
-                        continue;
-                    }
-
-                    $couponResidue = 'all';
-                    if ($couponModel->coupon_number != 0) {
-                        $couponResidue = CouponDetail::where('join_detail_coupon_id', $key)->whereIn('coupon_detail_status', ['INIT', 'PENDING'])->count();
-                        // 超出优惠券设置的数量
-                        if ($couponResidue < $coupon['num']) {
-                            continue;
-                        }
-                    }
-                    $endDate = '';
-                    if (!empty($couponModel->coupon_validdate_end)) {
-                        $endDate = $couponModel->coupon_validdate_end;
-                    } elseif ($couponModel->coupon_validdate_day > 0) {
-                        $endDate = date('Y-m-d H:i:s', time() + ($couponModel->coupon_validdate_day * 24 * 3600) - 1);
-                    }
-                    // 发券参数
-                    $couponSendParams = [
-                        'gettype' => 'COMBINE',
-                        'coupon_id' => $key,
-                        'chooseCouponNbr' => $coupon['num'],
-                        'member_id' => $params['member_id'],
-                        'coupon_detail_gain_datetime' => date('Y-m-d H:i:s'),
-                        'coupon_detail_deadline_datetime' => $endDate,
-                    ];
-
-                    Log::info("发普通券参数", $couponSendParams);
-                    if ($couponResidue != 'all' && $couponResidue - $coupon['num'] >= 0) {
-                        CouponDetailService::customSendCouponHave($couponSendParams);
-                    } else {
-                        for ($i = 0; $i < $coupon['num']; $i++) {
-                            CouponDetailService::customSendCoupon($couponSendParams);
+                        Log::info("发普通券参数", $couponSendParams);
+                        if ($couponResidue != 'all' && $couponResidue - $coupon['num'] >= 0) {
+                            CouponDetailService::customSendCouponHave($couponSendParams);
+                        } else {
+                            for ($i = 0; $i < $coupon['num']; $i++) {
+                                CouponDetailService::customSendCoupon($couponSendParams);
+                            }
                         }
                     }
                 }
             }
+
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollBack();
+            _syslog("新客专享", "处理失败");
+            Log::error("新客专享处理失败", ['msg' => $e->getMessage()]);
         }
     }
 }

+ 47 - 60
app/event/order/PartnerEvent.php

@@ -2,6 +2,9 @@
 
 namespace app\event\order;
 
+use app\admin\service\coupon\CouponDetailService;
+use app\admin\service\coupon\CouponService;
+use app\admin\service\order\CommissionService;
 use app\model\Coupon;
 use app\model\CouponDetail;
 use app\model\Goods;
@@ -10,73 +13,57 @@ use app\model\MemberAccount;
 use app\model\PayDetail;
 use app\model\SysConfig;
 use app\model\SysSerial;
+use support\Db;
+use support\exception\BusinessException;
 use support\Log;
 
 class PartnerEvent
 {
     public function grant($params)
     {
-        $config = SysConfig::where('config_key', 'app-identity-partner-config')->first();
-        $configParams = json_decode($config->config_value_json, true);
-        // 更新身份
-        Member::where('member_id', $params['member_id'])->update(['member_is_partner' => 'Y']);
-        // 余额账户
-        $memberAccount = MemberAccount::where('join_account_member_id', $params['member_id'])->where('member_account_classify', 'CASH')->first();
-        // 分期付款
-        if (isset($params['order_amount_paid']) && $params['order_amount_paid'] > 0) {
-            $params['order_amount_pay'] = $params['order_amount_paid'] + $params['order_amount_pay'];
-        }
-        // 增值到最后一条支付记录
-        $added = 0;
-        $payDetail = PayDetail::whereJsonContains('join_pay_object_json->order_id', $params['orderId'])->orderBy('pay_addtimes', 'DESC')->first();
-        if (!empty($configParams['account']['added'])) {
-            $params['order_amount_pay'] = 10000;
-            $added = round($params['order_amount_pay'] * $configParams['account']['added'], 2);
-            $payDetail->pay_extend_json = json_encode(['added_rate' => $configParams['account']['added'], 'added_amount' => $added]);
-            $payDetail->save();
-        }
-        // 入账
-        $memberAccount->member_account_income = $memberAccount->member_account_income + $params['order_amount_pay'];
-        $memberAccount->member_account_surplus = $memberAccount->member_account_surplus + $params['order_amount_pay'];
-        $memberAccount->member_account_added = $memberAccount->member_account_added + $added;
-        $memberAccount->save();
-        //发放优惠券
-        $goods = Goods::where('goods_id', $params['join_sheet_goods_id'])->select('goods_attribute_json')->first();
-        if (!empty($goods) && !empty($goods->goods_attribute_json)) {
-            $goodsAttributeJson = json_decode($goods->goods_attribute_json, true);
-            if (!empty($goodsAttributeJson['coupon'])) {
-                foreach ($goodsAttributeJson['coupon'] as $key => $coupon) {
-                    $couponModel = Coupon::where('coupon_id', $key)->select('coupon_id', 'coupon_validdate_day', 'coupon_validdate_end')->first();
-                    if (empty($couponModel)) {
-                        continue;
-                    }
-                    // 券是否过期
-                    if (!empty($couponModel->coupon_validdate_end) && strtotime($couponModel->coupon_validdate_end) < time()) {
-                        continue;
-                    }
-                    $endDate = '';
-                    if (!empty($couponModel->coupon_validdate_end)) {
-                        $endDate = $couponModel->coupon_validdate_end;
-                    } elseif ($couponModel->coupon_validdate_day > 0) {
-                        $endDate = date('Y-m-d H:i:s', time() + ($couponModel->coupon_validdate_day * 24 * 3600) - 1);
-                    }
-
-                    $num = $coupon['num'];
-                    for ($i = 0; $i < $num; $i++) {
-                        CouponDetail::insert([
-                            'coupon_detail_id' => 'CUDT' . date("ymdHi") . random_string(4, 'up'),
-                            'join_detail_coupon_id' => $key,
-                            'join_coupon_detail_member_id' => $params['member_id'],
-                            'coupon_detail_status' => 'ACTIVED',
-                            'coupon_detail_gain_datetime' => date('Y-m-d H:i:s'),
-                            'coupon_detail_deadline_datetime' => $endDate,
-                            'coupon_detail_json' => '[]',
-                            'coupon_detail_extend_json' => json_encode(['gettype' => 'PARTNER']),
-                            'coupon_detail_addtimes' => time()
-                        ]);
-                    }
-                }
+        Db::beginTransaction();
+        try {
+            Log::info("进入会员合伙人事件", $params);
+            $config = SysConfig::where('config_key', 'app-identity-partner-config')->first();
+            $configParams = json_decode($config->config_value_json, true);
+            // 更新身份
+            Member::where('member_id', $params['member_id'])->update(['member_is_partner' => 'Y']);
+            // 余额账户
+            $memberAccount = MemberAccount::where('join_account_member_id', $params['member_id'])->where('member_account_classify', 'CASH')->first();
+            // 分期付款
+            if (isset($params['order_amount_paid']) && $params['order_amount_paid'] > 0) {
+                $params['order_amount_pay'] = $params['order_amount_paid'] + $params['order_amount_pay'];
+            }
+            // 增值到最后一条支付记录
+            $added = 0;
+            $payDetail = PayDetail::whereJsonContains('join_pay_object_json->order_id', $params['orderId'])->orderBy('pay_addtimes', 'DESC')->first();
+            if (!empty($configParams['account']['added'])) {
+                $params['order_amount_pay'] = 10000;
+                $added = round($params['order_amount_pay'] * $configParams['account']['added'], 2);
+                $payDetail->pay_extend_json = json_encode(['added_rate' => $configParams['account']['added'], 'added_amount' => $added]);
+                $payDetail->save();
             }
+            // 入账
+            $memberAccount->member_account_income = $memberAccount->member_account_income + $params['order_amount_pay'];
+            $memberAccount->member_account_surplus = $memberAccount->member_account_surplus + $params['order_amount_pay'];
+            $memberAccount->member_account_added = $memberAccount->member_account_added + $added;
+            $memberAccount->save();
+
+            // 给上级提成
+            CommissionService::commission($configParams, $params['member_id'], $params['orderId'], $params['order_amount_pay'], '推荐会员合伙人');
+
+            //发放优惠券
+            CouponService::autoSendCouponByGoods($params);
+
+            Db::commit();
+        } catch (BusinessException $e) {
+            Db::rollBack();
+            _syslog('会员合伙人', '会员合伙人处理失败:' . $e->getMessage());
+        } catch (\Exception $e) {
+            Db::rollBack();
+            Log::info('PARTNER_DISPOSE_ERROR:' . $e->getMessage(), $params);
+
+            _syslog('会员合伙人', '会员合伙人处理失败');
         }
     }
 }

+ 20 - 2
route/admin.php

@@ -109,9 +109,24 @@ Route::group('/admin', function () {
         /* 新客专享 */
         Route::group('/newCustomer', function () {
             Route::get('/info', [\app\admin\controller\goods\NewCustomerController::class, 'info']);
-//            Route::post('/add', [\app\admin\controller\goods\NewCustomerController::class, 'insert']);
             Route::post('/update', [\app\admin\controller\goods\NewCustomerController::class, 'update']);
-        });
+        })->middleware([
+            \app\middleware\AdminAuthCheck::class
+        ]);
+        /* 合伙人 */
+        Route::group('/partner', function () {
+            Route::get('/info', [\app\admin\controller\goods\PartnerController::class, 'info']);
+            Route::post('/update', [\app\admin\controller\goods\PartnerController::class, 'update']);
+        })->middleware([
+            \app\middleware\AdminAuthCheck::class
+        ]);
+        /* 推荐官 */
+        Route::group('/referrer', function () {
+            Route::get('/info', [\app\admin\controller\goods\ReferrerController::class, 'info']);
+            Route::post('/update', [\app\admin\controller\goods\ReferrerController::class, 'update']);
+        })->middleware([
+            \app\middleware\AdminAuthCheck::class
+        ]);
     });
     /* 财务管理 */
     Route::group('/finance', function () {
@@ -996,6 +1011,7 @@ Route::group('/admin', function () {
             Route::get('/sheet', [\app\admin\controller\order\PartnerController::class, 'sheet']);
             Route::get('/getPaidOrder', [\app\admin\controller\order\PartnerController::class, 'getPaidOrder']);
             Route::post('/uploadTicket', [\app\admin\controller\order\PartnerController::class, 'uploadTicket']);
+            Route::get('/getOrderPayStatus', [\app\admin\controller\order\WholeController::class, 'getOrderPayStatus']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
@@ -1007,6 +1023,7 @@ Route::group('/admin', function () {
             Route::get('/sheet', [\app\admin\controller\order\NewCustomerController::class, 'sheet']);
             Route::get('/getPaidOrder', [\app\admin\controller\order\NewCustomerController::class, 'getPaidOrder']);
             Route::post('/uploadTicket', [\app\admin\controller\order\NewCustomerController::class, 'uploadTicket']);
+            Route::get('/getOrderPayStatus', [\app\admin\controller\order\NewCustomerController::class, 'getOrderPayStatus']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
@@ -1017,6 +1034,7 @@ Route::group('/admin', function () {
             Route::post('/addConstitute', [\app\admin\controller\order\ServicesController::class, 'insertConstitute']);
             Route::post('/pay', [\app\admin\controller\order\ServicesController::class, 'pay']);
             Route::post('/payConstitute', [\app\admin\controller\order\ServicesController::class, 'payConstitute']);
+            Route::get('/getOrderPayStatus', [\app\admin\controller\order\WholeController::class, 'getOrderPayStatus']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);