Merge remote-tracking branch 'origin/master'

app/admin/controller/order/Package.php

@@ -24,6 +24,8 @@ class Package extends AuthController
         $data = Util::getMore([
             ['status',2],
         ], $this->request);
+        if(cache('id_'.input('id',0))) return Json::fail('处理中，请不要重复点');
+        cache('id_'.input('id',0),1);
         if($data['status']==2)
         {
            $rs =  \app\models\store\Package::take_out(input('id',0));
@@ -34,7 +36,11 @@ class Package extends AuthController
         }
 
         if ($rs) return $this->successful('审核成功!');
-        else return $this->failed(\app\models\store\Package::getErrorInfo());
+        else
+        {
+            cache('id_'.input('id',0),null);
+            return $this->failed(\app\models\store\Package::getErrorInfo());
+        }
 
     }
 }

app/api/controller/user/UserBillController.php

@@ -270,6 +270,7 @@ class UserBillController
                     'Bold' => 'static' . DS . 'font' . DS . 'Alibaba-PuHuiTi-Regular.otf',
                     'Normal' => 'static' . DS . 'font' . DS . 'Alibaba-PuHuiTi-Regular.otf',
                 ];
+           
                 if (!file_exists($filelink['Bold'])) return app('json')->fail('缺少字体文件Bold');
                 if (!file_exists($filelink['Normal'])) return app('json')->fail('缺少字体文件Normal');
                 foreach ($routineSpreadBanner as $key => &$item) {
@@ -313,6 +314,7 @@ class UserBillController
                     $resWap = $resWap && $posterInfo = UtilService::setSharePoster($config, 'wap/spread/poster');
                     if (!is_array($posterInfo)) return app('json')->fail($posterInfo);
                     SystemAttachment::attachmentAdd($posterInfo['name'], $posterInfo['size'], $posterInfo['type'], $posterInfo['dir'], $posterInfo['thumb_path'], 1, $posterInfo['image_type'], $posterInfo['time'], 2);
+                    
                     if ($resWap) {
                         if ($posterInfo['image_type'] == 1)
                             $item['wap_poster'] = $siteUrl . $posterInfo['thumb_path'];

app/models/store/Package.php

@@ -204,22 +204,14 @@ class Package extends BaseModel
         self::beginTrans();
         try {
             foreach ($list as $info) {
-                $gold_bond = bcmul($info['price'],bcdiv(sys_config('gold_bond'),100,3),2);
-                User::where('uid',$info['uid'])->inc('integral',$gold_bond)->update();
-                $user = User::where('uid',$info['uid'])->find();
-                UserBill::income('订单金券收益',$info['uid'],'integral','package',$gold_bond,$info['id'],$user['gold'],'订单金券收益'.$gold_bond);
-                $res = self::edit($data,$info['id']);
-                $to_user = User::where('uid', $info['to_uid'])->find();
-                if ($info['last_id'] > 0) self::edit(['status' => 4], $info['last_id']);
-                self::edit($data, $info['id']);
                 $package_income = bcmul($info['price'], bcdiv(sys_config('package_income'), 100, 3), 2);
                 User::where('uid', $info['to_uid'])->dec('gold', $package_income)->update();
+                $to_user = User::where('uid', $info['to_uid'])->find();
+                UserBill::expend('扣除收益', $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]);
-                      continue;
+                    User::where('uid', $info['to_uid'])->update(['gold'=>0]);
                 }
-                UserBill::income('扣除收益', $info['to_uid'], 'gold', 'dec', $package_income, $info['id'], $to_user['gold'], '订单未确认收货系统确认，扣除收益' .$package_income );
 
             }
         } catch (Exception $e) {
@@ -237,6 +229,7 @@ class Package extends BaseModel
             $data['status'] = 2;
             $data['paid'] = 1;
             $data['pay_time'] = time();
+            $data['admin_id'] = 2;
             self::beginTrans();
             try {
                 $package_income = bcmul($info['price'], bcdiv(sys_config('package_income'), 100, 3), 2);