فهرست منبع

充值推荐人

gorden 5 ماه پیش
والد
کامیت
8c6ba27e56
2فایلهای تغییر یافته به همراه20 افزوده شده و 10 حذف شده
  1. 10 1
      app/admin/controller/order/PayDetailController.php
  2. 10 9
      app/admin/controller/order/RechargeController.php

+ 10 - 1
app/admin/controller/order/PayDetailController.php

@@ -12,6 +12,7 @@ use app\model\MemberAccount;
 use app\model\Order;
 use app\model\OrderSheet;
 use app\model\PayDetail;
+use app\model\SysDept;
 use support\Db;
 use support\exception\BusinessException;
 use support\Request;
@@ -322,7 +323,7 @@ class PayDetailController extends Curd
         ])->where('member_id', $memberId)
             ->select('member_id', 'member_mobile', 'join_member_role_id', 'member_is_owner', 'member_is_vip', 'member_is_partner', 'member_is_referrer')
             ->first();
-        if (!$member){
+        if (!$member) {
             return json_fail('数据异常');
         }
         $member = $member->toArray();
@@ -489,12 +490,18 @@ class PayDetailController extends Curd
         $data = $this->inputFilter($params);
         $goods = Goods::find($params['goods_id']);
         $extendJson = [];
+        $orderExtendJson = [];
         // if (!$params['is_custom']) {
 //        Db::beginTransaction();
         try {
             if (!$params['is_custom']) {
                 $data['pay_amount'] = $goods->goods_sales_price;
             }
+            $orderExtendJson['referee_dept_id'] = $params['dept_id'] ?? '';
+            $orderExtendJson['referee'] = $params['referee'] ?? '';
+            if (!empty($params['dept_id'])) {
+                $orderExtendJson['referee_premises'] = SysDept::where('dept_id', $params['dept_id'])->value('dept_name');
+            }
 
             $orderId = "OD" . date('ymdHi') . random_string(4, 'up');
             $orderGroupId = "OD" . date('ymdHi') . random_string(4, 'up');
@@ -512,6 +519,8 @@ class PayDetailController extends Curd
                 'order_status_system' => 'PAYING',
                 'order_status_storage' => 'PENDING',
                 'order_config_json' => json_encode(['order_category' => 'RECHARGE']),
+                'order_extend_json' => json_encode($orderExtendJson),
+                'order_platform' => 'SYSTEM',
                 'order_addtimes' => time()
             ];
             if ($type == 'WELFARE') {

+ 10 - 9
app/admin/controller/order/RechargeController.php

@@ -155,7 +155,7 @@ class RechargeController extends Curd
                 if (count($item['sheets']) > 1 && $goods->goods_classify == 'MEALS') {
                     $sheetDeng = ' 等';
                 }
-                if ($goods && $goods->goods_name && strpos($goods->goods_name,'皇冠') !== false){
+                if ($goods && $goods->goods_name && strpos($goods->goods_name, '皇冠') !== false) {
                     $item['is_crown'] = 'Y';
                 }
                 $item['sheet']['goods_name'] = ($goods && $goods->goods_name) ? $goods->goods_name . $sheetDeng : '';
@@ -218,8 +218,9 @@ class RechargeController extends Curd
                     throw new BusinessException("充值场所不存在");
                 }
                 $params['dept_name'] = $dept->dept_name;
-                $orderExtendJson = ['dept_id' => $params['dept_id'], 'dept_name' => $params['dept_name']];
+                $orderExtendJson = ['referee_dept_id' => $params['dept_id'], 'referee_premises' => $params['dept_name']];
             }
+            $orderExtendJson['referee'] = $params['referee'] ?? '';
             // 下单账户
             if (empty($params['join_order_member_id']) && !empty($params['mobile'])) {
                 if (Member::where('member_mobile', $params['mobile'])->exists()) {
@@ -825,14 +826,14 @@ class RechargeController extends Curd
                             ->toArray();
                         foreach ($coupons as &$coupon) {
                             if (isset($goodsAttributeJson['coupon'][$coupon['coupon_id']])) {
-                                $coupon['num'] = CouponDetail::where('join_detail_coupon_id',$coupon['coupon_id'])
-                                    ->where('join_coupon_detail_member_id',$order->join_order_member_id)
-                                    ->whereJsonContains('coupon_detail_extend_json->order_id',$order->order_id)
+                                $coupon['num'] = CouponDetail::where('join_detail_coupon_id', $coupon['coupon_id'])
+                                    ->where('join_coupon_detail_member_id', $order->join_order_member_id)
+                                    ->whereJsonContains('coupon_detail_extend_json->order_id', $order->order_id)
                                     ->count();
-                                $coupon['used'] = CouponDetail::where('join_detail_coupon_id',$coupon['coupon_id'])
-                                    ->where('join_coupon_detail_member_id',$order->join_order_member_id)
-                                    ->whereJsonContains('coupon_detail_extend_json->order_id',$order->order_id)
-                                    ->where('coupon_detail_status','USED')
+                                $coupon['used'] = CouponDetail::where('join_detail_coupon_id', $coupon['coupon_id'])
+                                    ->where('join_coupon_detail_member_id', $order->join_order_member_id)
+                                    ->whereJsonContains('coupon_detail_extend_json->order_id', $order->order_id)
+                                    ->where('coupon_detail_status', 'USED')
                                     ->count();
                                 $coupon['unused'] = $coupon['num'] - $coupon['used'];
                             }