1

app/api/controller/Recharge.php

@@ -96,7 +96,9 @@ class Recharge extends BaseController
         // 主订单数据
         $save = [];
         $save['uid'] = $request->user['uid'];
-        $save['order_sn'] = $rechargeOrder->mkOrderSn($uid);
+        $save['order_id'] = $rechargeOrder->mkOrderSn($uid);
+        $save['order_id'] = makeOrderId($request->user['uid'], "CZ");
+
         $save['recharge_id'] = 0;
         $save['price'] = $price;
         $save['integral'] = $integral;
@@ -287,7 +289,7 @@ class Recharge extends BaseController
 //        // 主订单数据
 //        $save = [];
 //        $save['uid'] = $uid;
-//        $save['order_sn'] = $rechargeOrder->mkOrderSn($uid);
+//        $save['order_id'] = $rechargeOrder->mkOrderSn($uid);
 //        $save['recharge_id'] = $post['recharge_id'];
 //        $save['price'] = $price;
 //        $save['integral'] = $integral;
@@ -321,11 +323,11 @@ class Recharge extends BaseController
 //            // 不需要支付
 //            if ($payMoney <= 0 && $save['paid'] == 1) {
 //                // 增加用户积分
-//                $this->addUserIntegral($uid, $save['total_integral'], $save['order_sn'], $save['price'], $o_id);
+//                $this->addUserIntegral($uid, $save['total_integral'], $save['order_id'], $save['price'], $o_id);
 //                Db::commit();
 //                $redis->delete($key);
 //                return app("json")->success([
-//                    'order_id' => $save['order_sn'],
+//                    'order_id' => $save['order_id'],
 //                    'pay_no' => '',
 //                    'price' => $price,
 //                    'money' => $payMoney,
@@ -349,11 +351,11 @@ class Recharge extends BaseController
 //                    return app('json')->fail("余额支付失败");
 //                }
 //                // 增加用户积分
-//                $this->addUserIntegral($uid, $save['total_integral'], $save['order_sn'], $save['price'], $o_id);
+//                $this->addUserIntegral($uid, $save['total_integral'], $save['order_id'], $save['price'], $o_id);
 //                Db::commit();
 //                $redis->delete($key);
 //                return app("json")->success([
-//                    'order_id' => $save['order_sn'],
+//                    'order_id' => $save['order_id'],
 //                    'pay_no' => '',
 //                    'price' => $price,
 //                    'money' => $payMoney,
@@ -397,14 +399,14 @@ class Recharge extends BaseController
 //            $trade = [
 //                'uid' => $uid,
 //                'o_id' => $o_id,
-//                'order_id' => $save["order_sn"],
+//                'order_id' => $save["order_id"],
 //                'pay_no' => $payOn,
 //                'out_trade_no' => empty($out_trade_no) ? $payOn : $out_trade_no,
 //                'pay_type' => $payType,
 //                'money' => $payMoney,
 //                'type' => 'recharge',
 //                'd_json' => serialize([
-//                    'order_sn' => $save["order_sn"],
+//                    'order_id' => $save["order_id"],
 //                    'recharge_id' => $post['recharge_id'],
 //                    'integral' => $integral,
 //                    'give_integral' => $giveIntegral,
@@ -445,7 +447,7 @@ class Recharge extends BaseController
 //            return app('json')->success([
 //                'jsApiParameters' => $payData,
 //                'pay_no' => $payOn,
-//                'order_id' => $save["order_sn"],
+//                'order_id' => $save["order_id"],
 //                "status" => $save['paid'],
 //                "money" => $payMoney,
 //                'price' => $price,
@@ -470,7 +472,7 @@ class Recharge extends BaseController
     public function pay(Request $request)
     {
         $post = UtilService::getMore([
-            ['order_sn', '']
+            ['order_id', '']
         ], $request);
 
         $uid = $request->uid;
@@ -479,7 +481,7 @@ class Recharge extends BaseController
         }
 
         $rechargeOrder = new RechargeOrder();
-        $orderInfo = $rechargeOrder->getByOrderSn($post['order_sn']);
+        $orderInfo = $rechargeOrder->getByOrderSn($post['order_id']);
         
         if (!$orderInfo) {
             return app('json')->fail('订单不存在');
@@ -504,7 +506,7 @@ class Recharge extends BaseController
         if ($payType == 'wxpay') {
             // 微信支付
             $wxpay = new wxpayApi();
-            $payData = $wxpay->pay($price, $orderInfo['order_sn'], '充值积分', $uid);
+            $payData = $wxpay->pay($price, $orderInfo['order_id'], '充值积分', $uid);
             
             if (!$payData) {
                 return app('json')->fail('支付失败');
@@ -512,7 +514,7 @@ class Recharge extends BaseController
             
             return app('json')->success([
                 'jsApiParameters' => $payData,
-                'order_id' => $orderInfo['order_sn']
+                'order_id' => $orderInfo['order_id']
             ]);
         } elseif ($payType == 'alipay') {
             // 支付宝支付（需要根据项目实际情况实现）
@@ -568,7 +570,7 @@ class Recharge extends BaseController
     public function orderDetail(Request $request)
     {
         $post = UtilService::getMore([
-            ['order_sn', '']
+            ['order_id', '']
         ], $request);
 
         $uid = $request->uid;
@@ -577,7 +579,7 @@ class Recharge extends BaseController
         }
 
         $rechargeOrder = new RechargeOrder();
-        $orderInfo = $rechargeOrder->getByOrderSn($post['order_sn']);
+        $orderInfo = $rechargeOrder->getByOrderSn($post['order_id']);
         
         if (!$orderInfo) {
             return app('json')->fail('订单不存在');

app/lib/OrderLib.php

@@ -89,7 +89,7 @@ class OrderLib
                 // 调用充值成功处理
                 $rechargeController = new \app\api\controller\Recharge();
                 $result = $rechargeController->paySuccess($payOn, $payTradeData['transaction_id'] ?? '', $payDataInfo);
-                $result = (new Recharge())->paySuccess($payOn, $payTradeData['transaction_id'] ?? '', $payDataInfo);
+//                $result = (new Recharge())->paySuccess($payOn, $payTradeData['transaction_id'] ?? '', $payDataInfo);
                 if (!$result) {
                     PayTrade::rollbackTrans();
                     return false;

app/model/api/RechargeOrder.php

@@ -40,7 +40,7 @@ class RechargeOrder extends BaseModel
         $totalIntegral = $integral + $giveIntegral;
         
         $bool = $this->insert([
-            'order_sn' => $orderSn,
+            'order_id' => $orderSn,
             'uid' => $uid,
             'recharge_id' => $rechargeId,
             'price' => $price,
@@ -68,7 +68,7 @@ class RechargeOrder extends BaseModel
      */
     public function getByOrderSn($orderSn)
     {
-        return $this->where('order_sn', $orderSn)->find();
+        return $this->where('order_id', $orderSn)->find();
     }
 
     /**
@@ -90,7 +90,7 @@ class RechargeOrder extends BaseModel
      */
     public function updatePayStatus($orderSn, $paySn, $payJson = '')
     {
-        return $this->where('order_sn', $orderSn)->update([
+        return $this->where('order_id', $orderSn)->update([
             'paid' => 1,
             'pay_sn' => $paySn,
             'pay_json' => $payJson,
@@ -138,8 +138,8 @@ class RechargeOrder extends BaseModel
             ->field($field)
             ->leftJoin('user u', 'u.uid = ro.uid')
             ->when(!empty($where), function ($query) use ($where) {
-                if (!empty($where['order_sn'])) {
-                    $query->where('ro.order_sn', $where['order_sn']);
+                if (!empty($where['order_id'])) {
+                    $query->where('ro.order_id', $where['order_id']);
                 }
                 if (!empty($where['uid'])) {
                     $query->where('ro.uid', $where['uid']);
@@ -178,7 +178,7 @@ class RechargeOrder extends BaseModel
      */
     public function closeOrder($orderSn)
     {
-        return $this->where('order_sn', $orderSn)->update([
+        return $this->where('order_id', $orderSn)->update([
             'status' => -1,
             'update_time' => time()
         ]);

app/model/api/UserScoreDetail.php

@@ -113,7 +113,7 @@ class UserScoreDetail extends BaseModel
             $post['content']  = $content;
             $post['type']     = 1;
             $post['time']     = time();
-            $post['order_sn'] = $orderSn;
+            $post['order_id'] = $orderSn;
             $post['link_id'] = $link_id;
             $post['money']    = (float)(new User)->where('uid', $uid)->value('score') + $money;
             $post['o_id']    = empty($parms["o_id"])?0:$parms["o_id"];

app/system/controller/Recharge.php

@@ -231,7 +231,7 @@ class Recharge extends BaseController
         $post = UtilService::getMore([
             ['page', 1],
             ['pageSize', 20],
-            ['order_sn', ''],
+            ['order_id', ''],
             ['uid', ''],
             ['nickname', ''],
             ['mobile', ''],
@@ -242,8 +242,8 @@ class Recharge extends BaseController
         ], $request);
 
         $where = [];
-        if (!empty($post['order_sn'])) {
-            $where['order_sn'] = $post['order_sn'];
+        if (!empty($post['order_id'])) {
+            $where['order_id'] = $post['order_id'];
         }
         if (!empty($post['uid'])) {
             $where['uid'] = $post['uid'];
@@ -372,7 +372,7 @@ class Recharge extends BaseController
         ], $rechargeOrder->getByOrderSn($orderSn)['id']);
 
         return app('json')->success([
-            'order_sn' => $orderSn,
+            'order_id' => $orderSn,
             'price' => $post['price'],
             'integral' => $post['integral'],
             'give_integral' => $post['give_integral'],
@@ -388,15 +388,15 @@ class Recharge extends BaseController
     public function closeOrder(Request $request)
     {
         $post = UtilService::getMore([
-            ['order_sn', '']
+            ['order_id', '']
         ], $request);
 
-        if (empty($post['order_sn'])) {
+        if (empty($post['order_id'])) {
             return app('json')->fail('订单号不能为空');
         }
 
         $rechargeOrder = new RechargeOrder();
-        $order = $rechargeOrder->getByOrderSn($post['order_sn']);
+        $order = $rechargeOrder->getByOrderSn($post['order_id']);
         
         if (!$order) {
             return app('json')->fail('订单不存在');
@@ -406,7 +406,7 @@ class Recharge extends BaseController
             return app('json')->fail('已支付的订单不能关闭');
         }
 
-        $result = $rechargeOrder->closeOrder($post['order_sn']);
+        $result = $rechargeOrder->closeOrder($post['order_id']);
         
         if (!$result) {
             return app('json')->fail('关闭订单失败');