短信调整，记录调整

app/common/repositories/user/UserRepository.php

@@ -1188,7 +1188,7 @@ class UserRepository extends BaseRepository
             'account' => $phone,
             'pwd' => $pwd,
             'nickname' =>$nickname?$nickname:'用户' . substr($phone, 7, 4),
-            'avatar' => 'https://cdn.bjtdba.com/chuxubao/static/assets/yhc_default_avatar.png',
+            'avatar' => 'https://cdn.bjtdba.com/vod/image/2025-01-20/20250120125206881.png',
             'phone' => $phone,
             'last_ip' => app('request')->ip(),
             "identity"=>5,

app/controller/api/Auth.php

@@ -946,7 +946,7 @@ $data=$user->toArray();
     {
         $data = $this->request->params(['phone', 'code', 'key',"type"]);
         $validate->sceneVerify()->check($data);
-
+        log::info("发送短信方法");
         if ($data['type']=="register"){
             $count=Db::name("user")->where("phone", $data["phone"])->count();
             if ($count){
@@ -956,6 +956,7 @@ $data=$user->toArray();
         $sms_num_key = 'api.auth.num.' . $data['phone'];
         $sms_key = 'api.auth.sms.' . $data['phone'];
         $num = Cache::get($sms_num_key) ? Cache::get($sms_num_key) : 0;
+        log::info("num{$num}" );
         if ($num > 9) {
             if (!$data['code'])
                 return app('json')->make(402, '操作过于频繁，请稍后重试~');
@@ -966,7 +967,7 @@ $data=$user->toArray();
         $sms_time = systemConfig('sms_time') ? systemConfig('sms_time') : 30 ;
         $res = app()->make(AliYunSmsService::class)->send($data['phone'],  $sms_code);
         if($res['Code']!='OK'){
-            Db::name('log')->insert(['data'=>'一壶茶短信发送失败：'.json_encode($res,256)]);
+            Db::name('log')->insert(['data'=>'幸福保短信发送失败：'.json_encode($res,256)]);
             return app('json')->fail('操作过于频繁，请稍后重试~');
         }
 

app/controller/api/store/product/Jt.php

@@ -530,11 +530,12 @@ class Jt extends BaseController
             $finalPrice = $detail['priceInfo']['lowestCouponPrice'] ?? $detail['priceInfo']['goods_price'] - $discount_price;
             $finalPrice = sprintf('%.2f', $finalPrice);
             $commissionRate = $detail['commissionInfo']['commissionShare'];
-            //目前京东联盟等级只返回90%的收益，后续调整0.9即可
+//            //目前京东联盟等级只返回90%的收益，后续调整0.9即可
             $commissionMoney = sprintf('%.2f', ($finalPrice * $commissionRate / 100));
 
             $commission=$commissionMoney; //佣金(预估)
-            $pv=$commission* 0.5;  //PV
+//            $commission=$detail['commissionInfo']['commission'];
+            $pv=$commission * 0.5;  //PV
             $yanglaojin=$pv; //新的养老金
 
             $gongxian=$pv; //新的养老金
@@ -620,7 +621,7 @@ class Jt extends BaseController
         ]);
 
         if (empty($time['startTime'])) {
-            $time['startTime'] = date('Y-m-d H:i:00', strtotime('-30minute'));
+            $time['startTime'] = date('Y-m-d H:i:00', strtotime('-50minute'));
             $time['endTime'] = date('Y-m-d H:i:00', strtotime('+1minute'));
         }
 //        if (empty($time['startTime'])) {
@@ -819,9 +820,9 @@ class Jt extends BaseController
                 $yanglaojin = $yanglaojin_order['extension_one'] ?? 0;
                 //预估积分
                 $orderThird->yuguJifen(
-                    $order['commission'],
-                    $order['uid'],
-                    $order['order_sn'],
+                    $localOrder['commission'],
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
                     6
                 );
                 //直推奖处理

app/controller/api/store/product/StoreProduct.php

@@ -221,8 +221,10 @@ class StoreProduct extends BaseController
 
     public function get_mp_access_token()
     {
-        $appid = 'wx82986c4471ce7efc';
-        $secret = '4ae3f790d8c5503a22579338504cdb61';
+//        $appid = 'wx82986c4471ce7efc';
+//        $secret = '4ae3f790d8c5503a22579338504cdb61';
+        $appid = 'wxfb755febdb800f23';
+        $secret = '55ed00200ef0ec6662ca8502dc534a69';
         $access_token = Cache::get($appid . '_mp_access_token');
         if ($access_token)
             return $access_token;

app/controller/api/user/User.php

@@ -203,14 +203,14 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_hongbao')->where($where)->where('pm', 1)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_hongbao')->where($where)->where('type', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
-            $data = DB::name('user_sign_hongbao')->where($where)->where('pm', 2)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_hongbao')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         if($pm==2){
-            $data = DB::name('user_sign_hongbao')->where($where)->where('status', -1)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_hongbao')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         log::info("=======date==={$data}");
@@ -284,14 +284,14 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_jingdou')->where($where)->where('pm', 1)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_jingdou')->where($where)->where('type', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
-            $data = DB::name('user_sign_jingdou')->where($where)->where('pm', 2)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_jingdou')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         if($pm==2){
-            $data = DB::name('user_sign_jingdou')->where($where)->where('status', -1)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_jingdou')->where($where)->where('status', -1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         log::info("=======date==={$data}");
@@ -324,10 +324,10 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_fugou')->where($where)->where('pm', 1)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_fugou')->where($where)->where('type', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
-            $data = DB::name('user_sign_fugou')->where($where)->where('pm', 2)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_fugou')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
         if($pm==2){
@@ -365,16 +365,16 @@ class User extends BaseController
 
         if ($pm==0){
 
-            $data = DB::name('user_sign_vr')->where($where)->where('pm', 1)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_vr')->where($where)->where('type', 1)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
         }
         if($pm==1){
-            $data = DB::name('user_sign_vr')->where($where)->where('pm', 2)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
-
-        }
-        if($pm==2){
-            $data = DB::name('user_sign_vr')->where($where)->where('status', -1)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+            $data = DB::name('user_sign_vr')->where($where)->where('type', 2)->field('id,mark,number,type,addtime,order_id')->page($page, $limit)->order("id desc")->select();
 
         }
+//        if($pm==2){
+//            $data = DB::name('user_sign_vr')->where($where)->where('status', -1)->field('id,mark,number,pm,addtime,order_id')->page($page, $limit)->order("id desc")->select();
+//
+//        }
         log::info("=======date==={$data}");
         return app("json")->success($data);
     }

crmeb/services/AliYunSmsService.php

@@ -16,6 +16,7 @@ use Exception;
 use think\facade\Db;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Exception\ServerException;
+use think\facade\Log;
 
 /**
  * Class YunxinSmsService
@@ -28,31 +29,35 @@ class AliYunSmsService
     public function send($mobile, $code, $templateId = 'AUTHCODE')
     {
         if($templateId=='') $templateId = 'AUTHCODE';
-        AlibabaCloud::accessKeyClient('LTAI5tPv49zdudnbTGExNKd3', 'nS7eFuPfI92i5h0MSvcAkpbyGsmkeF')
+//        AlibabaCloud::accessKeyClient('LTAI5tPv49zdudnbTGExNKd3', 'nS7eFuPfI92i5h0MSvcAkpbyGsmkeF')
+//            ->regionId('cn-hangzhou')
+//            ->asDefaultClient();
+        AlibabaCloud::accessKeyClient('LTAI5tKivJSckMYz5BHev3u8', 'nvetSdLB1YP7OgvpJcVeyhdJDVs4Ik')
             ->regionId('cn-hangzhou')
             ->asDefaultClient();
         $templateParam['code'] = $code;
-
+        log::info("发送短信方法");
         switch ($templateId) {
             case 'AUTHCODE':
-                $SignName = '一壶茶电子商务';
-                $TemplateCode = 'SMS_294055127';
-                $content = '【一壶茶电子商务】您的验证码是：' . $code;
+                $SignName = '北京融合华夏数字文化科技';
+                $TemplateCode = 'SMS_311255692';
+
+                $content = '【华夏幸福保】您的验证码是：' . $code;
                 break;
             case 'ONESELFCARRY':
-                $SignName = '一壶茶电子商务';
+                $SignName = '华夏幸福保';
                 $TemplateCode = 'SMS_465430830';
-                $content = '【一壶茶电子商务】您购买的商品动态码（自提码）为' . $code . '，提货时请出示自提码！';
+                $content = '【华夏幸福保】您购买的商品动态码（自提码）为' . $code . '，提货时请出示自提码！';
                 break;
             case 'REDCHANGE':
-                $SignName = '一壶茶电子商务';
+                $SignName = '华夏幸福保';
                 $TemplateCode = 'SMS_465371794';
-                $content = '【一壶茶电子商务】您的短信验证码为' . $code . '，您正在人工调整红积分，如非本人操作，请忽略该短信。';
+                $content = '【华夏幸福保】您的短信验证码为' . $code . '，您正在人工调整红积分，如非本人操作，请忽略该短信。';
                 break;
             case 'COMMISSIONCHANGE':
-                $SignName = '一壶茶电子商务';
+                $SignName = '华夏幸福保';
                 $TemplateCode = 'SMS_465392073';
-                $content = '【一壶茶电子商务】您的短信验证码为' . $code . '，您正在人工调整用户佣金，如非本人操作，请忽略该短信。';
+                $content = '【华夏幸福保】您的短信验证码为' . $code . '，您正在人工调整用户佣金，如非本人操作，请忽略该短信。';
                 break;
         }
         try {
@@ -71,6 +76,9 @@ class AliYunSmsService
                     ],
                 ])
                 ->request();
+
+            log::info("短信：返回参数");
+            log::info($result);
             Db::name('sms_record')->insert(['phone' => $mobile, 'content' => $content, 'template' => $TemplateCode]);
 
             return $result->toArray();

route/api.php

@@ -298,15 +298,15 @@ Route::group('api/', function () {
             Route::get('get_brokerage_info', 'User/get_brokerage_info');
             Route::post('get_token_by_phone', 'User/get_token_by_phone');
 
-            Route::get('hongbao_info','User/hongbao_list');//红包
+            Route::get('hongbao_info','User/hongbao_info');//红包
             Route::get('hongbao_list','User/hongbao_list');//红包记录
             Route::get('gongxian_info','User/gongxian_info');//贡献
             Route::get('gongxian_list','User/gongxian_list');//贡献记录
-            Route::get('fugou_info','User/fugou_list');//复购金
+            Route::get('fugou_info','User/fugou_info');//复购金
             Route::get('fugou_list','User/fugou_list');//复购金记录
-            Route::get('jingdou_info','User/jingdou_list');//京豆
+            Route::get('jingdou_info','User/jingdou_info');//京豆
             Route::get('jingdou_list','User/jingdou_list');//京豆记录
-            Route::get('vr_info','User/jingdou_list');//购物金
+            Route::get('vr_info','User/jingdou_info');//购物金
             Route::get('vr_list','User/jingdou_list');//购物金记录
 
         })->prefix('api.user.');