Merge branch 'dev' into dev-sxb

app/common/repositories/store/order/StoreRefundOrderRepository.php

@@ -1016,8 +1016,8 @@ class StoreRefundOrderRepository extends BaseRepository
     public function moneyRefundAfter($refundOrder){
 //        Db::name('log')->insert(['data'=>'退款 佣金养老金退还开始']);
         $order_id = Db::name("store_refund_order")->where(['refund_order_id'=>$refundOrder])->value("order_id");
-        //查询订单返利的数据
-        $bill= Db::name("user_bill")->where(['link_id'=>$order_id,'pm'=>1])->select();
+        //查询订单返利的数据 status：0 = 待确定 1 = 有效 -1 = 无效
+        $bill= Db::name("user_bill")->where(['link_id'=>$order_id,'pm'=>1,'status' => 1])->select();
         foreach($bill as $k=>$v){
             //扣除下单用户养老金
             if($v['commission_type'] == 5){

app/controller/api/Auth.php

@@ -1108,7 +1108,7 @@ class Auth extends BaseController
     function curl_java_login($phone){
         $curl = curl_init();
         curl_setopt_array($curl, array(
-            CURLOPT_URL => 'http://shop.hxxfb.com/gateway/userCenter_service/userLogOnService/userPhoneLogOn',
+            CURLOPT_URL => env('APP_URL') . '/gateway/userCenter_service/userLogOnService/userPhoneLogOn',
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_ENCODING => '',
             CURLOPT_MAXREDIRS => 10,

app/controller/api/store/merchant/Taskorderguquan.php

@@ -18,30 +18,56 @@ class Taskorderguquan
     {
 
         /**
-        13231658486周行体300
-        13333069689魏惠新300
-        15832971815孟晓玮300
+        13231658486周行体500
+        13333069689魏惠新500
         13959100621周金花300
-        13701061395李素红100
-        15810064711 王   玲 200
-        13521438652徐立苹100
-        18760167163刘春梅50
+        13701061395李素红300
+        17501006833邢艳丽300
+        13521438652徐立苹300
+        15832971815孟晓玮300
+        18600200909陈冠霖300
+        15810064711 王   玲 300
+        18001316701闫旭300
+        13932925303会强300
+        13601071082隋彩云200
+        13161909228刘银霞50
+        18603401312黄金花 50
+        18760167163刘春梅 50
+        18911752386魏利琴50
+        13215917919李小秋50
         15332507711张传莲50
         15960349661吕丽娣50
-        18715313601大饼200
+        13381085923王建军50
+        13683609309李长生50
+        13601179856陈瑞元50
+        13901074090陈玉刚200
+        18715313601大饼400
         */
         $data = [
-            '13231658486' => 300,
-            '13333069689' => 300,
-            '15832971815' => 300,
+            '13231658486' => 500,
+            '13333069689' => 500,
             '13959100621' => 300,
-            '13701061395' => 100,
-            '15810064711' => 200,
-            '13521438652' => 100,
+            '13701061395' => 300,
+            '17501006833' => 300,
+            '13521438652' => 300,
+            '15832971815' => 300,
+            '18600200909' => 300,
+            '15810064711' => 300,
+            '18001316701' => 300,
+            '13932925303' => 300,
+            '13601071082' => 200,
+            '13161909228' => 50,
+            '18603401312' => 50,
             '18760167163' => 50,
+            '18911752386' => 50,
+            '13215917919' => 50,
             '15332507711' => 50,
             '15960349661' => 50,
-            '18715313601' => 200,
+            '13381085923' => 50,
+            '13683609309' => 50,
+            '13601179856' => 50,
+            '13901074090' => 200,
+            '18715313601' => 400
         ];
 
         $result = Db::name("user")

app/controller/api/store/merchant/Taskorderlianc.php

@@ -13,6 +13,72 @@ use think\Request;
 class Taskorderlianc
 {
 
+    private const API_KEY = "EXTERNAL_SYSTEM_B_KEY";
+    private const API_SECRET = "STRONG_SECRET_123456";
+    private const GATEWAY_URL = "http://localhost:9002";
+
+    public function getUserPoints()
+    {
+        $timestamp = round(microtime(true) * 1000);  // 获取当前时间戳（毫秒）
+        $signature = $this->generateSignature(self::API_KEY, $timestamp);
+
+        // 设置请求头
+        $headers = [
+            "X-API-KEY: " . self::API_KEY,
+            "X-TIMESTAMP: " . $timestamp,
+            "X-SIGNATURE: " . $signature,
+            "Content-Type: application/json"
+        ];
+        // 请求的 POST 数据（例如用户信息）
+//        $postData = [
+//            'pm' => 1,
+//            'rewardScore' => 5,
+//            'orderId' => 'johndoe@example.com',
+//            'orderType' => '1234567890',
+//        ];
+        $postData = [
+            'uid' => 1592,
+            'sex' => 2,
+            'spreadUid' => 767
+        ];
+
+
+        // 请求 URL
+        // $url = self::GATEWAY_URL . "/external/userCenter_service/user/getUserList?uid=1592";
+        // 请求 URL POST
+        $url = self::GATEWAY_URL . "/external/userCenter_service/user/updateUserInfo";
+
+
+        // // 使用 cURL 发起 GET 请求
+        // $ch = curl_init();
+        // curl_setopt($ch, CURLOPT_URL, $url);
+        // curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        // curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        // $response = curl_exec($ch);
+        // curl_close($ch);
+
+        // 使用 cURL 发起 POST 请求
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_POST, true);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($postData)); // 转换为 JSON 字符串
+        $response = curl_exec($ch);
+        curl_close($ch);
+
+        // 解析返回的 JSON 数据
+        $responseData = json_decode($response, true);
+
+        return json($responseData); // 返回用户积分，默认值为 0
+    }
+
+    private function generateSignature($apiKey, $timestamp)
+    {
+        $data = $apiKey . "|" . $timestamp . "|" . self::API_SECRET;
+        return md5($data); // 返回 MD5 签名
+    }
+
     /**
      * 会员升级
      */

route/api.php

@@ -1310,6 +1310,7 @@ Route::get('test_hehuoren_zero', 'api.store.merchant.TaskZeroLinePartnerProfits/
 Route::get('test_guquan', 'api.store.merchant.Taskorderguquan/lst6');
 Route::get('test_lianchuang', 'api.store.merchant.Taskorderlianc/lst2');
 Route::get('test_lianchuang_zero', 'api.store.merchant.TaskZeroLineOrderLianc/lst2');
+Route::get('test_external', 'api.store.merchant.Taskorderlianc/getUserPoints');
 Route::any('/share', function () {
     return view(app()->getRootPath() . 'public/share/register.html');
 });