sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

钱包充值

feat/task1-c-wallet
gongfuxiang 2019-05-08 01:20:31 +08:00
parent c2a7dffbf2
commit 04416dc94d
2 changed files with 70 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
application/plugins/wallet/service/PayService.php
View File

@ -351,13 +351,16 @@ class PayService
'payment_name' => $params['payment']['name'], 'payment_name' => $params['payment']['name'],
'pay_time' => time(), 'pay_time' => time(),
); );
if(Db::name('PluginsWalletRecharge')->where(['id'=>$params['recharge']['id']])->update($upd_data)) if(!Db::name('PluginsWalletRecharge')->where(['id'=>$params['recharge']['id']])->update($upd_data))
{ {
Db::rollback();
return DataReturn('充值状态更新失败', -100);
}
// 是否有赠送金额 // 是否有赠送金额
$give_money = self::RechargeGiveMoneyHandle($pay_price); $give_money = self::RechargeGiveMoneyHandle($pay_price);
// 字段名称 金额类型 // 字段名称 金额类型 描述
if($give_money > 0) if($give_money > 0)
{ {
$money_field = [ $money_field = [
@ -382,6 +385,7 @@ class PayService
return DataReturn('钱包更新失败', -10); return DataReturn('钱包更新失败', -10);
} }
// 有效金额和赠送金额字段数据处理
foreach($money_field as $v) foreach($money_field as $v)
{ {
// 有效金额 // 有效金额
@ -414,11 +418,6 @@ class PayService
return DataReturn('支付成功', 0); return DataReturn('支付成功', 0);
} }
// 处理失败
Db::rollback();
return DataReturn('处理失败', -100);
}
/** /**
* 充值赠送金额计算 * 充值赠送金额计算
* @author Devil * @author Devil
@ -429,7 +428,7 @@ class PayService
*/ */
private static function RechargeGiveMoneyHandle($pay_price) private static function RechargeGiveMoneyHandle($pay_price)
{ {
$give_money = 0; $give_money = 0.00;
$ret = PluginsService::PluginsData('wallet', '', false); $ret = PluginsService::PluginsData('wallet', '', false);
if(!empty($ret['data']['recharge_give_value']) && isset($ret['data']['recharge_give_type'])) if(!empty($ret['data']['recharge_give_value']) && isset($ret['data']['recharge_give_type']))
{ {
@ -437,7 +436,7 @@ class PayService
{ {
// 固定金额 // 固定金额
case 0 : case 0 :
$give_money = PriceNumberFormat($ret['data']['recharge_give_value']); $give_money = $ret['data']['recharge_give_value'];
break; break;
// 比例 // 比例
@ -446,7 +445,7 @@ class PayService
break; break;
} }
} }
return $give_money; return PriceNumberFormat($give_money);
} }
} }
?> ?>

10
application/plugins/wallet/service/WalletService.php
View File

@ -319,11 +319,11 @@ class WalletService
} }
// 日志 // 日志
// 字段名称 金额类型 // 字段名称 金额类型 金额名称
$money_field = [ $money_field = [
['field' => 'normal_money', 'money_type' => 0, 'name' => '有效金额'], ['field' => 'normal_money', 'money_type' => 0],
['field' => 'frozen_money', 'money_type' => 1, 'name' => '冻结金额'], ['field' => 'frozen_money', 'money_type' => 1],
['field' => 'give_money', 'money_type' => 2, 'name' => '赠送金额'], ['field' => 'give_money', 'money_type' => 2],
]; ];
// 操作原因 // 操作原因
@ -344,7 +344,7 @@ class WalletService
'latest_money' => $data[$v['field']], 'latest_money' => $data[$v['field']],
]; ];
$operation_type_text = ($log_data['operation_type'] == 1) ? '增加' : '减少'; $operation_type_text = ($log_data['operation_type'] == 1) ? '增加' : '减少';
$log_data['msg'] = '管理员操作[ '.$v['name'].$operation_type_text.$log_data['operation_money'].'元 ]'.$operation_msg; $log_data['msg'] = '管理员操作[ '.self::$money_type_list[$v['money_type']]['name'].'金额'.$operation_type_text.$log_data['operation_money'].'元 ]'.$operation_msg;
if(!self::WalletLogInsert($log_data)) if(!self::WalletLogInsert($log_data))
{ {
Db::rollback(); Db::rollback();