|
@@ -3,6 +3,7 @@
|
|
|
namespace App\Http\Controllers\Wap\Other;
|
|
|
|
|
|
use App\Modules\Subscribe\Services\YearOrderService;
|
|
|
+use App\Modules\User\Services\ReadRecordService;
|
|
|
use App\Modules\User\Services\UserService;
|
|
|
use App\Modules\User\Services\UserWealthyOperateRecordService;
|
|
|
use Illuminate\Http\Request;
|
|
@@ -31,9 +32,8 @@ class XiyueController extends Controller
|
|
|
'register_ip'=>''
|
|
|
]);
|
|
|
|
|
|
- }else{
|
|
|
- $this->_xiyueConsume($openid,$amount);
|
|
|
}
|
|
|
+ $this->_xiyueConsume($openid,$amount);
|
|
|
|
|
|
$result = DB::table('xiyue_zsy_users')->where('uid',$user->id)->select('id')->first();
|
|
|
if(!$result){
|
|
@@ -62,20 +62,26 @@ class XiyueController extends Controller
|
|
|
if($sign != $mySign){
|
|
|
return response()->error('PARAM_ERROR');
|
|
|
}
|
|
|
- $user = UserService::getUserByUnionAndChannelId($openid,6985);
|
|
|
+ //$user = UserService::getUserByUnionAndChannelId($openid,6985);
|
|
|
+ $user = $this->selectXiyueUser($openid);
|
|
|
return response()->success($user);
|
|
|
}
|
|
|
|
|
|
private function _xiyueConsume($openid,$amount){
|
|
|
- $user = UserService::getUserByOpenidAndChannelId($openid,6985);
|
|
|
- if(!$user) return false;
|
|
|
if($amount <= 0){
|
|
|
return false;
|
|
|
}
|
|
|
-
|
|
|
- if($amount > $user->balance || $amount > $user->charge_balance){
|
|
|
+ //$user = UserService::getUserByOpenidAndChannelId($openid,6985);
|
|
|
+ $user = $this->selectXiyueUser($openid);
|
|
|
+ if(!$user) return false;
|
|
|
+ /*if($amount > $user->balance || $amount > $user->charge_balance){
|
|
|
return false;
|
|
|
+ }*/
|
|
|
+ $consume_amount = $amount;
|
|
|
+ if($amount > $user->charge_balance){
|
|
|
+ $consume_amount = $user->charge_balance;
|
|
|
}
|
|
|
+ if(!$consume_amount)return false;
|
|
|
$data = [];
|
|
|
$data['uid'] = $user->id;
|
|
|
$data['type'] = 'xiyueconsume';
|
|
@@ -83,28 +89,48 @@ class XiyueController extends Controller
|
|
|
$data['created_at'] = date('Y-m-d H:i:s');
|
|
|
$data['updated_at'] = date('Y-m-d H:i:s');
|
|
|
$data['balance'] = $amount;
|
|
|
- if ($user->charge_balance >= $amount) {
|
|
|
- $data['charge_balance'] = $amount;
|
|
|
+ if ($user->charge_balance >= $consume_amount) {
|
|
|
+ $data['charge_balance'] = $consume_amount;
|
|
|
$data['reward_balance'] = 0;
|
|
|
- $user->balance -= $amount;
|
|
|
- $user->charge_balance -= $amount;
|
|
|
+ $user->balance -= $consume_amount;
|
|
|
+ $user->charge_balance -= $consume_amount;
|
|
|
} elseif ($user->charge_balance > 0) {
|
|
|
$data['charge_balance'] = $user->charge_balance;
|
|
|
- $data['reward_balance'] = $amount - $user->charge_balance;
|
|
|
- $reward = $amount - $user->charge_balance;
|
|
|
- $user->balance -= $amount;
|
|
|
+ $data['reward_balance'] = $consume_amount - $user->charge_balance;
|
|
|
+ $reward = $consume_amount - $user->charge_balance;
|
|
|
+ $user->balance -= $consume_amount;
|
|
|
$user->charge_balance = 0;
|
|
|
$user->reward_balance -= $reward;
|
|
|
} else {
|
|
|
$data['charge_balance'] = 0;
|
|
|
- $data['reward_balance'] = $amount;
|
|
|
- $user->balance -= $amount;
|
|
|
- $user->reward_balance -= $amount;
|
|
|
+ $data['reward_balance'] = $consume_amount;
|
|
|
+ $user->balance -= $consume_amount;
|
|
|
+ $user->reward_balance -= $consume_amount;
|
|
|
}
|
|
|
$user->save();
|
|
|
DB::table('user_other_consume_record')->insert($data);
|
|
|
return true;
|
|
|
}
|
|
|
+
|
|
|
+ private function selectXiyueUser($openid){
|
|
|
+ $user = UserService::getUserByOpenidAndChannelId($openid,6985);
|
|
|
+ if($user->charge_balance >0) return $user;
|
|
|
+ $all_user = UserService::getUserByOpenid($openid);
|
|
|
+ $select_user = null;
|
|
|
+ $temp_time = 0;
|
|
|
+ foreach ($all_user as $user_item){
|
|
|
+ if($user_item->distribution_channel_id == 6985) continue;
|
|
|
+ if($user_item->charge_balance >0){
|
|
|
+ $last_read_info = ReadRecordService::getByField($user_item->id,'last_read');
|
|
|
+ if(!$last_read_info) continue;
|
|
|
+ list($bid,$cid,$time) = explode('_',$last_read_info);
|
|
|
+ if($time >$temp_time) $select_user = $user_item;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(!$select_user) return $user;
|
|
|
+ return $select_user;
|
|
|
+ }
|
|
|
+
|
|
|
public function xiyueConsume(Request $request){
|
|
|
$openid = $request->post('openid');
|
|
|
$sign = $request->post('sign');
|