git

app/admin/controller/order/Package.php

@@ -22,11 +22,11 @@ class Package extends AuthController
     public function setstatus()
     {
         $data = Util::getMore([
-            ['status',3],
+            ['status',2],
         ], $this->request);
-        if($data['status']==3)
+        if($data['status']==2)
         {
-           $rs =  \app\models\store\Package::take(input('id',0));
+           $rs =  \app\models\store\Package::take_out(input('id',0));
         }
         else
         {
@@ -34,7 +34,7 @@ class Package extends AuthController
         }
 
         if ($rs) return $this->successful('审核成功!');
-        else return $this->failed('审核失败');
+        else return $this->failed(\app\models\store\Package::getErrorInfo());
 
     }
 }

app/models/store/Package.php

@@ -229,6 +229,10 @@ class Package extends BaseModel
                 User::where('uid', $info['to_uid'])->dec('gold', $package_income)->update();
                 $to_user = User::where('uid', $info['to_uid'])->find();
                 UserBill::income('扣除收益', $info['to_uid'], 'gold', 'dec', $package_income, $info['id'], $to_user['gold'], '订单未确认收货系统确认，扣除收益' .$package_income );
+                if($to_user['gold']<=0)
+                {
+                    User::where('uid', $info['to_uid'])->update(['gold'=>0]);
+                }
                 if ($info['last_id'] > 0) self::edit(['status' => 4], $info['last_id']);
                 self::commitTrans();
             }

app/models/store/StoreOrder.php

@@ -2206,6 +2206,16 @@ class StoreOrder extends BaseModel
     {
         $userInfo = User::find($order['uid']);
         $userlist =User::alias('a')->join("eb_system_store b","a.uid=b.uid","left")->field('a.uid,a.spread_uid,a.nickname,a.level,a.brokerage_price,b.is_show as approve')->select()->toarray();
+        if($order['use_integral']>0 || $order['deduction_price']>0) return true;
+        $sp_userInfo = User::find($userInfo['spread_uid']);
+        if($sp_userInfo && $sp_userInfo['level']>0)
+        {
+            $sp_brokeragePrice = bcdiv(bcmul($order['total_price'],sys_config('recommend'), 2), 100, 2);
+            $balance = bcadd($sp_userInfo['brokerage_price'], $sp_brokeragePrice, 2);
+            $mark = $userInfo['nickname'] . '推荐奖' . floatval($sp_brokeragePrice) . "元,订单号:" . $order['order_id'];
+            $res1 = UserBill::income('推荐奖', $sp_userInfo['uid'], 'now_money', 'brokerage', $sp_brokeragePrice, $order['id'], $balance, $mark, 1);
+            User::where('uid', $sp_userInfo['uid'])->inc('brokerage_price', $sp_brokeragePrice)->update();
+        }
         try {
             //处理级差
             $pids = UtilService::getparentid($userlist, $order['uid']);

app/models/user/User.php

@@ -279,6 +279,7 @@ class User extends BaseModel
         if (isset($orderInfo['combination_id']) && $orderInfo['combination_id']) return true;
         if (isset($orderInfo['seckill_id']) && $orderInfo['seckill_id']) return true;
         if (isset($orderInfo['bargain_id']) && $orderInfo['bargain_id']) return true;
+        return true;
 
         $userInfo = User::getUserInfo($orderInfo['uid']);
         //TODO 当前用户不存在 没有上级 或者 当用用户上级时自己  直接返回

crmeb/subscribes/TaskSubscribe.php

@@ -76,13 +76,6 @@ class TaskSubscribe
         } catch (\Exception $e) {
             Db::rollback();
         }
-        try {
-            Db::startTrans();
-            Package::take_outs();//自动确认
-            Db::commit();
-        } catch (\Exception $e) {
-            Db::rollback();
-        }
         try {
             Db::startTrans();
             StorePink::statusPink();//拼团到期修改状态