|
|
@@ -81,7 +81,13 @@ class Cash
|
|
|
|
|
|
$total = Dever::db('pay/yspay_cash')->getTotal(array('status' => 2, 'merchant_id' => $info['merchant_id']));
|
|
|
if ($total) {
|
|
|
- Dever::load('pay/yspay/merchant')->log($info['merchant_id'], 1, $info['hf_cash']);
|
|
|
+ $name = '';
|
|
|
+ $admin = Dever::load('manage/auth.info');
|
|
|
+ if ($admin) {
|
|
|
+ $name = $admin['username'];
|
|
|
+ }
|
|
|
+ Dever::load('pay/yspay/merchant')->log($info['merchant_id'], $info['account_id'], 3, $info['hf_cash'], $name);
|
|
|
+
|
|
|
Dever::db('pay/yspay_merchant')->update(array('where_id' => $info['merchant_id'], 'cash' => $total['cash'], 'hf_cash' => $total['hf_cash'], 'fz_cash' => $total['fz_cash']));
|
|
|
}
|
|
|
$info = Dever::db('pay/yspay_cash')->find(array('id' => $info['id'], 'clear' => true));
|
|
|
@@ -192,12 +198,7 @@ class Cash
|
|
|
# 将测试数据改成待入账
|
|
|
public function test_edit_api()
|
|
|
{
|
|
|
- $data = Dever::db('pay/yspay_cash')->select(array('order_num' => 'test123', 'status' => 1));
|
|
|
- if ($data) {
|
|
|
- foreach ($data as $k => $v) {
|
|
|
- $this->up($v['id'], 2);
|
|
|
- }
|
|
|
- }
|
|
|
+ Dever::load('pay/yspay/cash')->up($order_num, 2, $price, $fenzhang);
|
|
|
return 'ok';
|
|
|
}
|
|
|
|
rabin