Merge branch 'master' of https://git.bjtdba.com/shop/php into dev-shichen

app/common/dao/user/UserCertificationDao.php

@@ -85,5 +85,18 @@ class UserCertificationDao extends BaseDao
         return $entityList;
     }
 
-
+    /**
+     * @param $mobile
+     * @return array|\think\db\BaseQuery|\think\Model|null
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author 史晨
+     * @date 2025/10/20 17:21
+     * 获取用户实名信息
+     */
+    public function getUserCertification($mobile)
+    {
+        return $this->getModel()::getDB()->where('mobile', $mobile)->find();
+    }
 }

app/common/enum/CommonEnum.php

@@ -137,6 +137,7 @@ class CommonEnum
                 'Basic' => [ // 售价 => 基础计算价格 (历史原因：原价是1000、2000...等，后来单间成本价上调了180，所以售价调整了，考虑到涨价前后的奖励应保持一致，所以设置了基础计算值)
                     '1180.00' => 1000.00,
                     '2360.00' => 2000.00,
+                    '5900.00' => 5000.00,
                     '9440.00' => 8000.00,
                     '10620.00' => 9000.00,
                     '11800.00' => 10000.00

app/common/enum/store/StoreOrderEnum.php

@@ -40,6 +40,7 @@ class StoreOrderEnum extends CommonEnum
         'B3-VR+Jingdou' => ['code' => 'b3', 'name' => 'VR+京豆'],
         'B4-Cash+Jingdou' => ['code' => 'b4', 'name' => '现金+京豆'],
         'B5-VR' => ['code' => 'b5', 'name' => 'VR'],
+        'B6-Cash' => ['code' => 'b6', 'name' => '现金'],
         'A1-VR' => ['code' => 'a1', 'name' => 'VR'],
         'A2-Cash' => ['code' => 'a2', 'name' => '现金'],
         'A3-Cash+VR' => ['code' => 'a3', 'name' => '现金+VR'],

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

@@ -356,20 +356,42 @@ class OrderGzcRepository extends BaseRepository
 
 
 
-    public function certification($uid, $mobile, $user_name, $user_card, $card_positive, $card_reverse)
+    public function certification($uid, $mobile, $user_name, $user_card, $card_positive, $card_reverse,$cardType,$birthday,$gender,$age)
     {
         $thirdKey = "xingfubao";
         $thirdsignKey = "xfb@86868.";
         $time = time();
 
-        $data = [
-            'uid'  => $uid,
-            'mobile' => $mobile,
-            'user_name' => $user_name,
-            'user_card' => $user_card,
-            'card_positive'=> $card_positive,
-            'card_reverse'=> $card_reverse,
-        ];
+        if ($cardType == 1) {
+            $data = [
+                'uid'  => $uid,
+                'mobile' => $mobile,
+                'user_name' => $user_name,
+                'user_card' => $user_card,
+                'card_positive'=> $card_positive,
+                'card_reverse'=> $card_reverse,
+            ];
+        }else{
+            $concertType = 0;
+            if ($cardType == 2) {
+                $concertType = 10;
+            }
+            if ($cardType == 3) {
+                $concertType = 11;
+            }
+            $data = [
+                'uid'  => $uid,
+                'mobile' => $mobile,
+                'user_name' => $user_name,
+                'user_card' => $user_card,
+                'card_positive'=> $card_positive,
+                'card_reverse'=> $card_reverse,
+                'conCertType' => strval($concertType),
+                'birthday' => strval($birthday),
+                'conSex' => strval($gender),
+                'age' => intval($age)
+            ];
+        }
 
         ksort($data);
         $params = '';

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

@@ -1174,6 +1174,11 @@ class StoreOrderRepository extends BaseRepository
                                 $gx_jf = 1400;
                                 $yj1 = 200;
                                 $le_yw_amount = 600;
+                            } else if ($array_fzone_paytype['price'] == 5900) {
+                                $pv = 5000;
+                                $gx_jf = 3500;
+                                $yj1 = 500;
+                                $le_yw_amount = 1500;
                             }
 
                             $ylj_pri = bcmul($pv, 0.035, 2);
@@ -2380,6 +2385,8 @@ class StoreOrderRepository extends BaseRepository
                 $num_yl = 2000;
             } else if ($orderpri == '9440') {
                 $num_yl = 8000;
+            } else if ($orderpri == '5900') {
+                $num_yl = 5000;
             }
 
             if ($store_product_datas['mer_id'] == 496) {
@@ -2419,7 +2426,7 @@ class StoreOrderRepository extends BaseRepository
 
                             ['type' => 'a1', 'price' => $orderpri, 'other' => 0, 'note' => "VR"],//VR支付
                             ['type' => 'a2', 'price' => $orderpri, 'other' => 0, 'note' => "现金"],//现金支付
-                            ['type' => 'a3', 'price' => $vr_payment, 'other' => $cash_payment, 'note' => "现金+VR"],//现金支付
+                            ['type' => 'a3', 'price' => strval($vr_payment), 'other' => strval($cash_payment), 'note' => "现金+VR"],//现金支付
                         ];
                     }
 
@@ -2665,26 +2672,62 @@ class StoreOrderRepository extends BaseRepository
      * @author xaboy
      * @day 2020/6/10
      */
-    public function getDetail($id, $uid = null)
+    public function getDetail($id)
     {
         $time = systemConfig('auto_take_order_timer') * 24 * 60 * 60;
-
+//
         $where = [];
-        if ($uid) $where['uid'] = $uid;
+//        if ($uid) $where['uid'] = $uid;
 
-        $data = $this->dao->search($where)->where('group_order_id', $id)->where('is_del', 0)->with([
+        $data = $this->dao->search($where)->where('order_sn', $id)->where('is_del', 0)->with([
             'orderProduct', 'merchant' => function ($query) {
                 return $query->field('mer_id,mer_name,mer_avatar,business_id');
             }
-        ])->when(!$uid, function ($query) {
-            $query->with([
-                'user' => function ($query) {
-                    return $query->field('uid,nickname');
+        ])
+//            ->when(!$uid, function ($query) {
+//            $query->with([
+//                'user' => function ($query) {
+//                    return $query->field('uid,nickname');
+//                }
+//            ]);
+//        })
+            ->find();
+//        $query = Db::name('store_order')->alias('o')
+//            ->leftJoin('store_order_product p', 'p.order_id = o.order_id')
+//            ->leftJoin('merchant m', 'm.mer_id = o.mer_id')
+//            ->field('o.*, m.mer_name, m.mer_avatar, m.business_id, p.*')
+//            ->where('o.order_sn', $id)
+//            ->where('o.is_del', 0);
+//        $data = $query->find();
+//        if (!$data) {
+//            return null;
+//        }
+//        $pay_time = isset($data->pay_time) ?? $data['pay_time'];
+//        $data['take_order_time'] = strtotime($pay_time) + $time;
+        if ($data) {
+            foreach ($data as $k => $v) {
+                if ($v === null) {
+                    $data[$k] = 0;
                 }
-            ]);
-        })->find();
-        $pay_time = isset($data->pay_time) ?? $data['pay_time'];
-        $data['take_order_time'] = strtotime($pay_time) + $time;
+            }
+        }
+        $data = $data ? $data->toArray() : null;
+        $pay_time = isset($data['pay_time']) && $data['pay_time'] ? $data['pay_time'] : null;
+        $data['take_order_time'] = $pay_time ? strtotime($pay_time) + $time : null;
+//        if ($query->order_type == 1) {
+//            $query->append(['take']);
+//        }
+        $auto_close_minutes = ((int) systemConfig('auto_close_order_timer')) ?: 15;
+        $createTime = $data['create_time'] ?? $pay_time ?? date('Y-m-d H:i:s');
+        $closeTime = date('Y-m-d H:i:s', strtotime($createTime) + $auto_close_minutes * 60);
+        if (!empty($data['seckill']) && $data['seckill'] == 1) {
+            $nextHourTimestamp = time() + 3600;
+            $closeTime = date('Y-m-d H:00:00', $nextHourTimestamp);
+        }
+        if (!empty($data['is_day_pay']) && $data['is_day_pay'] == 1) {
+            $closeTime = date('Y-m-d H:i:s', strtotime($createTime) + 3 * 60);
+        }
+        $data['close_time'] = $closeTime;
         return $data;
     }
 
@@ -5265,6 +5308,7 @@ class StoreOrderRepository extends BaseRepository
         $teshu_mer_id = implode(',', $teshu_mer_id);
         $query = $this->dao->search($where)->where('test_order', 0)->where('is_del', 0);
 //        $query = $this->dao->search($where)->where('is_del', 0);
+//        $query = Db::name('store_order')->where('test_order', 0)->where('is_del', 0)->where('uid',$where['uid'])->where('paid',1)->where('status',$where['status']);
         $count = $query->count();
         $list = $query->with([
             'orderProduct', 'merchant' => function ($query) {
@@ -9844,7 +9888,8 @@ class StoreOrderRepository extends BaseRepository
                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 0, "推广精彩生活商品赠送贡献值");
                         //积分
                         $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 0, "推广精彩生活商品赠送积分");
-                        if($store_order_data['share_uid']){
+                        // 1123 用户分享的商品不得分享佣金 先暂时这样写
+                        if($store_order_data['share_uid'] && $store_order_data['share_uid'] != 1123){
                             $this->bill_user_log($store_order_data['share_uid'], bcmul($pv * 0.9, 0.03, 2), $store_order_data['order_id'], 20, $store_order_data['order_sn'], '分享获得佣金', $store_order_data['mer_id'], 0);
                             $this->fugou_user_log($store_order_data['share_uid'], bcmul($pv * 0.1, 0.03, 2), $store_order_data['order_id'], 1);
                         }
@@ -9863,7 +9908,8 @@ class StoreOrderRepository extends BaseRepository
                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                         //养老金
                         $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . bcmul($pv, 0.05, 2), $store_order_data['mer_id'], 0);
-                        if($store_order_data['share_uid']){
+                        // 1123 用户分享的商品不得分享佣金 先暂时这样写
+                        if($store_order_data['share_uid'] && $store_order_data['share_uid'] != 1123){
                             $this->bill_user_log($store_order_data['share_uid'], bcmul($pv * 0.9, 0.03, 2), $store_order_data['order_id'], 20, $store_order_data['order_sn'], '分享获得佣金', $store_order_data['mer_id'], 0);
                             $this->fugou_user_log($store_order_data['share_uid'], bcmul($pv * 0.1, 0.03, 2), $store_order_data['order_id'], 1);
                         }
@@ -9917,6 +9963,11 @@ class StoreOrderRepository extends BaseRepository
                 $gx_jf = 1400;
                 $yj1 = 200;
                 $le_yw_amount = 600;
+            } else if ($store_product_data['price'] == 5900) {
+                $pv = 5000;
+                $gx_jf = 3500;
+                $yj1 = 500;
+                $le_yw_amount = 1500;
             }
             // 如果是会员专区的商品 不仅要将奖励的状态设置为生效，还要将订单的 结算状态修改为已结算
             Db::name('store_order')->where('group_order_id', $group_order_id)->update(['is_settlement' => 1]);
@@ -10829,6 +10880,8 @@ class StoreOrderRepository extends BaseRepository
             // 执行 Vr 增减 操作
             $userSignVrRepository->execute($userSignVrEntity->getId());
             $paySuccess = true;
+        } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['B6-Cash']['code']) {
+
         } else if ($fzonePayTypeEntity->getType() == StoreOrderEnum::FZONE_PAY_TYPE['A1-VR']['code']) {
             if ($fzonePayTypeEntity->getPrice() > $userEntity->getVr()) {
                 throw new ValidateException('支付失败，VR不足！');
@@ -10910,7 +10963,7 @@ class StoreOrderRepository extends BaseRepository
                 UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                 UserBillEnum::TYPE_SHOP['Platform']['code'],
                 $storeOrderEntity->getOrderId(),
-                '购买精彩生活商品赠送养老金'
+                '购买精彩生活商品获得养老金'
             );
 
             // 为用户初始胡 贡献值
@@ -10921,7 +10974,7 @@ class StoreOrderRepository extends BaseRepository
                 $storeOrderEntity->getUid(),
                 UserSignGongxianEnum::TYPE['Give']['code'],
                 $gongxian,
-                '购买精彩生活商品赠送贡献值',
+                '购买精彩生活商品获得贡献值',
                 UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
                 $storeOrderEntity->getOrderId()
             );
@@ -10933,7 +10986,7 @@ class StoreOrderRepository extends BaseRepository
             $userPvLogRepository->addUserPvLog(
                 $storeOrderEntity->getUid(),
                 $pv,
-                '购买精彩生活商品赠送PV值',
+                '购买精彩生活商品获得PV值',
                 UserPvLogEnum::ORDER_TYPE['Platform']['code'],
                 $storeOrderEntity->getOrderId()
             );
@@ -10947,7 +11000,7 @@ class StoreOrderRepository extends BaseRepository
                 UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                 UserSignScoreEnum::PM['Income']['code'],
                 $score,
-                '购买精彩生活商品赠送积分',
+                '购买精彩生活商品获得积分',
                 UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                 $storeOrderEntity->getOrderId()
             );
@@ -10961,7 +11014,7 @@ class StoreOrderRepository extends BaseRepository
                     $storeOrderEntity->getUid(),
                     UserSignHongbaoEnum::TYPE['ConsumptionGift']['code'],
                     $hongbao,
-                    '购买精彩生活商品赠送红包',
+                    '购买精彩生活商品获得红包',
                     UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                     $storeOrderEntity->getOrderId()
                 );
@@ -10986,7 +11039,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouBySpreadUid,
                         UserSignFugouEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
-                        '推广精彩生活区商品赠送复购金',
+                        '推广精彩生活区商品获得复购金',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
@@ -11007,26 +11060,26 @@ class StoreOrderRepository extends BaseRepository
                         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
-                        '推广精彩生活区商品赠送佣金'
+                        '推广精彩生活区商品获得佣金'
                     );
 
                     // 初始胡 贡献值
                     $gongxianBySpreadUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Spread']['Gongxian']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                    // 赠送贡献值
+                    // 获得贡献值
                     /** @var UserSignGongxianRepository $userSignGongxianRepository */
                     $userSignGongxianRepository = app()->make(UserSignGongxianRepository::class);
                     $userSignGongxianRepository->addUserSingGongxian(
                         $userEntityBySpreadUid->getUid(),
                         UserSignGongxianEnum::TYPE['Give']['code'],
                         $gongxianBySpreadUid,
-                        '推广精彩生活商品赠送贡献值',
+                        '推广精彩生活商品获得贡献值',
                         UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
 
                     // 计算积分值
                     $scoreBySpreadUid = bcmul($directReferralBonus, CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Spread']['Score']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                    // 赠送积分
+                    // 获得积分
                     /** @var UserSignScoreRepository $userSignScoreRepository */
                     $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
                     $userSignScoreRepository->addUserSingScore(
@@ -11034,7 +11087,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                         UserSignScoreEnum::PM['Income']['code'],
                         $scoreBySpreadUid,
-                        '推广精彩生活区商品赠送积分',
+                        '推广精彩生活区商品获得积分',
                         UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
@@ -11062,7 +11115,7 @@ class StoreOrderRepository extends BaseRepository
             }
 
             // 分享收益
-            if (!empty($storeOrderEntity->getShareUid())) {
+            if (!empty($storeOrderEntity->getShareUid()) && $storeOrderEntity->getShareUid() != 1123) {
                 $userEntityByShareUid = $userRepository->getUserEntityByUid($storeOrderEntity->getShareUid());
                 if (!empty($userEntityByShareUid->getUid()) && $userEntityByShareUid->getIsDel() == UserEnum::IS_DEL['No']['code']) {
                     // 计算 佣金
@@ -11081,7 +11134,7 @@ class StoreOrderRepository extends BaseRepository
                         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
-                        '分享精彩生活区商品赠送佣金'
+                        '分享精彩生活区商品获得佣金'
                     );
                     // 计算 复购金
                     $fugouByShareUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Share']['Fugou']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
@@ -11093,7 +11146,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouByShareUid,
                         UserSignFugouEnum::COMMISSION_TYPE['SHARE_EARNINGS']['code'],
-                        '分享精彩生活区商品赠送复购金',
+                        '分享精彩生活区商品获得复购金',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
@@ -11122,7 +11175,7 @@ class StoreOrderRepository extends BaseRepository
                         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
-                        '锁客佣金（精彩生活区商品赠送）'
+                        '锁客佣金（精彩生活区商品获得）'
                     );
                     // 计算 复购金
                     $fugouByMerId = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['WonderfulLiving']['Lock']['Fugou']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
@@ -11134,7 +11187,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouByMerId,
                         UserSignFugouEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
-                        '锁客复购金（精彩生活区商品赠送）',
+                        '锁客复购金（精彩生活区商品获得）',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
@@ -11159,7 +11212,7 @@ class StoreOrderRepository extends BaseRepository
                     UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                     UserBillEnum::TYPE_SHOP['Platform']['code'],
                     $storeOrderEntity->getOrderId(),
-                    '购买会员专区商品赠送养老金'
+                    '购买会员专区商品获得养老金'
                 );
 
                 // 为用户初始胡 贡献值
@@ -11170,7 +11223,7 @@ class StoreOrderRepository extends BaseRepository
                     $storeOrderEntity->getUid(),
                     UserSignGongxianEnum::TYPE['Give']['code'],
                     $gongxian,
-                    '购买会员专区商品赠送贡献值',
+                    '购买会员专区商品获得贡献值',
                     UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
                     $storeOrderEntity->getOrderId()
                 );
@@ -11182,7 +11235,7 @@ class StoreOrderRepository extends BaseRepository
                 $userPvLogRepository->addUserPvLog(
                     $storeOrderEntity->getUid(),
                     $pv,
-                    '购买会员专区商品赠送PV值',
+                    '购买会员专区商品获得PV值',
                     UserPvLogEnum::ORDER_TYPE['Platform']['code'],
                     $storeOrderEntity->getOrderId()
                 );
@@ -11196,7 +11249,7 @@ class StoreOrderRepository extends BaseRepository
                     UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                     UserSignScoreEnum::PM['Income']['code'],
                     $score,
-                    '购买会员专区商品赠送积分',
+                    '购买会员专区商品获得积分',
                     UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                     $storeOrderEntity->getOrderId()
                 );
@@ -11221,7 +11274,7 @@ class StoreOrderRepository extends BaseRepository
                                 UserSignFugouEnum::TYPE['Give']['code'],
                                 $fugouBySpreadUid,
                                 UserSignFugouEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
-                                '推广会员专区商品赠送复购金',
+                                '推广会员专区商品获得复购金',
                                 UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                                 $storeOrderEntity->getOrderId()
                             );
@@ -11242,7 +11295,7 @@ class StoreOrderRepository extends BaseRepository
                                 UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                                 UserBillEnum::TYPE_SHOP['Platform']['code'],
                                 $storeOrderEntity->getOrderId(),
-                                '推广会员专区商品赠送佣金'
+                                '推广会员专区商品获得佣金'
                             );
                         }
 
@@ -11254,14 +11307,14 @@ class StoreOrderRepository extends BaseRepository
                             $gongxianRatio = CommonEnum::ORDER_EARNING_ALLOCATION['MemberZone']['Spread']['Gongxian']['Ratio']['code'];
                         }
                         $gongxianBySpreadUid = bcmul($basePrice, $gongxianRatio, CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                        // 赠送贡献值
+                        // 获得贡献值
                         /** @var UserSignGongxianRepository $userSignGongxianRepository */
                         $userSignGongxianRepository = app()->make(UserSignGongxianRepository::class);
                         $userSignGongxianRepository->addUserSingGongxian(
                             $userEntityBySpreadUid->getUid(),
                             UserSignGongxianEnum::TYPE['Give']['code'],
                             $gongxianBySpreadUid,
-                            '推广会员专区商品赠送贡献值',
+                            '推广会员专区商品获得贡献值',
                             UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
                             $storeOrderEntity->getOrderId()
                         );
@@ -11271,7 +11324,7 @@ class StoreOrderRepository extends BaseRepository
                         $rate = static::getUserGroupRate($userEntityBySpreadUid->getUserGroup());
                         $scoreByUserGroupRate = bcmul($basePrice, $rate, CommonEnum::CALCULATE_THE_NUMBER_OF_DECIMAL_PLACES);
                         $scoreBySpreadUid = bcmul($scoreByUserGroupRate, CommonEnum::ORDER_EARNING_ALLOCATION['MemberZone']['Spread']['Score']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                        // 赠送积分
+                        // 获得积分
                         /** @var UserSignScoreRepository $userSignScoreRepository */
                         $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
                         $userSignScoreRepository->addUserSingScore(
@@ -11279,7 +11332,7 @@ class StoreOrderRepository extends BaseRepository
                             UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                             UserSignScoreEnum::PM['Income']['code'],
                             $scoreBySpreadUid,
-                            '推广会员专区商品赠送积分',
+                            '推广会员专区商品获得积分',
                             UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                             $storeOrderEntity->getOrderId()
                         );
@@ -11321,7 +11374,7 @@ class StoreOrderRepository extends BaseRepository
                 UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                 UserBillEnum::TYPE_SHOP['Platform']['code'],
                 $storeOrderEntity->getOrderId(),
-                '购买复购区赠送养老金'
+                '购买复购区获得养老金'
             );
 
             // 给推荐人的奖励
@@ -11342,7 +11395,7 @@ class StoreOrderRepository extends BaseRepository
                         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
-                        '推荐复购区商品赠送养老金'
+                        '推荐复购区商品获得养老金'
                     );
 
                     // 给间接推荐人的奖励
@@ -11363,7 +11416,7 @@ class StoreOrderRepository extends BaseRepository
                                 UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                                 UserBillEnum::TYPE_SHOP['Platform']['code'],
                                 $storeOrderEntity->getOrderId(),
-                                '间推复购区商品赠送养老金'
+                                '间推复购区商品获得养老金'
                             );
                         }
                     }
@@ -11389,7 +11442,7 @@ class StoreOrderRepository extends BaseRepository
                 UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                 UserBillEnum::TYPE_SHOP['Platform']['code'],
                 $storeOrderEntity->getOrderId(),
-                '购买商贸区商品赠送养老金'
+                '购买商贸区商品获得养老金'
             );
 
             // 为用户初始胡 贡献值
@@ -11400,7 +11453,7 @@ class StoreOrderRepository extends BaseRepository
                 $storeOrderEntity->getUid(),
                 UserSignGongxianEnum::TYPE['Give']['code'],
                 $gongxian,
-                '购买商贸区商品赠送贡献值',
+                '购买商贸区商品获得贡献值',
                 UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
                 $storeOrderEntity->getOrderId()
             );
@@ -11412,7 +11465,7 @@ class StoreOrderRepository extends BaseRepository
             $userPvLogRepository->addUserPvLog(
                 $storeOrderEntity->getUid(),
                 $pv,
-                '购买商贸区商品赠送PV值',
+                '购买商贸区商品获得PV值',
                 UserPvLogEnum::ORDER_TYPE['Platform']['code'],
                 $storeOrderEntity->getOrderId()
             );
@@ -11426,7 +11479,7 @@ class StoreOrderRepository extends BaseRepository
                 UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                 UserSignScoreEnum::PM['Income']['code'],
                 $score,
-                '购买商贸区商品赠送积分',
+                '购买商贸区商品获得积分',
                 UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                 $storeOrderEntity->getOrderId()
             );
@@ -11453,7 +11506,7 @@ class StoreOrderRepository extends BaseRepository
                     $storeOrderEntity->getUid(),
                     UserSignHongbaoEnum::TYPE['ConsumptionGift']['code'],
                     $hongbao,
-                    '购买商贸区商品赠送红包',
+                    '购买商贸区商品获得红包',
                     UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                     $storeOrderEntity->getOrderId()
                 );
@@ -11478,7 +11531,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouBySpreadUid,
                         UserSignFugouEnum::COMMISSION_TYPE['DIRECT_REFERRAL']['code'],
-                        '推广商贸区商品赠送复购金',
+                        '推广商贸区商品获得复购金',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
@@ -11499,25 +11552,25 @@ class StoreOrderRepository extends BaseRepository
                         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
-                        '推广商贸区商品赠送佣金'
+                        '推广商贸区商品获得佣金'
                     );
                     // 初始胡 贡献值
                     $gongxianBySpreadUid = bcmul($storeOrderEntity->getConPri(), CommonEnum::ORDER_EARNING_ALLOCATION['CommercialDistrict']['Spread']['Gongxian']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                    // 赠送贡献值
+                    // 获得贡献值
                     /** @var UserSignGongxianRepository $userSignGongxianRepository */
                     $userSignGongxianRepository = app()->make(UserSignGongxianRepository::class);
                     $userSignGongxianRepository->addUserSingGongxian(
                         $userEntityBySpreadUid->getUid(),
                         UserSignGongxianEnum::TYPE['Give']['code'],
                         $gongxianBySpreadUid,
-                        '推广商贸区商品赠送贡献值',
+                        '推广商贸区商品获得贡献值',
                         UserSignGongxianEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
 
                     // 计算积分值
                     $scoreBySpreadUid = bcmul($directReferralBonus, CommonEnum::ORDER_EARNING_ALLOCATION['CommercialDistrict']['Spread']['Score']['Ratio']['code'], CommonEnum::DECIMAL_PLACES_OF_THE_AMOUNT);
-                    // 赠送积分
+                    // 获得积分
                     /** @var UserSignScoreRepository $userSignScoreRepository */
                     $userSignScoreRepository = app()->make(UserSignScoreRepository::class);
                     $userSignScoreRepository->addUserSingScore(
@@ -11525,7 +11578,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignScoreEnum::SOURCE_TYPE['SelfOrder']['code'],
                         UserSignScoreEnum::PM['Income']['code'],
                         $scoreBySpreadUid,
-                        '推广商贸区商品赠送积分',
+                        '推广商贸区商品获得积分',
                         UserSignHongbaoEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );
@@ -11574,7 +11627,7 @@ class StoreOrderRepository extends BaseRepository
                         UserBillEnum::ORDER_TYPE['SELF_OPERATED']['code'],
                         UserBillEnum::TYPE_SHOP['Platform']['code'],
                         $storeOrderEntity->getOrderId(),
-                        '锁客佣金（精彩生活区商品赠送）'
+                        '锁客佣金（精彩生活区商品获得）'
                     );
 
                     // 计算 复购金
@@ -11587,7 +11640,7 @@ class StoreOrderRepository extends BaseRepository
                         UserSignFugouEnum::TYPE['Give']['code'],
                         $fugouByMerId,
                         UserSignFugouEnum::COMMISSION_TYPE['LOCKED_CUSTOMER']['code'],
-                        '锁客复购金（精彩生活区商品赠送）',
+                        '锁客复购金（精彩生活区商品获得）',
                         UserSignFugouEnum::ORDER_TYPE['Platform']['code'],
                         $storeOrderEntity->getOrderId()
                     );

app/common/repositories/store/product/ProductRepository.php

@@ -1043,6 +1043,8 @@ class ProductRepository extends BaseRepository
                 $s= 2000;
             }else if($res['price'] == 9440){
                 $s = 8000;
+            }else if($res['price'] == 5900){
+                $s = 5000;
             }
 
             $res['yanglao'] = bcmul($s, 0.035, 2);
@@ -1717,6 +1719,8 @@ class ProductRepository extends BaseRepository
                 $num_yl = 2000;
             }else if($product['price'] == '9440'){
                 $num_yl = 8000;
+            }else if($product['price'] == '5900'){
+                $num_yl = 5000;
             }
 
             if($product['mer_id'] == 496){

app/common/repositories/system/merchant/MerchantRepository.php

@@ -453,6 +453,8 @@ class MerchantRepository extends BaseRepository
                 $num_yl = 2000;
             }else if($v['price'] == '9440'){
                 $num_yl = 8000;
+            }else if($v['price'] == '5900'){
+                $num_yl = 5000;
             }
 
             if($productMerId == 496){

app/common/repositories/user/UserPvLogRepository.php

@@ -186,7 +186,7 @@ class UserPvLogRepository extends BaseRepository
                 );
             }
 
-            if (!empty($updateUserBillEntityList)) {
+            if (!empty($updateUserPvLogEntityList)) {
                 $this->batchUpdateUserPvLogDataByDataList(
                     array_map(function (UserPvLogEntity $updateUserPvLogEntity) {
                         return $updateUserPvLogEntity->toUnderlineArray();

app/common/repositories/user/UserRepository.php

@@ -2911,7 +2911,14 @@ class UserRepository extends BaseRepository
             //            $birth = strtotime(substr($certification["user_card"], 6, 8));
             $old_age = $this->getSex($certification["user_card"])?60:55;
             //            $age = $this->howOld($birth);
-            $age=$this->calculateAge($birth_data);
+
+
+            // 兼容港澳台证件号
+            if ($certification['card_type'] == 1){
+                $age=$this->calculateAge($birth_data);
+            }else{
+                $age=$this->calculateAge($certification['birthday']);
+            }
 
             if ($age < $old_age) {
                 //                $yes = $old_age - $age;
@@ -2932,8 +2939,11 @@ class UserRepository extends BaseRepository
             $data['annuity_yiqu'] = 123;
 
 
-
-            $data["birthday60"] =  $this->getFutureBirthday($birth_data,$old_age);
+            if ($certification['card_type'] == 1) {
+                $data["birthday60"] =  $this->getFutureBirthday($birth_data,$old_age);
+            }else{
+                $data["birthday60"] =  $this->getFutureBirthday($certification['birthday'],$old_age);
+            }
         }
         $order_merchant_price= OrderMerchant::getInstance()->where('paid', 1)
             ->where(function ($query) use ($data) {

app/controller/admin/order/Order.php

@@ -346,18 +346,18 @@ class Order extends BaseController
             Db::startTrans();
             //查找是否有推荐人
             $spreadUid = Db::name('user')->where('uid', $uid)->value('spread_uid');
-            //取出并删除 pv
+            //取出pv
             $pv = $this->getValue('user_pv_log', [['order_id', '=', $order_id], ['status', '=', 1],], 'pv');
-            //取出 vr 消耗
+            //取出 vr
             $payVr = $this->getValue('user_sign_vr', [['order_id', '=', $order_id], ['type', '=', 2],], 'number');
             //取出购买赠送积分 / 支出积分
             $score = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['status', '=', 1], ['source_type', '=', 3], ['uid', '=', $uid], ['pm', '=', 1],], 'reward_socre');
             $payScore = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['status', '=', 1], ['pm', '=', 2], ['uid', '=', $uid],], 'reward_socre');
             // 贡献值
             $gongXian = $this->getValue('user_sign_gongxian', [['order_id', '=', $order_id], ['status', '=', 1], ['type', '=', 1], ['uid', '=', $uid],], 'number');
-            // 养老金 / 推广养老金 / 推广佣金
+            // 养老金
             $yangLaoJin = $this->getValue('user_bill', [['link_id', '=', $order_id], ['status', '=', 1], ['pm', '=', 1], ['uid', '=', $uid],], 'number');
-            if($spreadUid){
+            if($spreadUid){  //如果有推荐人就执行
                 $spreadScore = 0;
                 $spreadGongXian = 0;
                 $spreadYlj = 0;
@@ -367,39 +367,79 @@ class Order extends BaseController
                 $spreadYlj = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 5], ['uid', '=', $spreadUid],], 'number'); //推荐获得养老金
                 $spreadYongJin = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', '=', $spreadUid],], 'number');  //推荐获得佣金
                 $spreadUser = Db::name('user')->where('uid', $spreadUid)->find();
-                Db::name('backup_user')->insert($spreadUser);
-                Db::name('user')->where('uid', $spreadUid)->dec('score', $spreadScore)->update();
-                Db::name('user')->where('uid', $spreadUid)->dec('per_contribute', $spreadGongXian)->update();
-                Db::name('user')->where('uid', $spreadUid)->dec('annuity', $spreadYlj)->update();
-                Db::name('user')->where('uid', $spreadUid)->dec('brokerage_price', $spreadYongJin)->update();
+                Db::name('backup_user')->insert($spreadUser);  //插入备份表
+                Db::name('user')->where('uid', $spreadUid)   //更新数据
+                    ->update([
+                        'score' => Db::raw("score - {$spreadScore}"),
+                        'per_contribute' => Db::raw("per_contribute - {$spreadGongXian}"),
+                        'brokerage_price' => Db::raw("brokerage_price - {$spreadYongJin}"),
+                        'annuity' => Db::raw("annuity - {$spreadYlj}"),
+                    ]);
+                $userhjm1 =[
+                    'uid' => $spreadUid,
+                    'order_id' => $order_id,
+                    'score' => $spreadScore??0,
+                    'per_contribute' => $spreadGongXian??0,
+                    'brokerage_price' => $spreadYongJin??0,
+                    'user' => 2,
+                ];
+                Db::name('backup_user_change')->insert($userhjm1);   //插入更新数据记录表
             }
             //扫吗消费
             $smSpreadUid = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['mark','like','%扫码%'], ['status', '=', 1],], 'uid');
             $smSpreadScore = $this->getValue('user_sign_score', [['order_id', '=', $order_id], ['uid','=',$smSpreadUid], ['status', '=', 1],], 'reward_socre');
             //第二推荐
-            $spreadYongJinTwo = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', '<>', $spreadUid],], 'number');
-            $spreadYongJinTwoUid = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', '<>', $spreadUid],], 'uid');
-            //更新对应的user表
+            $spreadYongJinTwoUid = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', 'not in', [$uid, $spreadUid]],], 'uid');
+            $spreadYongJinTwo = $this->getValue('user_bill', [['link_id', '=', $order_id], ['commission_type', '=', 3], ['uid', '=', $spreadYongJinTwoUid],], 'number');
+            //更新购买用户的user表
+            $uscore = $payScore - $score;
             $user = Db::name('user')->where('uid', $uid)->find();
             Db::name('backup_user')->insert($user);
-            Db::name('user')->where('uid', $uid)->dec('pv', $pv)->update();
-            Db::name('user')->where('uid', $uid)->inc('vr', $payVr)->update();
-            Db::name('user')->where('uid', $uid)->inc('score', $payScore)->update();
-            Db::name('user')->where('uid', $uid)->dec('score', $score)->update();
-            Db::name('user')->where('uid', $uid)->dec('contribute', $gongXian)->update();
-            Db::name('user')->where('uid', $uid)->dec('annuity', $yangLaoJin)->update();
+            Db::name('user')->where('uid', $uid)
+                ->update([
+                    'pv'         => Db::raw("pv - {$pv}"),
+                    'vr'         => Db::raw("vr + {$payVr}"),
+                    'score'      => Db::raw("score + {$uscore}"),
+                    'contribute' => Db::raw("contribute - {$gongXian}"),
+                    'annuity'    => Db::raw("annuity - {$yangLaoJin}"),
+                ]);
+            $userhjm =[
+                'uid' => $uid,
+                'order_id' => $order_id,
+                'pv' => $pv??0,
+                'vr' => $payVr??0,
+                'score' => $uscore??0,
+                'contribute' => $gongXian??0,
+                'annuity' => $yangLaoJin??0,
+                'user' => 1,
+            ];
+            Db::name('backup_user_change')->insert($userhjm);//具体修改插入对应表
             //第二推荐
             if($spreadYongJinTwoUid) {
                 $spreadUserTwo = Db::name('user')->where('uid', $spreadYongJinTwoUid)->find();
                 Db::name('backup_user')->insert($spreadUserTwo);
                 Db::name('user')->where('uid', $spreadYongJinTwoUid)->dec('brokerage_price', $spreadYongJinTwo)->update();
-            }
+                $userhjm2 =[
+                    'uid' => $spreadYongJinTwoUid,
+                    'order_id' => $order_id,
+                    'brokerage_price' => $spreadYongJinTwo??0,
+                    'user' => 3,
+                ];
+                Db::name('backup_user_change')->insert($userhjm2);
+            }//扫码消费
             if($smSpreadUid){
                 $smUserTwo = Db::name('user')->where('uid', $smSpreadUid)->find();
                 Db::name('backup_user')->insert($smUserTwo);
                 Db::name('user')->where('uid', $smSpreadUid)->dec('score', $smSpreadScore)->update();
+                $userhjm3 =[
+                    'uid' => $smSpreadUid,
+                    'order_id' => $order_id,
+                    'score' => $smSpreadScore??0,
+                    'user' => 4,
+                ];
+                Db::name('backup_user_change')->insert($userhjm3);
             }
-            // 删除订单相关表
+            // 删除订单相关表p;
             $this->backupAndDelete('store_order', ['group_order_id' => $group_order_id]);
             $this->backupAndDelete('store_group_order', ['group_order_id' => $group_order_id]);
             $this->backupAndDelete('user_pv_log', ['order_id' => $order_id]);
@@ -416,7 +456,7 @@ class Order extends BaseController
         return app('json')->success('操作成功');
     }
 
-    private function backupAndDelete($table, array $where)
+    private function backupAndDelete($table, array $where)//备份并删除
     {
         $backupTable = 'backup_' . $table;
         $rows = Db::name($table)->where($where)->select()->toArray();
@@ -425,9 +465,119 @@ class Order extends BaseController
             Db::name($table)->where($where)->delete();
         }
     }
-    private function getValue($table, array $where, string $field, $default = 0)
+    private function getValue($table, array $where, string $field, $default = 0)//查找
     {
         $value = Db::name($table)->where($where)->value($field);
         return $value ?? $default;
     }
+
+    /**
+     * 展示撤回订单列表,恢复订单
+     */
+    public function killOrderLst()  //撤回订单的列表
+    {
+        $query = Db::name('backup_store_order')->paginate(20)->toArray();
+        return app('json')->success($query, '获取成功');
+    }
+    public function easterKillOrder(){   //恢复订单
+        $group_order_id = request()->param('group_order_id');
+        $order_id = request()->param('order_id');
+        if (empty($order_id) || empty($group_order_id)) {
+            return app('json')->fail('参数缺失');
+        }
+        try {
+            Db::startTrans();
+            // 恢复订单相关表
+            $this->easterOrder('store_order', ['group_order_id' => $group_order_id]);
+            $this->easterOrder('store_group_order', ['group_order_id' => $group_order_id]);
+            // 恢复 pv
+            $this->easterOrder('user_pv_log', ['order_id' => $order_id]);
+            // 恢复 vr
+            $this->easterOrder('user_sign_vr', ['order_id' => $order_id]);
+            // 恢复 积分
+            $this->easterOrder('user_sign_score', ['order_id' => $order_id]);
+            // 恢复 贡献值
+            $this->easterOrder('user_sign_gongxian', ['order_id' => $order_id]);
+            // 恢复 佣金/养老金等
+            $this->easterOrder('user_bill', ['link_id' => $order_id]);
+            // 恢复 公证处
+            $this->easterOrder('gzc_logs', ['link_id' => $order_id]);
+            //恢复用户奖励
+            $this->easterUserAward(['order_id' => $order_id]);
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            return app('json')->fail('撤回失败: '.$e->getMessage());
+        }
+        return app('json')->success('撤回成功');
+    }
+    private function easterOrder($table, array $where)  //恢复表数据
+    {
+        $backupTable = 'backup_' . $table;
+        $rows = Db::name($backupTable)->where($where)->select()->toArray();
+
+        if ($rows) {
+            foreach ($rows as &$row) {
+                if (isset($row['del_time'])) unset($row['del_time']);
+            }
+            unset($row);
+            Db::name($table)->insertAll($rows);
+            Db::name($backupTable)->where($where)->delete();
+        }
+    }
+    private function easterUserAward(array $where){  //恢复奖励
+        $row = Db::name('backup_user_change')->where($where)->where('user', 1)->field('pv, vr, score, contribute, annuity,uid')->find();
+        $uid = $row['uid'];
+        $pv   = $row['pv'];
+        $vr   = $row['vr'];
+        $score= $row['score'];
+        $contribute = $row['contribute'];
+        $annuity = $row['annuity'];
+        Db::name('user') //更新订单用户
+            ->where('uid', $uid)
+            ->update([
+                'pv'         => Db::raw("pv + {$pv}"),
+                'vr'         => Db::raw("vr - {$vr}"),
+                'score'      => Db::raw("score - {$score}"),
+                'contribute' => Db::raw("contribute + {$contribute}"),
+                'annuity'    => Db::raw("annuity + {$annuity}"),
+            ]);
+        $row2 = Db::name('backup_user_change')->where($where)->where('user', 2)->field('brokerage_price, score, per_contribute, annuity,uid')->find();
+        if ($row2) {
+            $spreadUid = $row2['uid'];
+            $spreadScore = $row2['score'];
+            $per_contribute = $row2['per_contribute'];
+            $spreadAnnuity = $row2['annuity'];
+            $spreadYongJin = $row2['brokerage_price'];
+            Db::name('user')     //更新推荐人
+            ->where('uid', $spreadUid)
+                ->update([
+                    'score' => Db::raw("score + {$spreadScore}"),
+                    'contribute' => Db::raw("contribute + {$per_contribute}"),
+                    'annuity' => Db::raw("annuity + {$spreadAnnuity}"),
+                    'brokerage_price' => Db::raw("brokerage_price + {$spreadYongJin}"),
+                    'per_contribute'=> Db::raw("per_contribute + {$per_contribute}"),
+                ]);
+        }
+        $row3 = Db::name('backup_user_change')->where($where)->where('user', 3)->field('brokerage_price,uid')->find();
+        if ($row3) {
+            $spreadUidTwo = $row3['uid']; //第二推荐人
+            $spreadYongJin2 = $row3['brokerage_price'];
+            Db::name('user')
+                ->where('uid', $spreadUidTwo)
+                ->update([
+                    'brokerage_price' => Db::raw("brokerage_price + {$spreadYongJin2}"),
+                ]);
+        }
+        $row4 = Db::name('backup_user_change')->where($where)->where('user', 4)->field('score,uid')->find();
+        if ($row4) {
+            $spreadUidThree = $row4['uid'];   //扫码
+            $spreadScore3 = $row4['score'];
+            Db::name('user')
+                ->where('uid', $spreadUidThree)
+                ->update([
+                    'score' => Db::raw("score + {$spreadScore3}"),
+                ]);
+        }
+    }
 }

app/controller/admin/order/ThirdOrder.php

@@ -3,6 +3,7 @@ namespace app\controller\admin\order;
 
 use app\common\repositories\user\UserThirdRepository;
 use crmeb\basic\BaseController;
+use crmeb\services\SpreadsheetExcelService;
 use think\App;
 
 class ThirdOrder extends BaseController
@@ -71,5 +72,509 @@ class ThirdOrder extends BaseController
         return app('json')->success($this->repository->GetThirdDetail($id,$table['table']));
     }
 
-
+    /**
+     * 导出第三方订单
+     */
+    public function getJdOrder()
+    {
+        $where = $this->request->params(['date','order_sn','status','keywords','bill_status']);//筛选条件
+        $page = 1;
+        $limit = 9999999;
+        $temporaryData = $this->repository->GetJdOrder($where,$page,$limit);
+        $data = $temporaryData['list'];
+        $arr = [];
+        foreach ($data as $item) {
+            $arr[] = [
+                $item['order_jd_id'] ?? '',       // 订单表ID
+                $item['uid'] ?? '',               // 用户ID
+                $item['commission'] ?? '',        // 佣金 actualFee
+                $item['commission_share'] ?? '',  // 佣金比例 finalRate
+                $item['jd_id'] ?? '',             // 订单id
+                $item['order_sn'] ?? '',          // 订单号
+                $item['pay_money'] ?? '',         // 实际计算佣金的金额
+                $item['create_time'] ?? '',       // 创建时间
+                $item['finish_time'] ?? '',       // 完成时间
+                $item['modify_time'] ?? '',       // 更新时间
+                $item['sku_num'] ?? '',           // 数量
+                $item['sku_id'] ?? '',            // 商品id
+                $item['sku_name'] ?? '',          // 商品名称
+                $item['price'] ?? '',             // 单价
+                $item['sub_union_id'] ?? '',      // 子渠道id-用户pid
+                $item['image_url'] ?? '',         // 商品图片
+                $item['shop_name'] ?? '',         // 店铺名称
+                $item['shop_id'] ?? '',           // 店铺id
+                $item['status'] ?? '',            // 订单状态 validCode
+                $item['bill_status'] ?? '',       // 结算状态
+                $item['bill_create_time'] ?? '',  // 平台结算时间
+                $item['bill_end_time'] ?? '',     // 可结算日期
+                $item['gzc'] ?? '',               // 公证处标记
+                $item['user_address_ids'] ?? '',  // 详细地址串
+                $item['type'] ?? '',              // 订单类型
+                $item['pv'] ?? '',                // PV值
+            ];
+        }
+        $header = [
+            '订单表ID',
+            '用户ID',
+            '佣金 (actualFee)',
+            '佣金比例 (finalRate)',
+            '订单ID',
+            '订单号',
+            '实际计算佣金的金额',
+            '创建时间',
+            '完成时间',
+            '更新时间',
+            '数量',
+            '商品ID',
+            '商品名称',
+            '单价',
+            '子渠道ID (用户PID)',
+            '商品图片',
+            '店铺名称',
+            '店铺ID',
+            '订单状态 (validCode)',
+            '0平台未结算1已结算2失效',
+            '平台结算时间',
+            '可结算日期',
+            '公证处IN10是否发起0否1是',
+            '详细地址串',
+            '1京推推订单 2京东联盟订单',
+            'PV值',
+        ];
+        $filename = '京东订单导出_' . date('YmdHis') . '_' . rand(10000,99999);
+        $_instance = SpreadsheetExcelService::instance_xin();
+        $_path = $_instance
+            ->createOrActive()
+            ->setExcelHeader($header)
+            ->setExcelTile('京东订单明细', $filename, '生成时间: ' . date('Y-m-d H:i:s'))
+            ->setExcelContent($arr)
+            ->excelSave($filename, 'xlsx', 'extract');
+        $domain = request()->domain();
+        return [
+            'name' => $filename . '.xlsx',
+            'status' => 200,
+            'path' => $domain . '/' . $_path
+        ];
+    }
+    public function  getWphOrder()
+    {
+        $where = $this->request->params(['date','order_sn','order_status','keywords','bill_status','settled']);
+        $page = 1;
+        $limit = 9999999;
+        $temporaryData = $this->repository->GetVipOrder($where,$page,$limit);
+        $data = $temporaryData['list'];
+        $arr = [];
+        foreach ($data as $item) {
+            $arr[] = [
+                $item['order_vip_id'],
+                $item['uid'],
+                $item['pid'],
+                $item['order_sn'],
+                $item['pay_money'],
+                $item['status'],
+                $item['new_customer'],
+                $item['order_time'],
+                $item['sign_time'],
+                $item['settled_time'],
+                $item['goods_id'],
+                $item['goods_name'],
+                $item['goods_thumb'],
+                $item['goods_count'],
+                $item['commission_total'],
+                $item['commission_rate'],
+                $item['commission'],
+                $item['commission_time'],
+                $item['order_source'],
+                $item['last_update_time'],
+                $item['settled'],
+                $item['self_buy'],
+                $item['order_status'],
+                $item['after_commission'],
+                $item['after_count'],
+                $item['bill_status'],
+                $item['bill_end_time'],
+                $item['create_time'],
+                $item['gzc'],
+                $item['bill_create_time'],
+                $item['user_address_ids'],
+                $item['pv'],
+            ];
+        }
+        $header = [
+            '订单表ID',
+            '用户ID',
+            '关联PID',
+            '订单号',
+            '订单支付金额',
+            '订单状态(0不合格1待定2已完结)',
+            '新老客(0待定1新客2老客)',
+            '下单时间',
+            '签收时间',
+            '结算时间',
+            '商品ID',
+            '商品名称',
+            '商品缩略图',
+            '商品数量',
+            '商品计佣金额',
+            '商品佣金比例(%)',
+            '商品佣金金额',
+            '入账时间',
+            '订单来源',
+            '上次更新时间',
+            '结算状态(0未结算1已结算)',
+            '是否自推自买(0否1是)',
+            '订单子状态',
+            '售后佣金变动',
+            '售后数量变动',
+            '结算标记(0未结算1已结算2失效)',
+            '可结算日期(时间戳)',
+            '订单创建时间',
+            '公证处标记(0否1是)',
+            '平台结算时间',
+            '详细地址串',
+            'PV值',
+        ];
+        $filename = '唯品会订单导出_' . date('YmdHis') . '_' . rand(10000,99999);
+        $_instance = SpreadsheetExcelService::instance_xin();
+        $_path = $_instance
+            ->createOrActive()
+            ->setExcelHeader($header)
+            ->setExcelTile('唯品会订单明细', $filename, '生成时间: ' . date('Y-m-d H:i:s'))
+            ->setExcelContent($arr)
+            ->excelSave($filename, 'xlsx', 'extract');
+        $domain = request()->domain();
+        return [
+            'name' => $filename . '.xlsx',
+            'status' => 200,
+            'path' => $domain . '/' . $_path
+        ];
+    }
+    public function  getPddOrder()
+    {
+        $where = $this->request->params(['date','order_sn','pin_order_status','keywords','bill_status']);
+        $page = 1;
+        $limit = 9999999;
+        $temporaryData = $this->repository->GetPddOrder($where,$page,$limit);
+        $data = $temporaryData['list'];
+        $arr = [];
+        foreach ($data as $item) {
+            $arr[] = [
+                $item['order_pdd_id'],
+                $item['uid'],
+                $item['goods_id'],
+                $item['goods_sign'],
+                $item['order_sn'],
+                $item['goods_num'],
+                $item['goods_img'],
+                $item['goods_name'],
+                $item['goods_price'],
+                $item['order_type'],
+                $item['pin_order_status'],
+                $item['pin_order_status_desc'],
+                $item['order_money'],
+                $item['pay_money'],
+                $item['create_time'],
+                $item['group_time'],
+                $item['pay_time'],
+                $item['receive_time'],
+                $item['settle_time'],
+                $item['last_modify_time'],
+                $item['p_id'],
+                $item['commission_rate'],
+                $item['commission'],
+                $item['bill_status'],
+                $item['bill_create_time'],
+                $item['bill_end_time'],
+                $item['gzc'],
+                $item['user_address_ids'],
+                $item['pv'],
+            ];
+        }
+        $header = [
+            '订单ID',
+            '用户ID',
+            '商品ID',
+            '商品sign',
+            '订单号',
+            '商品数量',
+            '商品图片',
+            '商品名称',
+            '商品单价',
+            '订单类型',
+            '订单状态码',
+            '订单状态描述',
+            '订单金额',
+            '实付金额',
+            '创建时间',
+            '成团时间',
+            '支付时间',
+            '收货时间',
+            '结算时间',
+            '最后更新时间',
+            'PID',
+            '佣金比例',
+            '佣金金额',
+            '结算状态',
+            '平台结算时间',
+            '可结算日期',
+            '公证处IN10是否发起0否1是',
+            '地址详情',
+            'PV值',
+        ];
+        $filename = '拼多多订单导出_' . date('YmdHis') . '_' . rand(10000,99999);
+        $_instance = SpreadsheetExcelService::instance_xin();
+        $_path = $_instance
+            ->createOrActive()
+            ->setExcelHeader($header)
+            ->setExcelTile('拼多多订单明细', $filename, '生成时间: ' . date('Y-m-d H:i:s'))
+            ->setExcelContent($arr)
+            ->excelSave($filename, 'xlsx', 'extract');
+        $domain = request()->domain();
+        return [
+            'name' => $filename . '.xlsx',
+            'status' => 200,
+            'path' => $domain . '/' . $_path
+        ];
+    }
+    public function getSuOrder()
+    {
+        $where = $this->request->params(['date','order_sn','status','keywords','bill_status']);
+        $page = 1;
+        $limit = 9999999;
+        $temporaryData = $this->repository->GetSuOrder($where,$page,$limit);
+        $data = $temporaryData['list'];
+        $arr = [];
+        foreach ($data as $item) {
+            $arr[] = [
+                $item['uid'],
+                $item['order_sn'],
+                $item['pid'],
+                $item['status'],
+                $item['goods_id'],
+                $item['goods_name'],
+                $item['goods_thumb'],
+                $item['goods_count'],
+                $item['cust_no'],
+                $item['order_time'],
+                $item['pay_time'],
+                $item['change_time'],
+                $item['settled_time'],
+                $item['refund_time'],
+                $item['total_amount'],
+                $item['pay_amount'],
+                $item['commission_rate'],
+                $item['commission'],
+                $item['pre_commission'],
+                $item['bill_status'],
+                $item['bill_create_time'],
+                $item['bill_end_time'],
+                $item['create_time'],
+                $item['gzc'],
+                $item['user_address_ids'],
+                $item['pv'],
+            ];
+        }
+        $header = [
+            '用户ID',
+            '订单行号',
+            '第三方标示',
+            '订单状态名称',
+            '商品ID',
+            '商品名称',
+            '商品图片',
+            '数量',
+            '推广会员编码',
+            '下单时间',
+            '支付时间',
+            '变动时间',
+            '结算时间',
+            '退款时间',
+            '订单金额',
+            '实付金额',
+            '佣金比例',
+            '佣金金额',
+            '预估佣金',
+            '结算状态',
+            '平台结算时间',
+            '可结算日期',
+            '创建时间',
+            '公证处IN10是否发起0否1是',
+            '详细地址串',
+            'PV值',
+        ];
+        $filename = '苏宁订单导出_' . date('YmdHis') . '_' . rand(10000,99999);
+        $_instance = SpreadsheetExcelService::instance_xin();
+        $_path = $_instance
+            ->createOrActive()
+            ->setExcelHeader($header)
+            ->setExcelTile('苏宁订单明细', $filename, '生成时间: ' . date('Y-m-d H:i:s'))
+            ->setExcelContent($arr)
+            ->excelSave($filename, 'xlsx', 'extract');
+        $domain = request()->domain();
+        return [
+            'name' => $filename . '.xlsx',
+            'status' => 200,
+            'path' => $domain . '/' . $_path
+        ];
+    }
+    public function getTbOrder()
+    {
+        $where = $this->request->params(['date','order_sn','tk_status','keywords','bill_status']);
+        $page = 1;
+        $limit = 9999999;
+        $temporaryData = $this->repository->GetTbOrder($where,$page,$limit);
+        $data = $temporaryData['list'];
+        $arr = [];
+        foreach ($data as $item) {
+            $arr[] = [
+                $item['order_tb_id'],
+                $item['uid'],
+                $item['pid'],
+                $item['type'],
+                $item['order_sn'],
+                $item['trade_id'],
+                $item['pub_id'],
+                $item['item_id'],
+                $item['item_img'],
+                $item['item_title'],
+                $item['item_num'],
+                $item['item_price'],
+                $item['seller_shop_title'],
+                $item['pay_price'],
+                $item['alipay_total_price'],
+                $item['tk_status'],
+                $item['create_time'],
+                $item['tk_earning_time'],
+                $item['pub_share_rate'],
+                $item['tk_total_rate'],
+                $item['income_rate'],
+                $item['commission_rate'],
+                $item['commission'],
+                $item['bill_status'],
+                $item['bill_create_time'],
+                $item['bill_end_time'],
+                $item['gzc'],
+                $item['user_address_ids'],
+                $item['pv'],
+            ];
+        }
+        $header = [
+            '订单表ID',
+            '用户ID',
+            'PID',
+            '类型',
+            '订单号',
+            '交易号',
+            '推广者ID',
+            '商品ID',
+            '商品图片',
+            '商品名称',
+            '数量',
+            '单价',
+            '店铺名称',
+            '支付金额',
+            '拍下付款金额',
+            '订单状态',
+            '下单时间',
+            '订单确认收货后且商家完成佣金支付的时间',
+            '从结算佣金中分得的收益比率',
+            '提成=收入比率*分成比率。指实际获得收益的比率',
+            '订单结算的佣金比率+平台的补贴比率',
+            '佣金比率',
+            '佣金金额=结算金额*佣金比率',
+            '0平台未结算1已结算2失效',
+            '平台结算时间',
+            '平台可结算日期',
+            '公证处IN10是否发起0否1是',
+            '详细地址串',
+            'PV值',
+        ];
+        $filename = '淘宝订单导出_' . date('YmdHis') . '_' . rand(10000,99999);
+        $_instance = SpreadsheetExcelService::instance_xin();
+        $_path = $_instance
+            ->createOrActive()
+            ->setExcelHeader($header)
+            ->setExcelTile('淘宝订单明细', $filename, '生成时间: ' . date('Y-m-d H:i:s'))
+            ->setExcelContent($arr)
+            ->excelSave($filename, 'xlsx', 'extract');
+        $domain = request()->domain();
+        return [
+            'name' => $filename . '.xlsx',
+            'status' => 200,
+            'path' => $domain . '/' . $_path
+        ];
+    }
+    public function getHfOrder()
+    {
+        $where = $this->request->params(['date','order_sn','status','keywords','bill_status']);
+        $page = 1;
+        $limit = 9999999;
+        $temporaryData = $this->repository->GetHfOrder($where,$page,$limit);
+        $data = $temporaryData['list'];
+        $arr = [];
+        foreach ($data as $item) {
+            $arr[] = [
+                $item['order_huafei_id'],
+                $item['uid'],
+                $item['mobile'],
+                $item['commission'],
+                $item['commission_share'],
+                $item['order_number'],
+                $item['order_sn'],
+                $item['amount_price'],
+                $item['fanli_price'],
+                $item['cost_price'],
+                $item['arrived_amount'],
+                $item['pay_money'],
+                $item['create_time'],
+                $item['finish_time'],
+                $item['modify_time'],
+                $item['status'],
+                $item['bill_status'],
+                $item['bill_create_time'],
+                $item['bill_end_time'],
+                $item['gzc'],
+                $item['pv'],
+                $item['is_independentaccount'],
+            ];
+        }
+        $header = [
+            '订单ID',
+            '用户ID',
+            '充值手机号',
+            '佣金',
+            '佣金比例',
+            '平台订单号',
+            '本地订单号',
+            '充值金额',
+            '返利金额',
+            '成本金额',
+            '到账金额',
+            '实际金额',
+            '创建时间',
+            '完成时间',
+            '更新时间',
+            '订单状态',
+            '结算状态',
+            '平台结算时间',
+            '可结算日期',
+            '公证处IN10是否发起0否1是',
+            'PV值',
+            '是否分账0否1是',
+        ];
+        $filename = '话费订单导出_' . date('YmdHis') . '_' . rand(10000,99999);
+        $_instance = SpreadsheetExcelService::instance_xin();
+        $_path = $_instance
+            ->createOrActive()
+            ->setExcelHeader($header)
+            ->setExcelTile('话费订单明细', $filename, '生成时间: ' . date('Y-m-d H:i:s'))
+            ->setExcelContent($arr)
+            ->excelSave($filename, 'xlsx', 'extract');
+        $domain = request()->domain();
+        return [
+            'name' => $filename . '.xlsx',
+            'status' => 200,
+            'path' => $domain . '/' . $_path
+        ];
+    }
 }

app/controller/admin/system/merchant/GzcLogs.php

@@ -14,8 +14,10 @@ use app\common\repositories\merchant\order\OrderGzcRepository;
 use app\common\repositories\merchant\order\OrderMerchantRepository;
 use crmeb\basic\BaseController;
 use app\common\repositories\store\ExcelRepository;
+use Nette\Utils\DateTime;
 use think\App;
 use think\facade\Db;
+use think\facade\Log;
 
 class GzcLogs extends BaseController
 {
@@ -69,7 +71,7 @@ class GzcLogs extends BaseController
      * created: 2021/3/24 13:56
      */
     public function inGzc()
-    { 
+    {
         $id = intval($this->request->param('id'));
         $log = Db::table('rrx_gzc_logs')
             ->where('id', $id)
@@ -77,16 +79,19 @@ class GzcLogs extends BaseController
             ->where('success', 0)
             ->where('pension', '>', 0)
             ->find();
-        
+
         if(!$log){
-            return app('json')->fail('请选择未入账的记录', );
+            return app('json')->fail('请选择未入账的记录');
         }
-            
+
         $mobile= $log['mobile'];
         $user_name =  Db::name('user_certification')->where('uid',$log['uid'])->value('user_name');
         $user_card =  Db::name('user_certification')->where('uid',$log['uid'])->value('user_card');
         $card_positive = Db::name('user_certification')->where('uid',$log['uid'])->value('card_positive');
         $card_reverse = Db::name('user_certification')->where('uid',$log['uid'])->value('card_reverse');
+        $cardType = Db::name('user_certification')->where('uid',$log['uid'])->value('card_type');
+        $gender = Db::name('user_certification')->where('uid',$log['uid'])->value('gender');
+        $birthday = Db::name('user_certification')->where('uid',$log['uid'])->value('birthday');
         if(!$mobile || !$user_name || !$user_card || !$card_positive || !$card_reverse){
             return app('json')->fail('存在实名数据缺失');
         }
@@ -97,7 +102,12 @@ class GzcLogs extends BaseController
         if($register['status'] != 200) return app('json')->fail('入账失败:'.$register['message']);
         $uid = $register['data']['uid'] ?? 0;
         if(!$uid) return app('json')->fail('创建或获取用户失败');
-        $certification = $OrderGzcRepository->certification($uid, $mobile, $user_name, $user_card, $card_positive, $card_reverse);
+        // 兼容港澳台用户认证
+        $age = (new DateTime())->diff(
+            DateTime::createFromFormat('Ymd', strval($birthday))
+        )->y;
+        $certification = $OrderGzcRepository->certification($uid, $mobile, $user_name, $user_card, $card_positive, $card_reverse,$cardType,$birthday,$gender,$age);
+        Log::info('pcpc认证结果' . json_encode($certification));
         if($certification['status'] != 200) return app('json')->fail('实名认证失败:'.$certification['message']);
         $gzc = $OrderGzcRepository->gzc($uid,$log['pension']);
         if($gzc['status'] != 200) return app('json')->fail('入账失败:'.$gzc['message']);
@@ -106,18 +116,18 @@ class GzcLogs extends BaseController
         $OrderMerchantRepository = app()->make(OrderMerchantRepository::class);
         $orderId = $OrderMerchantRepository->getNewOrderId('IN10');
         Db::table('rrx_gzc_logs')
-        ->where('id', $id)
-        ->where('gzc', 0)
-        ->where('success', 0)
-        ->where('pension', '>', 0)
-        ->update([
-            'gzc' => 1,
-            'platform_no' => $orderId,
-            'gzc_deposit_no' => $gzc_deposit_no,
-            'gzc_confirm_result' => $gzc_confirm_result,
-            'success' => 1,
-            'update_time' => date('Y-m-d H:i:s')
-        ]);
+            ->where('id', $id)
+            ->where('gzc', 0)
+            ->where('success', 0)
+            ->where('pension', '>', 0)
+            ->update([
+                'gzc' => 1,
+                'platform_no' => $orderId,
+                'gzc_deposit_no' => $gzc_deposit_no,
+                'gzc_confirm_result' => $gzc_confirm_result,
+                'success' => 1,
+                'update_time' => date('Y-m-d H:i:s')
+            ]);
 
         //发起成功更新记录值
         $order_id = Db::name('store_order')->where('order_sn', $log['out_trade_no'])->value('order_id');
@@ -125,13 +135,13 @@ class GzcLogs extends BaseController
             $bill = Db::name('user_bill')->where('link_id', $order_id)->where('commission_type', 5)->where('is_gzc', 'in', [0, 1])->find();
             if($bill){
                 Db::name('user_bill')
-                ->where('bill_id', $bill['bill_id'])
-                ->update([
-                    'is_gzc' => 2
-                ]);
+                    ->where('bill_id', $bill['bill_id'])
+                    ->update([
+                        'is_gzc' => 2
+                    ]);
             }
         }
-        
+
         return app('json')->success('发起成功', $log);
     }
 
@@ -167,6 +177,9 @@ class GzcLogs extends BaseController
             $user_card =  Db::name('user_certification')->where('uid',$log['uid'])->value('user_card');
             $card_positive = Db::name('user_certification')->where('uid',$log['uid'])->value('card_positive');
             $card_reverse = Db::name('user_certification')->where('uid',$log['uid'])->value('card_reverse');
+            $cardType = Db::name('user_certification')->where('uid',$log['uid'])->value('card_type');
+            $gender = Db::name('user_certification')->where('uid',$log['uid'])->value('gender');
+            $birthday = Db::name('user_certification')->where('uid',$log['uid'])->value('birthday');
             if(!$mobile || !$user_name || !$user_card || !$card_positive || !$card_reverse){
                 return app('json')->fail('存在实名数据缺失');
             }
@@ -177,7 +190,11 @@ class GzcLogs extends BaseController
             if($register['status'] != 200) return app('json')->fail('入账失败:'.$register['message']);
             $uid = $register['data']['uid'] ?? 0;
             if(!$uid) return app('json')->fail('创建或获取用户失败');
-            $certification = $OrderGzcRepository->certification($uid, $mobile, $user_name, $user_card, $card_positive, $card_reverse);
+            // 兼容港澳台用户认证
+            $age = (new DateTime())->diff(
+                DateTime::createFromFormat('Ymd', strval($birthday))
+            )->y;
+            $certification = $OrderGzcRepository->certification($uid, $mobile, $user_name, $user_card, $card_positive, $card_reverse,$cardType,$birthday,$gender,$age);
             if($certification['status'] != 200) return app('json')->fail('实名认证失败:'.$certification['message']);
             $gzc = $OrderGzcRepository->gzc($uid,$log['pension']);
             if($gzc['status'] != 200) return app('json')->fail('入账失败:'.$gzc['message']);

app/controller/api/Auth.php

@@ -12,7 +12,9 @@ namespace app\controller\api;
 
 use AlibabaCloud\Client\AlibabaCloud;
 use app\common\dao\store\order\StoreOrderDao;
+use app\common\dao\user\UserCertificationDao;
 use app\common\model\user\User;
+use app\common\model\user\UserCertification;
 use app\common\repositories\merchant\order\OrderGzcRepository;
 use app\common\repositories\merchant\order\OrderMerchantRepository;
 use app\common\repositories\store\order\StoreGroupOrderRepository;
@@ -403,7 +405,7 @@ class Auth extends BaseController
         $type = $this->request->param('type',1);
 //        $where['mer_id']=$this->merId;
         $where['type']=$type;
-        $data=Db::name('enterprise_agreement')->where($where)->find();
+        $data=Db::name('user_agreement')->where($where)->find();
         if(!$data){
             $data['title']='';
             $data['content']='';
@@ -476,6 +478,13 @@ class Auth extends BaseController
         if (!$useragree){
             $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
         }
+        // 登录增加是否实名字段
+        $userCertificationDao = new UserCertificationDao();
+        $isCertification = $userCertificationDao->getUserCertification($account);
+        $user['is_ertification'] = 0;
+        if (!empty($isCertification)) {
+            $user['is_ertification'] = 1;
+        }
         return app('json')->success($repository->returnToken($user, $tokenInfo));
     }
 
@@ -1425,7 +1434,7 @@ class Auth extends BaseController
         }
 
         if ($data['type']=="register"){
-            $count=Db::name("user")->where("phone", $data["phone"])->count();
+            $count=Db::name("user")->where("phone", $data["phone"])->where('is_del','=',0)->count();
             if ($count){
                 return app('json')->make(405, '该手机号已注册,请直接登录');
             }
@@ -1441,6 +1450,8 @@ class Auth extends BaseController
         $sms_key = 'api.auth.sms.' . $data['phone'];
         $sms_code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);
         $sms_time = systemConfig('sms_time') ? systemConfig('sms_time') : 30 ;
+        // 兼容香港手机号
+        if (strlen($data['phone']) != 11) $data['phone'] = '+852' . $data['phone'];
         $res = app()->make(AliYunSmsService::class)->send($data['phone'],  $sms_code);
         if($res['Code']!='OK'){
             Db::name('log')->insert(['data'=>'幸福保短信发送失败：'.json_encode($res,256)]);
@@ -2094,12 +2105,13 @@ class Auth extends BaseController
                 return app('json')->fail('没有获取到手机号1');
             }
 //            dump($data);
+            Db::name('log')->insert(['data'=>'一键登录获取的数据：' .$data]);
             $data=json_decode($data,true);
             $phone=$data['purePhoneNumber']??'';
             if($phone==''){
                 return app('json')->fail('没有获取到手机号2');
             }
-            if (!preg_match("/^1[3456789]{1}\d{9}$/", $phone)){
+            if (!preg_match("/^1[3456789]{1}\d{9}$/", $phone) && !preg_match("/^[569]\d{7}$/",$phone)){
                 return app('json')->fail('手机号格式错误');
             }
             $user_res=Db::name('user')->where('account',$phone)->find();

app/controller/api/Notify.php

@@ -242,7 +242,7 @@ class Notify
                                         $this->con_log($spread_data['uid'], $pv, $store_order_data['order_id'], 0, "推广精彩生活商品赠送贡献值");
                                         //积分
                                         $this->score_log($spread_data['uid'], bcmul($pv, $rate, 2), $store_order_data['order_id'], 0, "推广精彩生活商品赠送积分");
-                                        if($store_order_data['share_uid']){
+                                        if($store_order_data['share_uid'] && $store_order_data['share_uid'] != 1123){
                                             $this->bill_user_log($store_order_data['share_uid'], bcmul($pv * 0.9, 0.03, 2), $store_order_data['order_id'], 20, $store_order_data['order_sn'], '分享获得佣金', $store_order_data['mer_id'], 0);
                                             $this->fugou_user_log($store_order_data['share_uid'], bcmul($pv * 0.1, 0.03, 2), $store_order_data['order_id'], 1);
                                         }
@@ -261,7 +261,7 @@ class Notify
                                         $this->bill_user_log($spread_data['uid'], $yj_amount_90, $store_order_data['order_id'], 3, $store_order_data['order_sn'], '推广获得佣金', $store_order_data['mer_id'], 0);
                                         //养老金
                                         $this->bill_user_log($spread_data['uid'], bcmul($pv, 0.05, 2), $store_order_data['order_id'], 5, $store_order_data['order_sn'], '推广获得养老金' . bcmul($pv, 0.05, 2), $store_order_data['mer_id'], 0);
-                                        if($store_order_data['share_uid']){
+                                        if($store_order_data['share_uid'] && $store_order_data['share_uid'] != 1123){
                                             $this->bill_user_log($store_order_data['share_uid'], bcmul($pv * 0.9, 0.03, 2), $store_order_data['order_id'], 20, $store_order_data['order_sn'], '分享获得佣金', $store_order_data['mer_id'], 0);
                                             $this->fugou_user_log($store_order_data['share_uid'], bcmul($pv * 0.1, 0.03, 2), $store_order_data['order_id'], 1);
                                         }
@@ -333,6 +333,11 @@ class Notify
                                     $gx_jf = 1400;
                                     $yj1 = 200;
                                     $le_yw_amount = 600;
+                                }else if($store_product_data['price'] == 5900){
+                                    $pv = 5000;
+                                    $gx_jf = 3500;
+                                    $yj1 = 500;
+                                    $le_yw_amount = 1500;
                                 }
 
                                 $ylj_pri = bcmul($pv, 0.035,2);

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

@@ -708,7 +708,7 @@ class TaskPartnerProfits
             ->where('mer_id', 496)
             ->whereIn('uid', $userIdList)
             ->whereIn('status', [0, 1, 2, 3]) // TODO 之前橙汁先生 这么定义的，感觉有问题，也就是现在 会员专区 下单 不允许退款，不然肯定有问题 注意调整
-            ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
+            ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440, 5900])
             ->whereNotNull("pay_time") // 排除 pay_time 为 NULL 的订单
             ->select();
 
@@ -731,6 +731,9 @@ class TaskPartnerProfits
                 case 9440:
                     $totalPv += 5600;
                     break;
+                case 5900:
+                    $totalPv += 3500;
+                    break;
             }
         }
         return $totalPv;

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

@@ -13,220 +13,6 @@ use think\Request;
 class TaskZeroLineOrderLianc
 {
 
-    /**
-     * 会员升级
-     */
-    public function member_update($orderInfo, $goods_of_info, $user_id)
-    {
-        //
-        //$user_id = $userInfo['id'];
-        $order_id = $orderInfo['id'];
-
-        //code...
-        $pay_gb = round($orderInfo['num'] * $orderInfo['gb_num'], 2);
-        //$pay_vr =  round($orderInfo['num'] * $orderInfo['vr_num'],2);
-        //付款按照700的VR付款 start
-        $vr_num = 0;
-        if ($orderInfo['price'] == 1180) {
-            $vr_num = 700;
-        } elseif ($orderInfo['price'] == 11800) {
-            $vr_num = 7000;
-        } elseif ($orderInfo['price'] == 11800) {
-            $vr_num = 2100;
-        } elseif ($orderInfo['price'] == 10620) {
-            $vr_num = 6300;
-        }
-
-
-        $pay_gb1 = $vr_num;
-        $pay_vr1 = $orderInfo['price'];//记录VR值
-
-
-        // $result = Db::name("old_user_jbp")->where("id",$user_id)->dec("vr",$orderInfo['price'])->save();//1.0jbp旧表
-        // Db::name("user")->where("uid",$user_id)->dec("vr",$orderInfo['price'])->save();//2.0新表
-
-
-        $result = true;
-        if ($result) {
-            $invite_id = $goods_of_info['spread_id'];
-
-
-            $zs_ylj = 0; //养老金赋值
-
-
-            if ($goods_of_info['money'] == 1180) {
-                //修改订单到账状态
-                $zs_ylj = round(700 * 0.05, 2);//计算的养老金 金额
-            } elseif ($goods_of_info['money'] == 11800) {
-                $zs_ylj = round(7000 * 0.05, 2);//计算的养老金 金额
-            } elseif ($goods_of_info['money'] == 3540) {
-                $zs_ylj = round(2100 * 0.05, 2);//计算的养老金 金额
-            } elseif ($goods_of_info['money'] == 10620) {
-                $zs_ylj = round(6300 * 0.05, 2);//计算的养老金 金额
-            } elseif ($goods_of_info['money'] == 9440) {
-                $zs_ylj = round(5600 * 0.05, 2);//八单计算的养老金 金额
-            } elseif ($goods_of_info['money'] == 2360) {
-                $zs_ylj = round(1400 * 0.05, 2);//两单计算的养老金 金额
-            }
-
-
-            $uid = $user_id;
-            $new_user_id = $uid;
-            if (empty($new_user_id)) {
-                abort(0, "当前绑定会员查询错误");
-            }
-
-            $new_nums = Db::name("old_user_of_goods")->where("user_id", $uid)->sum("money");
-
-            //增加过后权益对比 获取当前权益等级
-            $old_level_id = Db::name("old_user_jbp")->where("id", $uid)->find();
-
-            $old_level_info = Db::name("old_user_level")->where("id", $old_level_id['user_level_id'])->find();
-
-
-            $level_info = [];
-            $level_list = Db::name("old_user_level")->order("money desc")->select();
-
-
-            //计算会员等级 升级
-            foreach ($level_list as $key => $value) {
-                # code...
-                if ($new_nums >= $value['money']) {
-                    $level_info = $value;
-                    break;
-                }
-            }
-
-            $zs_gb = $orderInfo['price'] * 3;
-            $zs_withdraw_quota = $orderInfo['price'];
-
-
-            if ($old_level_info['id'] == $level_info['id']) {
-                //未到达升级权益 不改变用户等级
-                $update_status = false;
-            } else {
-                $update_status = true;
-                $user_level = $level_info['id'];
-                //var_dump( $user_level);
-                Db::name("old_user_jbp")->where("id", $new_user_id)->save(['user_level_id' => $user_level]);//1.0jbp旧表
-                Db::name("user")->where("uid", $new_user_id)->save(['user_level_id_old' => $user_level]);//2.0新表
-
-                // todo 同时改变他的权益
-            }
-
-
-            // Db::name("old_user_jbp")->where("id",$new_user_id)->inc("withdraw_quota",$zs_withdraw_quota)->save();//1.0jbp旧表
-            // Db::name("user")->where("uid",$new_user_id)->save(['withdraw_quota_old'=>$zs_withdraw_quota]);//2.0新表
-
-            // 下发邀请人赠送的GB
-            // $zs_invite_gb = round($orderInfo['price']*0.3,2);
-            // //todo
-            // Db::name("old_user_jbp")->where("id",$invite_id)->inc("gb",$zs_invite_gb)->save();//1.0jbp旧表
-            // Db::name("user")->where("uid",$invite_id)->inc("score",$zs_invite_gb)->save();//2.0新表
-
-            //$old_have_pension = Db::name("old_user_jbp")->where("id",$invite_id)->value("have_pension");
-
-
-            //检查是不是订单价格是1180或者11800，更改VR
-            if ($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440 || $goods_of_info['money'] == 2360) {
-                //修改订单到账状态
-
-
-                Db::name("old_user_of_goods")->where("order_id", $goods_of_info1['id'])->save(['status' => 1, 'pay_gb' => 0, 'pay_vr' => $pay_vr1, 'pay_bt' => 0, 'create_time' => time()]);
-
-
-            }
-        }
-
-
-        if ($result) {
-            //更改订单状态
-
-            Db::commit();
-            $new_user_name = Db::name("old_user_jbp")->where("id", $new_user_id)->value("user_name");
-            $new_user_name = empty($new_user_name) ? "" : $new_user_name;
-
-            //记录日志信息
-
-            if ($user_id == $invite_id) {
-                //报单中心=推荐人 GB记录日志有问题需要传入指定参数去计算
-                //$money = Db::name("old_user_jbp")->where("id",$user_id)->value("gb");
-                //$appoint_money = $money - $zs_invite_gb;
-
-                if ($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440 || $goods_of_info['money'] == 2360) {
-
-
-                    $this->change_user_log66($user_id, "vr", 2, $pay_vr1, "declare_expend", '权益消费VR-' . $new_user_name);
-
-                }
-            } else {
-
-                if ($goods_of_info['money'] == 1180 || $goods_of_info['money'] == 11800 || $goods_of_info['money'] == 3540 || $goods_of_info['money'] == 10620 || $goods_of_info['money'] == 9440 || $goods_of_info['money'] == 2360) {
-
-
-                    $this->change_user_log66($user_id, "vr", 2, $pay_vr1, "declare_expend", '权益消费VR-' . $new_user_name);
-
-                }
-            }
-            // $this->change_user_log66($new_user_id,'gb',1,$zs_gb,"levle_update_zs","权益升级达标赠送");
-            $this->change_user_log66($new_user_id, 'withdraw_quota_old', 1, $zs_withdraw_quota, "levle_update_zs", "权益升级达标赠送");
-            // $this->change_user_log66($invite_id,'gb',1,$zs_invite_gb,"levle_update_zs","邀请-".$new_user_name);
-            // echo 123;return;
-            //处理查看是否有待发放佣金
-            // $zs_withdraw_quota
-            Db::name("old_user_jbp")->where("id", $new_user_id)->inc("total_withdraw_quota", $zs_withdraw_quota)->save();//1.0jbp旧表
-            Db::name("user")->where("uid", $new_user_id)->inc("total_withdraw_quota_old", $zs_withdraw_quota)->save();
-            // $this->releaseTobeAmount($new_user_id,$zs_withdraw_quota);
-            // $this->success("支付成功",['is_cash'=>0]);
-        }
-        Db::rollback();
-        // $this->error("操作失败");
-    }
-
-    function change_user_log66($user_id, $type, $change_status, $money, $routine, $remark = "", $is_admin = 1, $appoint_money = 0)
-    {
-        $transition = [
-            'pv' => 1,
-            "gb" => 2,
-            "df" => 3,
-            "vr" => 4,
-            "bt" => 5,
-            "withdraw_quota_old" => 6,
-            "unsettled_pension" => 7,
-            "amount_old" => 8
-        ];
-        $routineInfo = Db::name("old_routine_log_of_key")->where("key", $routine)->find();
-        if (empty($routineInfo)) {
-            return false;
-        }
-        $key_id = isset($routineInfo['id']) ? $routineInfo['id'] : 0;
-        //再去查询变更前的 金额
-        if ($appoint_money > 0) {
-            $alter_money = $appoint_money;
-        } else {
-            //再去查询变更前的 金额
-            $alter_money = Db::name("user")->where('uid', $user_id)->value($type);
-        }
-        if ($change_status == 1) {
-            //新增前
-            $alter_money = $alter_money - $money;
-        } else if ($change_status == 2) {
-            //减少前
-            $alter_money = $alter_money + $money;
-        }
-        $inser_data = [];
-        $inser_data['user_id'] = $user_id;
-        $inser_data['type'] = $transition[$type];
-        $inser_data['change_status'] = $change_status;
-        $inser_data['money'] = $money;
-        $inser_data['routine_log_of_key_id'] = $key_id;
-        $inser_data['remark'] = $remark;
-        $inser_data['is_admin'] = $is_admin;
-        $inser_data['create_time'] = time();
-        $inser_data['alter_money'] = isset($alter_money) ? $alter_money : 0;
-        Db::name("old_user_log")->insert($inser_data);
-    }
-
     //添加推广佣金/养老金日志(养老金金额)
     public function bill_user_log($uid, $name, $num, $mark)
     {

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

@@ -19,69 +19,47 @@ class Taskorderguquan
 
         /**
         补贴下面人员
-        13231658486周行体600
-        13333069689魏   新600
-        13959100621周金花300
-        13701061395李素红300
-        17501006833邢艳丽300
-        15631982690魏震洪200
-        18603401312黄金花200
-        13521438652徐立苹300
-        15832971815孟晓玮300
-        18600200909陈冠霖300
-        15810064711 王   玲 300
-        13932925303会强200
-        13901074090陈玉刚300
-        13381085923王建军50
-        13601071082隋彩云200
-        18001316701闫旭200
-        13601179856陈瑞元50
-        13161909228刘银霞50
-        18760167163刘春梅50
-        13215917919李小秋50
-        13801358713金波50
-        15321221558李伟 200
-        15332507711张传莲50
-        15960349667吕丽娣50
-        13231658486周军市场补贴600
-        18513005403王培50
-        18612051372李金俭 50
-        15803242611王志敏50
-        13701059062王金权50
-        13331043787张吉良115
-        18715313601大饼300
-        */
+        13231658486周行体200
+        13333069689魏   新200
+        13959100621周金花100
+        13701061395李素红100
+        17501006833邢艳丽50
+        15631982690魏震洪50
+        18603401312黄金花50
+        13521438652徐立苹100
+        15832971815孟晓玮100
+        15810064711 王   玲 100
+        13932925303会强50
+        13601071082隋彩云100
+        13601179856陈瑞元20
+        13161909228刘银霞20
+        18760167163刘春梅20
+        13215917919李小秋20
+        15532683963李玉芝20
+        13231658486周军市场补贴300
+        13331043787张吉良55
+        18715313601大饼100
+         */
         $data = [
-            '13231658486' => 1200,
-            '13333069689' => 600,
-            '13959100621' => 300,
-            '13701061395' => 300,
-            '17501006833' => 300,
-            '15631982690' => 200,
-            '18603401312' => 200,
-            '13521438652' => 300,
-            '15832971815' => 300,
-            '18600200909' => 300,
-            '15810064711' => 300,
-            '13932925303' => 200,
-            '13901074090' => 300,
-            '13381085923' => 50,
-            '13601071082' => 200,
-            '18001316701' => 200,
-            '13601179856' => 50,
-            '13161909228' => 50,
-            '18760167163' => 50,
-            '13215917919' => 50,
-            '13801358713' => 50,
-            '15321221558' => 200,
-            '15332507711' => 50,
-            '15960349667' => 50,
-            '18513005403' => 50,
-            '18612051372' => 50,
-            '15803242611' => 50,
-            '13701059062' => 50,
-            '13331043787' => 115,
-            '18715313601' => 300
+            '13231658486' => 500,
+            '13333069689' => 200,
+            '13959100621' => 100,
+            '13701061395' => 100,
+            '17501006833' => 50,
+            '15631982690' => 50,
+            '18603401312' => 50,
+            '13521438652' => 100,
+            '15832971815' => 100,
+            '15810064711' => 100,
+            '13932925303' => 50,
+            '13601071082' => 100,
+            '13601179856' => 20,
+            '13161909228' => 20,
+            '18760167163' => 20,
+            '13215917919' => 20,
+            '15532683963' => 20,
+            '13331043787' => 55,
+            '18715313601' => 100
         ];
 
         $result = Db::name("user")

app/controller/api/store/order/StoreOrder.php

@@ -951,7 +951,6 @@ class StoreOrder extends BaseController
         ], $page, $limit));
     }
 
-
     /**
      * @param $id
      * @return mixed
@@ -960,14 +959,19 @@ class StoreOrder extends BaseController
      */
     public function detail($id)
     {
-        $order = $this->repository->getDetail((int)$id);
+        $order = $this->repository->getDetail($id);
 //        $order = $this->repository->getDetail((int)$id, $this->request->uid());
         if (!$order)
             return app('json')->fail('订单不存在');
-        if ($order->order_type == 1) {
-            $order->append(['take']);
-        }
-        return app('json')->success($order->toArray());
+//        if ($order->order_type == 1) {
+//            $order->append(['take']);
+//        }
+        return app('json')->success($order);
+//        $query = Db::name('store_order')
+//            ->where('order_sn', $id)
+//            ->select()
+//            ->toArray();
+//        return app('json')->success($query, '获取成功');
     }
 
     /**

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

@@ -395,7 +395,7 @@ class Other extends BaseController
         switch ($params['type']) {
             case 1://多多进宝
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn,status')
+                    ->field('number,order_sn,status,bill_id,commission_type')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('type_shop',1)
@@ -431,7 +431,7 @@ class Other extends BaseController
                 break;
             case 2://唯品会(没有商品价格)
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn,status')
+                    ->field('number,order_sn,status,bill_id,commission_type')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('type_shop',2)
@@ -466,7 +466,7 @@ class Other extends BaseController
                 break;
             case 3://苏宁订单列表
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn,status')
+                    ->field('number,order_sn,status,bill_id,commission_type')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('type_shop',3)
@@ -497,7 +497,7 @@ class Other extends BaseController
                 break;
             case 5://淘宝客
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn,status')
+                    ->field('number,order_sn,status,bill_id,commission_type')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('type_shop',5)
@@ -531,7 +531,7 @@ class Other extends BaseController
                 break;
             case 6://京东订单
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn,status')
+                    ->field('number,order_sn,status,bill_id,commission_type')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('type_shop',6)
@@ -563,7 +563,7 @@ class Other extends BaseController
                 break;
             case 9: //抖音
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn,status')
+                    ->field('number,order_sn,status,bill_id,commission_type')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
 //                    ->where('type_shop',9)
@@ -596,7 +596,7 @@ class Other extends BaseController
                 break;
             case 10: //话费
                 $list = Db::name('user_bill')
-                    ->field('number,order_sn,status')
+                    ->field('number,order_sn,status,bill_id,commission_type')
                     ->where('uid', $userId)
                     ->where('commission_type',5)
                     ->where('type_shop',9)

app/controller/api/user/User.php

@@ -44,6 +44,7 @@ use app\common\common;
 use phpseclib3\Math\BigInteger\Engines\BCMath;
 
 class User extends BaseController
+// class User
 {
     use HuiPay;
 
@@ -56,6 +57,17 @@ class User extends BaseController
         -1 => '失效'
     ];
 
+    // private $request;
+    //
+    // public function __construct(App $app, UserRepository $repository)
+    // {
+    //     $this->request = $app->request;
+    //     // parent::__construct($app);
+    //     $this->repository = $repository;
+    //     $this->source = $this->request->header('source');
+    //     $this->merId = $this->request->header('merId');
+    // }
+
     public function __construct(App $app, UserRepository $repository)
     {
         parent::__construct($app);
@@ -927,6 +939,7 @@ class User extends BaseController
     {
         $member_id = $this->request->uid();
         $type = input("type", 0);
+        $cardType = input('card_type',1);
         if ($type == 1) {
             $data = $this->repository->get_cer(["uid" => $member_id]);
             return app('json')->success($data);
@@ -942,19 +955,47 @@ class User extends BaseController
         $params['create_time'] = time();
         $params['uid'] = $member_id;
         $baidu = new Ocr();
-        $image = file_get_contents($params['card_positive']);
-        $idCardSide = "front";
-        $result = $baidu->idcard($image, $idCardSide);
-        $real_user_name = $result['words_result']['姓名']['words'] ?? '';
-        $real_user_card = $result['words_result']['公民身份号码']['words'] ?? '';
-        if ($real_user_name != $params['user_name']) {
-            return app('json')->fail('姓名或身份证号输入有误~');
-        }
-        if ($real_user_card != $params['user_card']) {
-            return app('json')->fail('姓名或身份证号输入有误~');
-        }
-        if ($result['image_status'] == "normal" && $result['idcard_number_type'] == 1) {
+        // 兼容港澳台证件
+        if ($cardType != 1) {
+            // 设置exitentrypermit_type
+            $exType = '';
+            if ($cardType == 2) {
+                $exType = 'hk_mc_return_passport_front'; //返乡证
+            }
+            if ($cardType == 3) {
+                $exType = 'tw_return_passport_front'; // 台胞证
+            }
+
+            if (empty($exType)) {
+                return app('json')->fail('证件号类型错误~');
+            }
+
+            $postData['url'] = $params['card_positive'];
+            $postData['exitentrypermit_type'] = $exType;
+            $result = $baidu->hkMacauTaiwan($postData);
+            Log::info('hkMacauTaiwan:' . json_encode($result));
+            $real_user_name = $result['words_result']['name_chn'][0]['word']??'';
+            $real_user_card = $result['words_result']['card_number'][0]['word']??'';
+            if ($real_user_name != $params['user_name']) {
+                return app('json')->fail('姓名或身份证号输入有误~');
+            }
+            if ($real_user_card != $params['user_card']) {
+                return app('json')->fail('姓名或身份证号输入有误~');
+            }
+
+            $params['reason'] = '';
+            $params['audit_time'] = 0;
+            $params['update_time'] = 0;
             $params['status'] = 1;
+            $params['card_type'] = $cardType;
+            if ($result['words_result']['sex'][0]['word'] == '男') {
+                $gender = 1;
+            }else{
+                $gender = 2;
+            }
+            $params['gender'] = $gender;
+            $birthday = $result['words_result']['birthday'][0]['word']??'';
+            $params['birthday'] = str_replace('.','',$birthday);
             $res = $this->repository->add_cer($params, $member_id);
             if ($res) {
                 $userRepository = app()->make(UserRepository::class);
@@ -973,8 +1014,43 @@ class User extends BaseController
             } else {
                 return app('json')->fail('认证失败');
             }
-        } else {
-            return app('json')->fail('认证失败，请重新认证');
+        }else{
+            $image = file_get_contents($params['card_positive']);
+            $idCardSide = "front";
+            $result = $baidu->idcard($image, $idCardSide);
+            Log::info('hkMacauTaiwan:' . json_encode($result));
+            $real_user_name = $result['words_result']['姓名']['words'] ?? '';
+            $real_user_card = $result['words_result']['公民身份号码']['words'] ?? '';
+            if ($real_user_name != $params['user_name']) {
+                return app('json')->fail('姓名或身份证号输入有误~');
+            }
+            if ($real_user_card != $params['user_card']) {
+                return app('json')->fail('姓名或身份证号输入有误~');
+            }
+            if ($result['image_status'] == "normal" && $result['idcard_number_type'] == 1) {
+                $params['status'] = 1;
+                $params['card_type'] = $cardType;
+                $res = $this->repository->add_cer($params, $member_id);
+                if ($res) {
+                    $userRepository = app()->make(UserRepository::class);
+                    // 赠送积分 完善实名送90个积分，同时送邀请人50个积分
+                    $userRepository->sign_add($member_id, 90,1,'完善实名系统赠送90个积分','','', '', 1, '', 1);
+                    $member_info = Db::name('user')->where( array('uid' => $member_id) )->find();
+                    Db::name('user')
+                        ->where('uid', $member_id)
+                        ->update(['real_name' => $params['user_name'], 'nickname' => $params['user_name']]);
+                    if($member_info['spread_uid']){
+                        // 好友完善实名系统赠送50个积分
+                        $spreadUid = $member_info['spread_uid'];
+                        $userRepository->sign_add($spreadUid, 50,1,'好友完善实名系统赠送50个积分','','', '', 1, '', 1);
+                    }
+                    return app('json')->success($res);
+                } else {
+                    return app('json')->fail('认证失败');
+                }
+            } else {
+                return app('json')->fail('认证失败，请重新认证');
+            }
         }
 
     }
@@ -3298,10 +3374,12 @@ class User extends BaseController
     public function getAmountFromGzc()
     {
         $uid = $this->request->uid();
-        $userInfo = Db::name('UserCertification')->where('uid', $uid)->field('user_name,user_card')->find();
+        $userInfo = Db::name('UserCertification')->where('uid', $uid)->field('user_name,user_card,card_type')->find();
         $res = GzcApiRequest::checkAmount($userInfo);
-
-        return app('json')->success(['amount' => sprintf("%01.2f", $res['extendData']['amount'] * 0.01)]);
+        if(is_string($res)) {
+            return app('json')->fail($res);
+        }
+        return app('json')->success(['amount' => sprintf("%01.2f", $res * 0.01)]);
     }
 
     public function check_user_annual_fee()

app/traits/GzcApiRequest.php

@@ -18,7 +18,7 @@ trait GzcApiRequest
      * @author php迷途小书童
      * @created 2021/1/14 14:34
      */
-    public static function request(string $method, string $url, array $params = [], array $options = [])
+    public static function request(string $method, string $url, array $params = [], array $options = [], $type = 1)
     {
         $base_uri = env('GZC.HOSTNAME');
         $request_uri = $base_uri.$url;
@@ -29,7 +29,7 @@ trait GzcApiRequest
                 "Accept:application/json"
             );
             if ($url != '/v1/api/third/auth/token') {
-                $Token = self::getTokenFromServer();
+                $Token = self::getTokenFromServer($type);
                 $accessToken = $Token['extendData']['accessToken'];
                 array_push($headerArray, "token:".$accessToken);
             }
@@ -56,14 +56,68 @@ trait GzcApiRequest
      */
     public static function checkAmount($user)
     {
-        $data = [
+        $cardType = $user['card_type'] ? $user['card_type'] : 10;
+        $cxbData = [
             'platformNo' => env('GZC.PLATFORM_NO'),
             'appNo' => env('GZC.APP_NO'),
             'conName' => $user['user_name'],
-            'conCertType' => 1,
+            'conCertType' => $cardType,
+            'conCertNo' => $user['user_card'],
+        ];
+        Log::info('储蓄保养老金请求参数：' . json_encode($cxbData));
+        $cxbResponseData = self::request('POST', '/v1/api/third/in/in30', $cxbData, [], 1);
+        Log::info('储蓄保养老金请求返回：' . json_encode($cxbResponseData));
+        if($cxbResponseData['code'] != 0) {
+            return $cxbResponseData['message'];
+        }
+
+        $xfbData = [
+            'platformNo' => env('XINGFUBAO.PLATFORM_NO'),
+            'appNo' => env('XINGFUBAO.APP_NO'),
+            'conName' => $user['user_name'],
+            'conCertType' => $cardType,
             'conCertNo' => $user['user_card'],
         ];
-        return self::request('POST', '/v1/api/third/in/in30', $data);
+        Log::info('幸福保养老金请求参数：' . json_encode($xfbData));
+        $xfbResponseData = self::request('POST', '/v1/api/third/in/in30', $xfbData, [], 2);
+        Log::info('幸福保养老金请求返回：' . json_encode($xfbResponseData));
+        if($xfbResponseData['code'] != 0) {
+            return $xfbResponseData['message'];
+        }
+
+        $amount = $cxbResponseData['extendData']['amount'] + $xfbResponseData['extendData']['amount'];
+        return $amount;
+    }
+    public function getAmountFromGzc()
+    {
+        $uid = $this->request->uid();
+        $userInfo = Db::name('UserCertification')->where('uid', $uid)->field('user_name,user_card')->find();
+
+        if (empty($userInfo['user_name']) || empty($userInfo['user_card'])) {
+            Log::error('[getAmountFromGzc] 用户实名信息缺失', ['uid' => $uid, 'userInfo' => $userInfo]);
+            return app('json')->fail('未找到用户实名信息');
+        }
+
+        try {
+            $res = GzcApiRequest::checkAmount($userInfo);
+        } catch (\Throwable $e) {
+            Log::error('[getAmountFromGzc] 调用异常', ['uid' => $uid, 'error' => $e->getMessage()]);
+            return app('json')->fail('查询失败（第三方异常）');
+        }
+
+        // 提取 amount（兼容多种字段位置）
+        $amountCents = $res['extendData']['amount'] ?? $res['data']['amount'] ?? $res['amount'] ?? null;
+        $amount = $amountCents === null ? 0.0 : floatval($amountCents) * 0.01;
+        $formatted = sprintf('%.2f', $amount);
+
+        // 从 checkAmount 返回的 debug（若存在）
+        $debug = $res['debug'] ?? null;
+
+        // 返回 amount 与 debug 给调用方（前端 / 调试）
+        return app('json')->success([
+            'amount' => $formatted,
+            'debug'  => $debug
+        ]);
     }
     /**
      * 获取TOKEN
@@ -71,13 +125,17 @@ trait GzcApiRequest
      * @author php迷途小书童
      * @created 2021/1/14 14:38
      */
-    public static function getTokenFromServer()
+    public static function getTokenFromServer($type = 1)
     {
         $timestamp = (int)(microtime(true) * 1000);
-        $appid = env('GZC.APP_ID');
+        if ($type == 1) {
+            $appid = env('GZC.APP_ID');
+        }else{
+            $appid = env('XINGFUBAO.APP_ID');
+        }
         $data = [
             'appid' => $appid,
-            'sign' => self::getSignContent($timestamp, $appid),
+            'sign' => self::getSignContent($timestamp, $appid, $type),
             'timestamp' => $timestamp
         ];
         return self::request('POST', '/v1/api/third/auth/token', $data);
@@ -88,8 +146,12 @@ trait GzcApiRequest
      * @author php迷途小书童
      * @created 2020/10/29 9:35
      */
-    public static function getSignContent(int $timestamp, string $appid) {
-        $appsecret = md5(env('GZC.APP_SECRET'));
+    public static function getSignContent(int $timestamp, string $appid, $type = 1) {
+        if ($type == 1) {
+            $appsecret = md5(env('GZC.APP_SECRET'));
+        }else{
+            $appsecret = md5(env('XINGFUBAO.APP_SECRET'));
+        }
         $stringToBeSigned = "appid={$appid}&secret={$appsecret}&timestamp={$timestamp}";
         return md5($stringToBeSigned);
     }

extend/BaiduAi/controller/Ocr.php

@@ -23,7 +23,7 @@ class Ocr
 
     public function __construct()
     {
-        $this->client = new \AipOcr('24267127', 'Utg2bxLY4is7h5DPehVZ63Q4', 'yfGMEAO6YQXIE2pqYMiH4MNBE1DcNhyO ');
+        $this->client = new \AipOcr('24267127', 'Utg2bxLY4is7h5DPehVZ63Q4', 'yfGMEAO6YQXIE2pqYMiH4MNBE1DcNhyO');
     }
 
     public function setConnectionTimeoutInMillis($ms)

extend/BaiduAi/sdk/AipOcr.php

@@ -61,6 +61,8 @@ class AipOcr extends AipBase {
      */
     private $idcardUrl = 'https://aip.baidubce.com/rest/2.0/ocr/v1/idcard';
 
+    private $hkMacauTaiwanUrl = 'https://aip.baidubce.com/rest/2.0/ocr/v1/hk_macau_taiwan_exitentrypermit';
+
     /**
      * 银行卡识别 bankcard api url
      * @var string
@@ -368,6 +370,17 @@ class AipOcr extends AipBase {
         return $this->request($this->idcardUrl, $data);
     }
 
+    public function hkMacauTaiwan($data)
+    {
+        // $data = array();
+        //
+        // $data['url'] =$data['url'];
+        //
+        // $data = array_merge($data, $options);
+
+        return $this->request($this->hkMacauTaiwanUrl, $data);
+    }
+
     /**
      * 银行卡识别接口
      *

route/admin.php

@@ -982,7 +982,9 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::get('dhm_list/lst', 'RefundOrder/dhm_list')->name('systemRefundOrderDhmLst');
             Route::get('dhm_status', 'RefundOrder/dhm_status')->name('systemRefundOrderDhmStatus');
             Route::get('excel', 'Order/Excel')->name('systemOrderExcel');
-            Route::post('killOrderRewards', 'Order/killOrderRewards');
+            Route::post('killOrderRewards', 'Order/killOrderRewards');//撤回订单
+            Route::post('killOrderLst', 'Order/killOrderLst');//撤回订单的列表
+            Route::post('easterKillOrder', 'Order/easterKillOrder');//撤回撤回订单
         })->prefix('admin.order.');
 
         //第三方订单
@@ -994,6 +996,12 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::get('order/tb', 'ThirdOrder/tbOrder')->name('systemThirdOrderTb');
             Route::get('order/hf', 'ThirdOrder/hfOrder')->name('systemThirdOrderHf');
             Route::get('order/detail/:id', 'ThirdOrder/detail')->name('systemThirdOrderDetail');
+            Route::get('order/gjd', 'ThirdOrder/getJdOrder')->name('systemThirdOrderGjd');//导出订单
+            Route::get('order/gwph', 'ThirdOrder/getWphOrder')->name('systemThirdOrderGwph');
+            Route::get('order/gpdd', 'ThirdOrder/getPddOrder')->name('systemThirdOrderGpdd');
+            Route::get('order/gsu', 'ThirdOrder/getSuOrder')->name('systemThirdOrderGsu');
+            Route::get('order/gtb', 'ThirdOrder/getTbOrder')->name('systemThirdOrderGtb');
+            Route::get('order/ghf', 'ThirdOrder/getHfOrder')->name('systemThirdOrderGhf');
         })->prefix('admin.order.');
 
         //分享图片管理