|
@@ -95,7 +95,7 @@ class MoneyLog extends Base
|
|
|
$rows = $monuyModel->where('id', $data['id'])->where('user_id', $this->userinfo['id'])->whereDay('createtime')->where('status', $monuyModel::STATUS_NORMAL)->find();
|
|
$rows = $monuyModel->where('id', $data['id'])->where('user_id', $this->userinfo['id'])->whereDay('createtime')->where('status', $monuyModel::STATUS_NORMAL)->find();
|
|
|
if(!$rows) $this->error('数据不存在');
|
|
if(!$rows) $this->error('数据不存在');
|
|
|
//发货数据
|
|
//发货数据
|
|
|
- $data['create_month'] = date('Ym', strtotime($data['create_date']));;//创建月份
|
|
|
|
|
|
|
+ $data['create_month'] = date('Ym', strtotime($data['create_date']));//创建月份
|
|
|
$result = $rows->save($data);
|
|
$result = $rows->save($data);
|
|
|
|
|
|
|
|
Db::commit();
|
|
Db::commit();
|
|
@@ -147,12 +147,13 @@ class MoneyLog extends Base
|
|
|
$count = $monuyModel::getCountAllBalance($type, $time, $uids);
|
|
$count = $monuyModel::getCountAllBalance($type, $time, $uids);
|
|
|
|
|
|
|
|
//记账账户余额
|
|
//记账账户余额
|
|
|
- $user = $monuyModel::getCountAllUserBalance($type, $time, $uids);
|
|
|
|
|
|
|
+ $account = $monuyModel::getCountAllUserBalance($type, $time, $uids);
|
|
|
|
|
+
|
|
|
|
|
|
|
|
//月统计
|
|
//月统计
|
|
|
$month = $monuyModel::getCountAllMonthBalance($type, $time, $uids);
|
|
$month = $monuyModel::getCountAllMonthBalance($type, $time, $uids);
|
|
|
|
|
|
|
|
- $this->success('ok', compact('count', 'user', 'month'));
|
|
|
|
|
|
|
+ $this->success('ok', compact('count', 'account', 'month'));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|