Merge branch '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/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) {