|
|
@@ -3,10 +3,10 @@
|
|
|
namespace app\api\controller;
|
|
|
|
|
|
use app\common\model\StockConfig;
|
|
|
-use app\common\model\ShopList;
|
|
|
+use app\common\model\MoneyLog as MonuyModel;
|
|
|
use app\common\model\StockLog;
|
|
|
use think\exception\ValidateException;
|
|
|
-use app\api\validate\Stock as StockValidate;
|
|
|
+use app\api\validate\Money as MoneyValidate;
|
|
|
use app\common\model\StockDetail;
|
|
|
use think\facade\Db;
|
|
|
|
|
|
@@ -27,10 +27,33 @@ class MoneyLog extends Base
|
|
|
}
|
|
|
|
|
|
//记账
|
|
|
- public function money(StockConfig $stockConfig, StockDetail $stockDetail)
|
|
|
+ public function money(StockConfig $stockConfig, MonuyModel $monuyModel)
|
|
|
{
|
|
|
|
|
|
+ $data = $this->request->post();
|
|
|
+ $result = false;
|
|
|
+ Db::startTrans();
|
|
|
+ try {
|
|
|
+ validate(MoneyValidate::class)->scene('add')->check($data);
|
|
|
+
|
|
|
+ //发货数据
|
|
|
+ $data['user_id'] = $this->userinfo['id'];
|
|
|
+ $result = $monuyModel::create($data);
|
|
|
|
|
|
+ Db::commit();
|
|
|
+ }catch (ValidateException $e) {
|
|
|
+ Db::rollback();
|
|
|
+ return $this->error($e->getError());
|
|
|
+ } catch (\Exception $e) {
|
|
|
+ Db::rollback();
|
|
|
+ $this->error($e->getMessage());
|
|
|
+ }
|
|
|
+ if ($result === false) {
|
|
|
+ $this->error(__('没有新增任何数据'));
|
|
|
+ }
|
|
|
+ $this->success();
|
|
|
+
|
|
|
+ //MoneyValidate
|
|
|
|
|
|
$result = [];
|
|
|
$list = $stockConfig->where('status', $stockConfig::StatusNormal)->field('id,type_id,title')
|