Merge branch 'master' of https://git.bjtdba.com/shop/php

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

@@ -2365,9 +2365,9 @@ class StoreOrderRepository extends BaseRepository
                 // 商贸区
                 /** @var \app\common\repositories\merchant\MerchantRepository $merchant */
                 $merchant = app()->make(MerchantRepository::class);
-                $merchantInfo = $merchant->get($store_product_datas['mer_id']);
+                $tmpMerchantInfo = $merchant->get($store_product_datas['mer_id']);
                 // 1企业2个体3个人
-                if ($merchantInfo && in_array($merchantInfo['type'], [2, 3])) {
+                if ($tmpMerchantInfo && in_array($tmpMerchantInfo['type'], [2, 3])) {
                     $jf = $orderpri - round($store_product_datas['concession_pri'] * 0.3, 2) . ' + ' . round($store_product_datas['concession_pri'] * 0.3, 2);
                     $jd = $orderpri - round($store_product_datas['concession_pri'] * 0.35, 2) . ' + ' . round($store_product_datas['concession_pri'] * 0.35, 2);
                     if ($store_product_datas['concession_pri'] != null || $store_product_datas['concession_pri'] != 0) {

app/common/repositories/user/UserOfflineRechargeRepository.php

@@ -138,25 +138,25 @@ class UserOfflineRechargeRepository extends BaseRepository
                 //496商户线下支付不返回养老金   
                 $orders = OrderMerchant::getDB()->where('pay_user_id', $unionUser->unionid)->where('status', 1) ->whereNotIn('mer_id', [496]) ->where('binds',0)->select();
                 foreach ($orders as $order) {
-                    app()->make(UserBillRepository::class)->incBill($unionUser->uid, 'now_money', 'commission', [
-                        'link_id' => $order->id,
-                        'pm' => 1,
-                        'status' => 1,
-                        'title' => '养老金',
-                        'number' => $order->pension,
-                        'mark' => '线下消费获得养老金',
-                        'commission_type' => 5,
-                        'balance' => $user->annuity,
-                        'order_sn' => $order->out_trade_no,
-                        'mer_id' => $order->mer_id,
-                        'source' => 1
-                    ]);
-                    $user->annuity += $order->pension;
-                    $user->annuity_num += 1;
+                    // app()->make(UserBillRepository::class)->incBill($unionUser->uid, 'now_money', 'commission', [
+                    //     'link_id' => $order->id,
+                    //     'pm' => 1,
+                    //     'status' => 1,
+                    //     'title' => '养老金',
+                    //     'number' => $order->pension,
+                    //     'mark' => '线下消费获得养老金',
+                    //     'commission_type' => 5,
+                    //     'balance' => $user->annuity,
+                    //     'order_sn' => $order->out_trade_no,
+                    //     'mer_id' => $order->mer_id,
+                    //     'source' => 1
+                    // ]);
+                    // $user->annuity += $order->pension;
+                    // $user->annuity_num += 1;
                     if (!$user->mer_id || !$user->locktime) {
                         Db::name('user')->where('uid', $unionUser->uid)->update(['mer_id' => $order->mer_id, 'locktime' => date('Y-m-d H:i:s')]);
                     }
-                    $user->save();
+                    // $user->save();
 
                     //同步用户部分------------------------------------
                     //同步红包

app/common/repositories/user/UserRepository.php

@@ -1185,7 +1185,7 @@ class UserRepository extends BaseRepository
     public function registr(string $phone, ?string $pwd, $user_type = 'h5',$url="",$nickname="",$external=1,$spread_uid=null)
     {
         $user_res = Db::name('user')->where('phone', $phone)->find();
-        if ($user_res && !$user_res['account']) {
+        if ($user_res || !$user_res['account']) {
             $data = [
                 'account' => $phone,
             ];