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

app/controller/api/Auth.php

@@ -694,9 +694,9 @@ class Auth extends BaseController
         }
         //养老金展示
         // $data['annuity'] = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',1) -> sum('number');
-        $a = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',0) -> sum('number');
-        $b = Db::name('user_bill') -> where('uid',$user['uid']) -> where('commission_type',5) -> where('status',1) -> sum('number');
-        $data['annuity'] = $a +$b;
+        $a = Db::name('user_bill')->where('uid', $user['uid'])->where('commission_type', 5)->where('pm', 1)->whereIn('status', [0, 1])->sum('number');
+        $b = Db::name('user_bill')->where('uid', $user['uid'])->where('commission_type', 5)->where('pm', 0)->whereIn('status', [0, 1])->sum('number');
+        $data['annuity'] = $a - $b;
         //上级身份是否大仓会员
         $is_da_cang_vip=Db::name('da_cang_user')->where('status',1)->where('uid',$user["uid"])->find();
         //渠道商

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

@@ -20,58 +20,64 @@ class Taskorderguquan
         /**
         补贴下面人员
         13231658486周行体1000
-        13333069689魏惠新1000
-        13959100621周金花500
-        13701061395李素红500
-        17501006833邢艳丽300
-        15631982690魏震洪300
+        13333069689魏   新1000
+        13959100621周金花700
+        13701061395李素红600
+        17501006833邢艳丽500
+        15631982690魏震洪500
         18603401312黄金花400
-        13521438652徐立苹400
-        15832971815孟晓玮300
-        18600200909陈冠霖300
-        15810064711 王   玲 400
+        13521438652徐立苹500
+        15832971815孟晓玮500
+        18600200909陈冠霖500
+        15810064711 王   玲 500
         13932925303会强400
-        13901074090陈玉刚400
-        13381085923王建军50
-        13601071082隋彩云300
-        18001316701闫旭300
-        13601179856陈瑞元50
-        13161909228刘银霞100
-        18760167163刘春梅50
-        13215917919李小秋50
-        15321221558李伟50
-        15332507711张传莲50
-        15960349667吕丽娣50
-        18612051372李金俭50
-        18715313601大饼400
-        其余部分做分红
+        13901074090陈玉刚500
+        13381085923王建军100
+        13601071082隋彩云400
+        18001316701闫旭400
+        13601179856陈瑞元100
+        13161909228刘银霞200
+        18760167163刘春梅100
+        13215917919李小秋100
+        13801358713金波100
+        15321221558李伟 400
+        15332507711张传莲100
+        15960349667吕丽娣100
+        13231658486周军市场补贴2000
+        魏新腾讯会议费2000
+        15611768709吴连萍100
+        18612051372李金俭 50
+        18715313601大饼500
+        本周总业绩留下3万，其余部分做分红
         */
         $data = [
-            '13231658486' => 1000,
-            '13333069689' => 1000,
-            '13959100621' => 500,
-            '13701061395' => 500,
-            '17501006833' => 300,
-            '15631982690' => 300,
+            '13231658486' => 3000,
+            '13333069689' => 3000,
+            '13959100621' => 700,
+            '13701061395' => 600,
+            '17501006833' => 500,
+            '15631982690' => 500,
             '18603401312' => 400,
-            '13521438652' => 400,
-            '15832971815' => 300,
-            '18600200909' => 300,
-            '15810064711' => 400,
+            '13521438652' => 500,
+            '15832971815' => 500,
+            '18600200909' => 500,
+            '15810064711' => 500,
             '13932925303' => 400,
-            '13901074090' => 400,
-            '13381085923' => 50,
-            '13601071082' => 300,
-            '18001316701' => 300,
-            '13601179856' => 50,
-            '13161909228' => 100,
-            '18760167163' => 50,
-            '13215917919' => 50,
-            '15321221558' => 50,
-            '15332507711' => 50,
-            '15960349667' => 50,
+            '13901074090' => 500,
+            '13381085923' => 100,
+            '13601071082' => 400,
+            '18001316701' => 400,
+            '13601179856' => 100,
+            '13161909228' => 200,
+            '18760167163' => 100,
+            '13215917919' => 100,
+            '13801358713' => 100,
+            '15321221558' => 400,
+            '15332507711' => 100,
+            '15960349667' => 100,
+            '15611768709' => 100,
             '18612051372' => 50,
-            '18715313601' => 400
+            '18715313601' => 500
         ];
 
         $result = Db::name("user")

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

@@ -203,8 +203,21 @@ class StoreOrder extends BaseController
 
         //log::info("计算养老金 good_id： {$good_id},price{$total_price},yanglao:{$yanglao}");
         // $price = $decScore = $decJingScore =  0;
-        foreach ($cartIds as $k=>$item){
-
+        foreach ($cartIds as $k => $item) {
+            // 如果不是 会员专区的 商品 提示 大陆外（港澳台） 暂时不能发货
+            // 66529	台湾
+            // 68405	澳门
+            // 68406	香港
+            if ($product_mer_id != 496 && $addressId != 0) {
+                $address_code_list = Db::name('user_address')->where('uid', $uid)->where('address_id', $addressId)->value('code_list');
+                if ($address_code_list) {
+                    $addressList = explode(',', $address_code_list);
+                    $shiftAddressId = array_shift($addressList);
+                    if (in_array($shiftAddressId, [7, 66529, 68405, 68406])) {
+                        return app('json')->fail('该收货地区暂待开放');
+                    }
+                }
+            }
         $checkGong = $gong -> checkGong($item['product_id'],$item['product_attr_unique'],$item['cart_num'],$uid,$addressId);
         if(isset($checkGong['code']) && $checkGong['code'] == -1) return app('json')->fail($checkGong['message']);
         // $money=Db::name('store_product_attr_value')->where('unique',$item['product_attr_unique'])->value('price');

app/controller/api/user/User.php

@@ -2996,9 +2996,19 @@ class User extends BaseController
             'yanglao_a' => round($this->num($dy, 'yanglao_a'), 2),
         );
 
+        // 扣减
+
+        $kouchu = \think\facade\Db::name('user_bill')
+            ->where('pm', '=', 0)
+            ->where('status', '<>', '-1')
+            ->where(['uid' => $uid, 'commission_type' => '5', 'source' => 0])
+            ->sum('number');
+
         $data['all_num'] = $data['offLine']['num'] +$data['onLine_take_no']['num'] + $data['onLine']['num'] + $data['tb']['num'] + $data['jd']['num'] + $data['su']['num'] + $data['pdd']['num'] + $data['vip']['num'] + $data['dy']['num'];
         $data['all_yanglao'] = round($data['offLine']['yanglao']+$data['onLine']['yanglao'] + $data['onLine_take_no']['yanglao'] + $data['tb']['yanglao'] + $data['jd']['yanglao'] + $data['su']['yanglao'] + $data['pdd']['yanglao'] + $data['vip']['yanglao'] + $data['dy']['yanglao'], 2);
+        $data['all_yanglao'] -= $kouchu;
         $data['all_yanglao_a'] = round($data['offLine']['yanglao'] + $data['onLine']['yanglao'] + $data['tb']['yanglao_a'] + $data['jd']['yanglao_a'] + $data['su']['yanglao_a'] + $data['pdd']['yanglao_a'] + $data['vip']['yanglao_a'] + $data['dy']['yanglao_a'], 2);
+        $data['all_yanglao_a'] -= $kouchu;
         $data['third_party_num']=['all_num'=>$data['tb']['num']+$data['jd']['num']+$data['su']['num']+ $data['pdd']['num'] + $data['vip']['num']+ $data['dy']['num']];
         $data['third_party_num_a']=['all_num_a'=>$data['tb']['num_a']+$data['jd']['num_a']+$data['su']['num_a']+ $data['pdd']['num_a'] + $data['vip']['num_a']+ $data['dy']['num_a']];
         $data['third_party_num_n']=['all_num_n'=>$data['third_party_num']['all_num']-$data['third_party_num_a']['all_num_a']];