Merge remote-tracking branch 'origin/dev' into dev

app/common/model/merchant/order/OrderGzc.php

@@ -12,6 +12,7 @@ namespace app\common\model\merchant\order;
 
 use app\common\model\BaseModel;
 use app\common\model\user\User;
+use app\common\model\user\UserBill;
 
 class OrderGzc extends BaseModel
 {
@@ -31,4 +32,8 @@ class OrderGzc extends BaseModel
         return $this->hasOne(User::class, 'uid', 'uid');
     }
 
+    public function bill()
+    {
+        return $this->hasOne(UserBill::class, 'bill_id', 'link_id');
+    }
 }

app/common/repositories/merchant/order/OrderGzcRepository.php

@@ -17,6 +17,7 @@ use app\traits\GzcApiRequest;
 use Carbon\Carbon;
 use crmeb\services\SpreadsheetExcelService;
 use FormBuilder\Factory\Elm;
+use think\facade\Db;
 use think\facade\Log;
 use think\facade\Route;
 
@@ -50,36 +51,97 @@ class OrderGzcRepository extends BaseRepository
         // 导出
         $is_excel = request()->param('is_excel', 0);
         if ($is_excel == 1) {
-            $data = $query->with('user')->select();
+            $data = $query->with(['user', 'bill'])->select()->toArray();
+
             $arr = [];
-            foreach ($data as $item) {
-                $arr[] = [
-                    $item['id'],
-                    $item['platform_no'],
-                    $item['user']['nickname'],
-                    $item['user']['account'],
-                    $item['user_name'],
-                    $item['mobile'],
-                    $item['user_card'],
-                    $item['bank_name'],
-                    $item['branch_name'],
-                    $item['bank_account'],
-                    $item['bank_no'],
-                    $item['alipay_account'],
-                    $item['alipay_no'],
-                    $item['wxpay_account'],
-                    $item['wxpay_no'],
-                    $item['out_trade_no'],
-                    $item['pension'],
-                    $item['gzc'] == 1 ? '已发起' : '待发起',
-                    $item['gzc_deposit_no'],
-                    $item['gzc_confirm_result'],
-                    $item['create_time'],
-                    $item['update_time']
+            if (!empty($data)) {
+                $orderTypeMap = [];
+                $orderDetailMap = [];
+                $orderMap = [
+                    0 => ['table' => 'rrx_store_order', 'name' => '平台订单', 'pk' => 'order_id', 'field' => 'order_id, total_price AS order_money, pay_price AS pay_money, con_pri AS commission, mer_id'],
+                    1 => ['table' => 'rrx_order_pdd', 'name' => '拼多多', 'pk' => 'order_pdd_id', 'field' => 'order_pdd_id AS order_id, order_money, pay_money, commission'],
+                    2 => ['table' => 'rrx_order_vip', 'name' => '唯品会', 'pk' => 'order_vip_id', 'field' => 'order_vip_id AS order_id, pay_money AS order_money, pay_money, commission'],
+                    3 => ['table' => 'rrx_order_su', 'name' => '苏宁', 'pk' => 'order_su_id', 'field' => 'order_su_id AS order_id, total_amount AS order_money, pay_amount AS pay_money, commission'],
+                    5 => ['table' => 'rrx_order_tb', 'name' => '淘宝', 'pk' => 'order_tb_id', 'field' => 'order_tb_id AS order_id, alipay_total_price AS order_money, alipay_total_price AS pay_money, commission'],
+                    6 => ['table' => 'rrx_order_jd', 'name' => '京东', 'pk' => 'order_jd_id', 'field' => 'order_jd_id AS order_id, pay_money AS order_money, pay_money AS pay_money, commission'],
+                    9 => ['table' => 'rrx_order_huafei', 'name' => '话费', 'pk' => 'order_huafei_id', 'field' => 'order_huafei_id AS order_id, pay_money AS order_money, pay_money AS pay_money, commission'],
+                    10 => ['table' => 'rrx_order_merchant', 'name' => '线下扫码', 'pk' => 'id', 'field' => 'id AS order_id, money AS order_money, money AS pay_money, available AS commission']
                 ];
+
+                foreach ($data as $gzcData) {
+                    if (!empty($gzcData['link_id']) && !empty($gzcData['bill'])) {
+                        $orderTypeMap[$gzcData['bill']['type_shop']][$gzcData['bill']['link_id']][] = $gzcData['id'];
+
+                    }
+                }
+
+                if (!empty($orderTypeMap)) {
+                    foreach ($orderTypeMap as $orderType => $map) {
+                        if (isset($orderMap[$orderType])) {
+                            $config = $orderMap[$orderType];
+                            $result = Db::table($config['table'])
+                                ->whereIn($config['pk'], array_keys($map))
+                                ->field($config['field'])
+                                ->select()
+                                ->toArray();
+                            if (!empty($result)) {
+                                foreach ($result as $orderData) {
+                                    foreach ($map[$orderData['order_id']] as $gzcId) {
+                                        if (0 === (int)$orderType && !empty($orderData['mer_id'] ?? '')) {
+                                            if ($orderData['mer_id'] == 496) {
+                                                $orderData['commission'] = '';
+                                                $orderData['source'] = '会员专区';
+                                            } else if ($orderData['mer_id'] == 439) {
+                                                $orderData['source'] = '精彩生活区';
+                                            } else if ($orderData['mer_id'] == 491) {
+                                                $orderData['commission'] = '';
+                                                $orderData['source'] = '复购区';
+                                            } else {
+                                                $orderData['source'] = '商贸区';
+                                            }
+                                        } else {
+                                            $orderData['source'] = $orderMap[$orderType]['name'];
+                                        }
+                                        $orderDetailMap[$gzcId] = $orderData;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                foreach ($data as $item) {
+                    $arr[] = [
+                        $item['id'],
+                        $item['platform_no'],
+                        $item['user']['nickname'],
+                        $item['user']['account'],
+                        $item['user_name'],
+                        $item['mobile'],
+                        $item['user_card'],
+                        $item['bank_name'],
+                        $item['branch_name'],
+                        $item['bank_account'],
+                        $item['bank_no'],
+                        $item['alipay_account'],
+                        $item['alipay_no'],
+                        $item['wxpay_account'],
+                        $item['wxpay_no'],
+                        $orderDetailMap[$item['id']]['source'] ?? '',
+                        $orderDetailMap[$item['id']]['order_money'] ?? '',
+                        $orderDetailMap[$item['id']]['commission'] ?? '',
+                        $item['out_trade_no'],
+                        $item['pension'],
+                        $item['gzc'] == 1 ? '已发起' : '待发起',
+                        $item['gzc_deposit_no'],
+                        $item['gzc_confirm_result'],
+                        $item['create_time'],
+                        $item['update_time']
+                    ];
+                }
             }
             return $this->getStatisticsExcel([
-                'ID', '平台申请单号', '用户昵称', '用户账号', '实名认证姓名', '实名认证电话', '实名认证证件号', '银行名称', '银行名称', '开户账号', '转账流水号', '支付宝账号', '支付宝流水号', '微信账号', '微信流水号', '关联订单', '养老金', '处理状态', '公证处入账编号', '公证处入账结果', '创建时间', '更新时间'
+                'ID', '平台申请单号', '用户昵称', '用户账号', '实名认证姓名', '实名认证电话', '实名认证证件号', '银行名称', '银行名称', '开户账号', '转账流水号', '支付宝账号', '支付宝流水号', '微信账号', '微信流水号', '订单来源', '订单金额', '订单利润', '关联订单', '养老金', '处理状态', '公证处入账编号', '公证处入账结果', '创建时间', '更新时间'
             ], $arr, '公证处入账明细');
         }
 

app/controller/api/Auth.php

@@ -1361,7 +1361,7 @@ class Auth extends BaseController
 
     public function verify(UserAuthValidate $validate)
     {
-        $data = $this->request->params(['phone', 'code', 'key',"type"]);
+        $data = $this->request->params(['phone', 'code', 'key',"type", 'areaCode']);
         $validate->sceneVerify()->check($data);
         log::info("发送短信方法");
         if ($data['type']=="register"){
@@ -1382,7 +1382,7 @@ class Auth extends BaseController
         }
         $sms_code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);
         $sms_time = systemConfig('sms_time') ? systemConfig('sms_time') : 30 ;
-        $res = app()->make(AliYunSmsService::class)->send($data['phone'],  $sms_code);
+        $res = app()->make(AliYunSmsService::class)->send(($data['areaCode'] ?? '') . $data['phone'],  $sms_code);
         if($res['Code']!='OK'){
             Db::name('log')->insert(['data'=>'幸福保短信发送失败：'.json_encode($res,256)]);
             return app('json')->fail('操作过于频繁，请稍后重试~');

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

@@ -322,17 +322,9 @@ class TaskPartnerProfits
                 # code...
                 $allAward = $myWeightMoney + $myMixMoney;
 
-
                 //90%给佣金，10给复购金
                 $yj_90 = floor($allAward * 0.9 * 100) / 100;
                 $fg_10 = floor($allAward * 0.1 * 100) / 100;
-                if ($v == 272) {
-                    $yj_90 = 462.68;
-                    $fg_10 = 51.40;
-                } else if ($v == 303) {
-                    $yj_90 = 163.74;
-                    $fg_10 = 18.19;
-                }
 
                 //                $yj_90 = bcsub($yj_90, $user_bill_uid_list[$v]['number'] ?? 0.00, 2);
                 //
@@ -357,9 +349,7 @@ class TaskPartnerProfits
                     $res = Db::name("user")->where("uid", $v)->inc("total_amount_old", $yj_90)->save();
 
                     Db::name("user")->where("uid", $v)->inc("amount_old", $yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
-                    if ($v != 272 && $v != 303) {
-                        Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
-                    }
+                    Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
                     Db::name("user")->where("uid", $v)->inc("fugou", $fg_10)->save();
 
 

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

@@ -20,65 +20,60 @@ class Taskorderguquan
         /**
         补贴下面人员
         13231658486周行体1000
-        13333069689魏惠新1200
-        13959100621周金花700
-        13701061395李素红600
-        17501006833邢艳丽400
-        15631982690魏震洪400
-        18603401312黄金花500
-        13521438652徐立苹600
-        15832971815孟晓玮500
-        18600200909陈冠霖500
-        13910030010安晓波50
-        15810064711 王   玲 600
+        13333069689魏惠新1000
+        13959100621周金花500
+        13701061395李素红500
+        17501006833邢艳丽300
+        15631982690魏震洪300
+        18603401312黄金花400
+        13521438652徐立苹400
+        15832971815孟晓玮300
+        18600200909陈冠霖300
+        15810064711 王   玲 400
         13932925303会强400
-        13901074090陈玉刚500
-        13381085923王建军100
-        13601071082隋彩云500
+        13901074090陈玉刚400
+        13381085923王建军50
+        13601071082隋彩云300
         18001316701闫旭300
-        13601179856陈瑞元100
-        13161909228刘银霞200
+        13601179856陈瑞元50
+        13161909228刘银霞100
         18760167163刘春梅50
-        18911752386魏利琴50
         13215917919李小秋50
-        15321221558李伟100
+        15321221558李伟50
         15332507711张传莲50
         15960349667吕丽娣50
-        18612051372李金俭100
-        18715313601大饼500
-        其余部分做分红，剩余36364业绩不分
+        18612051372李金俭50
+        18715313601大饼400
+        其余部分做分红
         */
         $data = [
             '13231658486' => 1000,
-            '13333069689' => 1200,
-            '13959100621' => 700,
-            '13701061395' => 600,
-            '17501006833' => 400,
-            '15631982690' => 400,
-            '18603401312' => 500,
-            '13521438652' => 600,
-            '15832971815' => 500,
-            '18600200909' => 500,
-            '13910030010' => 50,
-            '15810064711' => 600,
+            '13333069689' => 1000,
+            '13959100621' => 500,
+            '13701061395' => 500,
+            '17501006833' => 300,
+            '15631982690' => 300,
+            '18603401312' => 400,
+            '13521438652' => 400,
+            '15832971815' => 300,
+            '18600200909' => 300,
+            '15810064711' => 400,
             '13932925303' => 400,
-            '13901074090' => 500,
-            '13381085923' => 100,
-            '13601071082' => 500,
+            '13901074090' => 400,
+            '13381085923' => 50,
+            '13601071082' => 300,
             '18001316701' => 300,
-            '13601179856' => 100,
-            '13161909228' => 200,
+            '13601179856' => 50,
+            '13161909228' => 100,
             '18760167163' => 50,
-            '18911752386' => 50,
             '13215917919' => 50,
-            '15321221558' => 100,
+            '15321221558' => 50,
             '15332507711' => 50,
             '15960349667' => 50,
-            '18612051372' => 100,
-            '18715313601' => 500
+            '18612051372' => 50,
+            '18715313601' => 400
         ];
 
-
         $result = Db::name("user")
             ->whereIn("account", array_keys($data))
             ->where('is_del', 0)
@@ -888,16 +883,6 @@ class Taskorderguquan
 
                 $yj_90 = $v['getcomm'] * 0.9;
                 $fg_10 = $v['getcomm'] * 0.1;
-                if ($v['user_id'] == 272) {
-                    $yj_90 = 10.02;
-                    $fg_10 = 1.13;
-                } else if ($v['user_id'] == 303) {
-                    $yj_90 = 61.18;
-                    $fg_10 = 6.80;
-                } else if ($v['user_id'] == 558) {
-                    $yj_90 = 15.00;
-                    $fg_10 = 1.13;
-                }
 
                 if ($isTest == 0) {
                     // // 更新 user_stock 表中的记录
@@ -909,9 +894,7 @@ class Taskorderguquan
 
                     $res1 = Db::name("user")->where("uid", $v['user_id'])->inc("total_amount_old", $yj_90)->save();
                     $res2 = Db::name("user")->where("uid", $v['user_id'])->inc("amount_old", $yj_90)->save();
-                    if ($v['user_id'] != 272 && $v['user_id'] != 303 && $v['user_id'] != 558) {
-                        Db::name("user")->where("uid", $v['user_id'])->inc("brokerage_price", $yj_90)->save();
-                    }
+                    Db::name("user")->where("uid", $v['user_id'])->inc("brokerage_price", $yj_90)->save();
                     $res3 = Db::name("user")->where("uid", $v['user_id'])->inc("fugou", $fg_10)->save();
 
                     $res = true;

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

@@ -397,7 +397,6 @@ class Taskorderlianc
 
         $originator_award = round(($weekRecord * 0.05), 2);
 
-
         // foreach($list as $k=>$v){
         //     var_dump($v);
         // }
@@ -464,16 +463,10 @@ class Taskorderlianc
                 //90给佣金，10给复购金
                 $yj_90 = $award * 0.9;
                 $fg_10 = $award * 0.1;
-                if ($v == 303) {
-                    $yj_90 = 116.69;
-                    $fg_10 = 12.97;
-                }
                 if ($isTest == 0) {
                     $res = Db::name("user")->where("uid", $v)->inc("total_amount_old", $yj_90)->save();
                     Db::name("user")->where("uid", $v)->inc("amount_old", $yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
-                    if ($v != 303) {
-                        Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
-                    }
+                    Db::name("user")->where("uid", $v)->inc("brokerage_price", $yj_90)->save();
                     $res3 = Db::name("user")->where("uid", $v)->inc("fugou", $fg_10)->save();
 
                     $res = true;

app/validate/api/UserAuthValidate.php

@@ -17,7 +17,7 @@ class UserAuthValidate extends Validate
     protected $failException = true;
 
     protected $rule = [
-        'phone|手机号' => 'require|mobile',
+        // 'phone|手机号' => 'require|mobile',
         'pwd|密码' => 'require|min:6',
         'sms_code|短信验证码' => 'require|max:4',
     ];

crmeb/services/AliYunSmsService.php

@@ -36,13 +36,32 @@ class AliYunSmsService
             ->regionId('cn-hangzhou')
             ->asDefaultClient();
         $templateParam['code'] = $code;
+        $content = '';
         log::info("发送短信方法");
         switch ($templateId) {
             case 'AUTHCODE':
-                $SignName = '融合华夏';
-                $TemplateCode = 'SMS_311255692';
+                // 移除所有非数字字符（保留+）
+                $mobile = preg_replace('/[^0-9+]/', '', $mobile);
 
-                $content = '【华夏幸福保】您的验证码是：' . $code;
+                if (strpos($mobile, '+') === false || strpos($mobile, '+86') === 0) {
+                    if (strpos($mobile, '+86') === 0) {
+                        $mobile = substr($mobile, 3);
+                    }
+                    $SignName = '融合华夏';
+                    $TemplateCode = 'SMS_311255692';
+                    $content = '【华夏幸福保】您的验证码是：' . $code;
+                } else {
+                    if (strpos($mobile, '+') === 0) {
+                        $mobile = substr($mobile, 1);
+                    }
+                    $SignName = '融合华夏';
+                    $TemplateCode = 'SMS_492105133';
+                    $templateParam = [
+                        'code_zh' => $code,
+                        'code_en' => $code
+                    ];
+                    $content = '【融合华夏】您的验证码是：' . $code . '，请输入此验证码以完成验证流程。Your verification code is:' . $code . '. Please enter this code to complete your verification process.';
+                }
                 break;
             case 'ONESELFCARRY':
                 $SignName = '华夏幸福保';
@@ -78,7 +97,7 @@ class AliYunSmsService
                 ->request();
 
             log::info("短信：返回参数");
-            log::info($result);
+            log::info(json_encode($result->toArray()));
             Db::name('sms_record')->insert(['phone' => $mobile, 'content' => $content, 'template' => $TemplateCode, 'create_time'=>date("Y-m-d H:i:s")]);
             return $result->toArray();
         // } catch (ClientException $e) {

route/api.php

@@ -979,9 +979,9 @@ Route::group('api/', function () {
 
     //验证码
     Route::post('auth/verify', 'api.Auth/verify');
-    Route::post('auth/sendSms', 'api.Auth/verify')
-        ->middleware(SignatureMiddleware::class)
-        ->middleware(RateLimitMiddleware::class);
+    Route::post('auth/sendSms', 'api.Auth/verify');
+        // ->middleware(SignatureMiddleware::class)
+        // ->middleware(RateLimitMiddleware::class);
     //微信配置
     Route::get('wechat/config', 'api.Wechat/jsConfig');
     //图片验证码