diff --git a/application/plugins/wallet/Common.php b/application/plugins/wallet/Common.php index a4bb674a11e23b4961033a1ee7ff3eb66fc12c86..8ca36677beca3dc173d4e81e5d89cf186782b81f 100644 --- a/application/plugins/wallet/Common.php +++ b/application/plugins/wallet/Common.php @@ -57,7 +57,7 @@ class Common extends Controller $this->assign('buy_payment_list', PaymentService::BuyPaymentList(['is_enable'=>1, 'is_open_user'=>1])); // 用户钱包 - $user_wallet = WalletService::UserWallet(['user'=>$this->user]); + $user_wallet = WalletService::UserWallet($this->user['id']); // 用户钱包状态 $wallet_error = ''; diff --git a/application/plugins/wallet/service/PayService.php b/application/plugins/wallet/service/PayService.php index 2088799b369ee623acbf2092ec5a22a34a9204ad..98501c12779c5a63a9ba3ecca51354ab93e21441 100644 --- a/application/plugins/wallet/service/PayService.php +++ b/application/plugins/wallet/service/PayService.php @@ -14,6 +14,7 @@ use think\Db; use app\service\PaymentService; use app\service\PayLogService; use app\service\MessageService; +use app\service\PluginsService; use app\plugins\wallet\service\WalletService; /** @@ -326,13 +327,21 @@ class PayService ]; PayLogService::PayLogInsert($pay_log_data); + // 获取用户钱包校验 + $user_wallet = WalletService::UserWallet($params['recharge']['user_id']); + if($user_wallet['code'] != 0) + { + return $user_wallet; + } else { + if($user_wallet['data']['id'] != $params['recharge']['wallet_id']) + { + return DataReturn('用户钱包不匹配', -1); + } + } + // 开启事务 Db::startTrans(); - // 消息通知 - $detail = '账户充值成功，金额'.PriceBeautify($params['recharge']['money']).'元'; - MessageService::MessageAdd($params['recharge']['user_id'], '账户充值', $detail, 2, $params['recharge']['id']); - // 更新充值状态 $upd_data = array( 'status' => 1, @@ -345,23 +354,57 @@ class PayService ); if(Db::name('PluginsWalletRecharge')->where(['id'=>$params['recharge']['id']])->update($upd_data)) { - /*$log_data = [ - 'user_id' => $wallet['user_id'], - 'wallet_id' => $wallet['id'], - 'business_type' => 0, - 'operation_type' => ($wallet[$v['field']] < $data[$v['field']]) ? 1 : 0, - 'money_type' => $v['money_type'], - 'operation_money' => ($wallet[$v['field']] < $data[$v['field']]) ? PriceNumberFormat($data[$v['field']]-$wallet[$v['field']]) : PriceNumberFormat($wallet[$v['field']]-$data[$v['field']]), - 'original_money' => $wallet[$v['field']], - 'latest_money' => $data[$v['field']], - 'msg' => '管理员操作'.$operation_msg, - ]; - if(!self::WalletLogInsert($log_data)) + // 字段名称 金额类型 + $money_field = [ + ['field' => 'normal_money', 'money_type' => 0, 'msg' => ' [ '.$pay_price.'元 ]'], + ]; + + // 是否有赠送金额 + $give_money = self::RechargeGiveMoneyHandle($pay_price); + if($give_money > 0) + { + $money_field[] = ['field' => 'give_money', 'money_type' => 2, 'msg' => ' [ 赠送'.$give_money.'元 ]']; + } + + // 钱包更新数据 + $data = [ + 'normal_money' => PriceNumberFormat($user_wallet['data']['normal_money']+$pay_price+$give_money), + 'give_money' => PriceNumberFormat($user_wallet['data']['give_money']+$give_money), + 'upd_time' => time(), + ]; + if(!Db::name('PluginsWallet')->where(['id'=>$user_wallet['data']['id']])->update($data)) + { + Db::rollback(); + return DataReturn('钱包更新失败', -10); + } + + foreach($money_field as $v) + { + // 有效金额 + if($user_wallet['data'][$v['field']] != $data[$v['field']]) { - Db::rollback(); - return DataReturn('日志添加失败', -101); - }*/ - + $log_data = [ + 'user_id' => $user_wallet['data']['user_id'], + 'wallet_id' => $user_wallet['data']['id'], + 'business_type' => 1, + 'operation_type' => 1, + 'money_type' => $v['money_type'], + 'operation_money' => ($user_wallet['data'][$v['field']] < $data[$v['field']]) ? PriceNumberFormat($data[$v['field']]-$user_wallet['data'][$v['field']]) : PriceNumberFormat($user_wallet['data'][$v['field']]-$data[$v['field']]), + 'original_money' => $user_wallet['data'][$v['field']], + 'latest_money' => $data[$v['field']], + 'msg' => '账户充值'.$v['msg'], + ]; + if(!self::WalletLogInsert($log_data)) + { + Db::rollback(); + return DataReturn('日志添加失败', -101); + } + + // 消息通知 + MessageService::MessageAdd($params['recharge']['user_id'], '账户充值', $log_data['msg'], 2, $params['recharge']['id']); + } + } + // 提交事务 Db::commit(); return DataReturn('支付成功', 0); @@ -371,5 +414,35 @@ class PayService Db::rollback(); return DataReturn('处理失败', -100); } + + /** + * 充值赠送金额计算 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-05-08T00:12:48+0800 + * @param [float] $pay_price [支付金额] + */ + private static function RechargeGiveMoneyHandle($pay_price) + { + $give_money = 0; + $ret = PluginsService::PluginsData('wallet', '', false); + if(!empty($ret['data']['recharge_give_value']) && isset($ret['data']['recharge_give_type'])) + { + switch($ret['data']['recharge_give_type']) + { + // 固定金额 + case 0 : + $give_money = PriceNumberFormat($ret['data']['recharge_give_value']); + break; + + // 比例 + case 1 : + $give_money = ($ret['data']['recharge_give_value']/100)*$pay_price; + break; + } + } + return $give_money; + } } ?> \ No newline at end of file diff --git a/application/plugins/wallet/service/WalletService.php b/application/plugins/wallet/service/WalletService.php index 6b76cb116c0eafecfa2dc6491fe1ca94c7ea4bdd..c55628334b7d8c545e0a2ca97eab003fe70db686 100644 --- a/application/plugins/wallet/service/WalletService.php +++ b/application/plugins/wallet/service/WalletService.php @@ -14,6 +14,7 @@ use think\Db; use app\service\PluginsService; use app\service\ResourcesService; use app\service\PaymentService; +use app\service\MessageService; /** * 钱包服务层 @@ -184,30 +185,22 @@ class WalletService * @version 1.0.0 * @date 2019-04-30 * @desc description - * @param [array] $params [输入参数] + * @param [int] $user_id [用户id] */ - public static function UserWallet($params = []) + public static function UserWallet($user_id) { // 请求参数 - $p = [ - [ - 'checked_type' => 'empty', - 'key_name' => 'user', - 'error_msg' => '用户信息有误', - ], - ]; - $ret = ParamsChecked($params, $p); - if($ret !== true) + if(empty($user_id)) { - return DataReturn($ret, -1); + return DataReturn('用户id有误', -1); } // 获取钱包, 不存在则创建 - $wallet = Db::name('PluginsWallet')->where(['user_id' => $params['user']['id']])->find(); + $wallet = Db::name('PluginsWallet')->where(['user_id' => $user_id])->find(); if(empty($wallet)) { $data = [ - 'user_id' => $params['user']['id'], + 'user_id' => $user_id, 'status' => 0, 'add_time' => time(), ]; @@ -322,15 +315,15 @@ class WalletService if(!Db::name('PluginsWallet')->where(['id'=>$wallet['id']])->update($data)) { Db::rollback(); - return DataReturn('编辑失败', -100); + return DataReturn('操作失败', -100); } // 日志 // 字段名称 金额类型 $money_field = [ - ['field' => 'normal_money', 'money_type' => 0], - ['field' => 'frozen_money', 'money_type' => 1], - ['field' => 'give_money', 'money_type' => 2], + ['field' => 'normal_money', 'money_type' => 0, 'name' => '有效金额'], + ['field' => 'frozen_money', 'money_type' => 1, 'name' => '冻结金额'], + ['field' => 'give_money', 'money_type' => 2, 'name' => '赠送金额'], ]; // 操作原因 @@ -349,19 +342,23 @@ class WalletService 'operation_money' => ($wallet[$v['field']] < $data[$v['field']]) ? PriceNumberFormat($data[$v['field']]-$wallet[$v['field']]) : PriceNumberFormat($wallet[$v['field']]-$data[$v['field']]), 'original_money' => $wallet[$v['field']], 'latest_money' => $data[$v['field']], - 'msg' => '管理员操作'.$operation_msg, ]; + $operation_type_text = ($log_data['operation_type'] == 1) ? '增加' : '减少'; + $log_data['msg'] = '管理员操作[ '.$v['name'].$operation_type_text.$log_data['operation_money'].'元 ]'.$operation_msg; if(!self::WalletLogInsert($log_data)) { Db::rollback(); return DataReturn('日志添加失败', -101); } + + // 消息通知 + MessageService::MessageAdd($wallet['user_id'], '账户余额变动', $log_data['msg'], 0, $wallet['id']); } } // 处理成功 Db::commit(); - return DataReturn('编辑成功', 0); + return DataReturn('操作成功', 0); } } ?> \ No newline at end of file