diff --git a/app/admin/controller/store_extract/StoreExtractController.php b/app/admin/controller/store_extract/StoreExtractController.php index 855d4f55e..941546a7b 100644 --- a/app/admin/controller/store_extract/StoreExtractController.php +++ b/app/admin/controller/store_extract/StoreExtractController.php @@ -62,7 +62,18 @@ class StoreExtractController extends BaseAdminController } return $this->fail(StoreExtractLogic::getError()); } - + /** + * @notes 确认提现 + * @return \think\response\Json + * @author admin + * @date 2024/05/31 17:09 + */ + public function enter() + { + $params = $this->request->post(); + $result = StoreExtractLogic::Enter($params); + return $this->success('提现成功', [], 1, 1); + } /** * @notes 删除门店提现 diff --git a/app/admin/controller/user/UserController.php b/app/admin/controller/user/UserController.php index 722f5501c..5e0e5145d 100644 --- a/app/admin/controller/user/UserController.php +++ b/app/admin/controller/user/UserController.php @@ -23,7 +23,7 @@ class UserController extends BaseAdminController return $this->dataLists(new UserLists()); } - /** + /** * @notes 添加用户列表 * @return \think\response\Json * @author likeadmin @@ -61,17 +61,17 @@ class UserController extends BaseAdminController { // $params = (new UserValidate())->post()->goCheck('edit'); $params = $this->request->post(); - $result = UserLogic::edit($params); - if (true === $result) { - return $this->success('编辑成功', [], 1, 1); - } - return $this->fail(UserLogic::getError()); + $result = UserLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(UserLogic::getError()); } //采购款明细、余额明细、礼品券明细、返还金明细 public function fundList() { - (new UserValidate())->get()->goCheck('fund'); + (new UserValidate())->get()->goCheck('fund'); $page_no = (int)$this->request->get('page_no', 1); $page_size = (int)$this->request->get('page_size', 15); $params = $this->request->get(); @@ -81,7 +81,6 @@ class UserController extends BaseAdminController $res['page_no'] = $params['page_no']; $res['page_size'] = $params['page_size']; return $this->success('ok', $res); - } @@ -91,7 +90,6 @@ class UserController extends BaseAdminController public function userSing() { return $this->dataLists(new UserSignLogLists()); - } @@ -107,10 +105,24 @@ class UserController extends BaseAdminController $params['page_no'] = $page_no > 0 ? $page_no : 1; $params['page_size'] = $page_size > 0 ? $page_size : 15; $uid = $uid['id']; - $res = UserLogic::giftList($uid,$params); + $res = UserLogic::giftList($uid, $params); $res['page_no'] = $params['page_no']; $res['page_size'] = $params['page_size']; return $this->success('ok', $res); } - -} \ No newline at end of file + + //设置采购款 + public function setPurchaseFunds() + { + $params = $this->request->post(); + $res = UserLogic::PurchaseFunds($params); + return $this->success( '设置成功',[],1,1); + } + //设置余额 + public function setnowMoney() + { + $params = $this->request->post(); + $res = UserLogic::nowMoney($params); + return $this->success( '设置成功',[],1,1); + } +} diff --git a/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php b/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php index 7e8ed2422..9194087e5 100644 --- a/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php +++ b/app/admin/lists/beforehand_order_cart_info/BeforehandOrderCartInfoLists.php @@ -71,7 +71,7 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe } $list = BeforehandOrderCartInfo::where($this->searchWhere) - ->field(['id', 'bhoid', 'uid', 'is_buyer', 'buyer_uid', 'product_id', 'attr_value_id', 'purchase', 'price', 'total_price', 'cart_num', 'mark']) + ->field(['id', 'bhoid','package','store_info','marques','gross_weight','net_weight','accept_num','after_sales','loss', 'uid', 'is_buyer', 'buyer_uid', 'product_id', 'attr_value_id', 'purchase', 'price', 'total_price', 'cart_num', 'mark']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function ($item) use($system_store,$order_mark) { @@ -140,12 +140,18 @@ class BeforehandOrderCartInfoLists extends BaseAdminDataLists implements ListsSe 'bhoid' => '订单id', 'store_name' => '商品名称', 'system_store' => '门店', - 'warehouse_stock' => '仓库数量', - 'cart_num' => '需求数量', + 'marques' => '型号', + 'package' => '包装', 'top_cate_name' => '分类', 'unit_name' => '单位', + 'gross_weight' => '毛重', + 'net_weight' => '净重', + 'warehouse_stock' => '仓库数量', + 'cart_num' => '需求数量', 'price' => '单价', 'total_price' => '总价', + 'after_sales' => '售后', + 'loss' => '损耗', 'mark' => '备注', 'order_mark' => '订单备注', diff --git a/app/admin/lists/store_extract/StoreExtractLists.php b/app/admin/lists/store_extract/StoreExtractLists.php index 12c550434..c4853b8c3 100644 --- a/app/admin/lists/store_extract/StoreExtractLists.php +++ b/app/admin/lists/store_extract/StoreExtractLists.php @@ -66,6 +66,8 @@ class StoreExtractLists extends BaseAdminDataLists implements ListsSearchInterfa $item->id_card=$find['id_card']; $item->openid=$openid; } + $item->status_name=$item->status==1?"通过":"审核中"; + $item->pay_status_name=$item->pay_status==1?"已转账":"未转账"; }) ->toArray(); } diff --git a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php index a9e09c936..50d5bc990 100644 --- a/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php +++ b/app/admin/lists/store_finance_flow/StoreFinanceFlowLists.php @@ -32,7 +32,7 @@ class StoreFinanceFlowLists extends BaseAdminDataLists implements ListsSearchInt public function setSearch(): array { return [ - '=' => ['store_id', 'user_id', 'create_time', 'staff_id','financial_type','financial_pm','order_id'], + '=' => ['store_id', 'user_id', 'create_time', 'staff_id','financial_type','financial_pm','order_id','order_sn'], 'between_time' => 'create_time', '%pipe_like%' => ['keyword' => 'order_sn'], ]; diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php index 5ca083b90..a9c4a4731 100644 --- a/app/admin/lists/warehouse_product/WarehouseProductLists.php +++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php @@ -11,6 +11,8 @@ use app\common\model\store_product\StoreProduct; use app\common\model\system_store\SystemStore; use app\common\model\warehouse\Warehouse; use app\common\lists\ListsExcelInterface; +use app\common\model\store_category\StoreCategory; +use app\common\model\store_product_unit\StoreProductUnit; use app\common\model\supplier\Supplier; /** @@ -78,6 +80,9 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt $item->store_name = ''; $item->image = ''; $item->price = ''; + $item->unit_name = ''; + $item->store_info = ''; + $item->top_cate_name = ''; if ($item->financial_pm == 0) { $item->financial_pm_name = '出库'; } else { @@ -101,11 +106,14 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt $item->admin_name = ''; } if ($item->product_id) { - $find = StoreProduct::where('id', $item->product_id)->field('price,image,store_name')->find(); + $find = StoreProduct::where('id', $item->product_id)->field('price,image,store_name,unit,store_info,top_cate_id')->withTrashed()->find(); if($find){ $item->store_name = $find->store_name . '|' . $item->product_id; $item->image = $find->image; $item->price = $find->price; + $item->unit_name = StoreProductUnit::where('id', $find->unit)->value('name'); + $item->store_info =$find->store_info; + $item->top_cate_name =StoreCategory::where('id', $find->top_cate_id)->value('name'); } } if ($item->warehouse_id) { @@ -182,12 +190,18 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt ]; } else { $data = [ + 'id' => 'id', 'admin_name' => '操作人员', 'warehouse_name' => '仓库', 'store_name' => '商品名称', + 'top_cate_name' => '分类', + 'store_info' => '规格', + 'unit_name' => '单位', 'financial_pm_name' => '出入库', 'system_store_name' => '门店', 'nums' => '数量', + 'purchase' => '价格', + 'total_price' => '总价', 'create_time' => '操作时间', ]; } diff --git a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php index a80e7d829..95e51f64b 100644 --- a/app/admin/logic/beforehand_order/BeforehandOrderLogic.php +++ b/app/admin/logic/beforehand_order/BeforehandOrderLogic.php @@ -55,11 +55,24 @@ class BeforehandOrderLogic extends BaseLogic $total_price = 0; $uid = $params['uid'] ?? 0; foreach ($params['product_arr'] as $k => $v) { + if($v['product_id']<=0){ + unset($params['product_arr'][$k]); + continue; + } + $datas[$k]['purchase'] = $v['purchase']; $datas[$k]['mark'] = $v['mark'] ?? ''; $datas[$k]['product_id'] = $v['product_id']; $datas[$k]['uid'] = $uid; + $datas[$k]['marques'] = $v['marques']; + $datas[$k]['store_info'] = $v['store_info']; + $datas[$k]['after_sales'] = $v['after_sales']; + $datas[$k]['loss'] = $v['loss']; + $datas[$k]['unit'] = $v['unit']; + $datas[$k]['gross_weight'] = $v['gross_weight']; + $datas[$k]['net_weight'] = $v['net_weight']; $datas[$k]['cart_num'] = $v['nums']; - $datas[$k]['price'] = $v['purchase']; + $datas[$k]['price'] = $v['price']; + $datas[$k]['package'] = $v['package']; $datas[$k]['total_price'] = $v['total_price']; $datas[$k]['create_time'] = time(); $datas[$k]['update_time'] = time(); @@ -84,9 +97,22 @@ class BeforehandOrderLogic extends BaseLogic 'arrival_time' => strtotime($params['arrival_time']), 'order_type' => $order_type ]); + $product_arr=[]; foreach ($datas as $k => $v) { $datas[$k]['bhoid'] = $order['id']; + + $data['id']=$v['product_id']; + $data['marques']=$v['marques']; + $data['store_info']=$v['store_info']; + $data['after_sales']=$v['after_sales']; + $data['package']=$v['package']; + $data['loss']=$v['loss']; + $data['gross_weight']=$v['gross_weight']; + $data['net_weight']=$v['net_weight']; + $data['mark']=$v['mark']; + $product_arr[]=$data; } + (new StoreProduct())->saveAll($product_arr); (new BeforehandOrderCartInfo())->saveAll($datas); Db::commit(); return true; @@ -335,7 +361,7 @@ class BeforehandOrderLogic extends BaseLogic 'admin_id' => $admin_id, 'total_price' => $arr['total_price'], 'price' => $arr['price'], - 'purchase' => $arr['price'], + 'purchase' => $arr['purchase'], 'oid' => $res['id'], 'code' => $res['code'], ]; diff --git a/app/admin/logic/store_extract/StoreExtractLogic.php b/app/admin/logic/store_extract/StoreExtractLogic.php index 70b5a4622..4d3150f43 100644 --- a/app/admin/logic/store_extract/StoreExtractLogic.php +++ b/app/admin/logic/store_extract/StoreExtractLogic.php @@ -40,6 +40,25 @@ class StoreExtractLogic extends BaseLogic throw new BusinessException($e->getMessage()); } } + /** + * @notes 确认提现 + * @param array $params + * @return bool + * @author admin + * @date 2024/05/31 17:09 + */ + public static function Enter(array $params): bool + { + Db::startTrans(); + try { + StoreExtract::update(['status'=>1,'pay_status'=>1],['id'=>$params['id']]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } /** diff --git a/app/admin/logic/store_product/StoreProductLogic.php b/app/admin/logic/store_product/StoreProductLogic.php index fddb50f2e..c109eaee2 100644 --- a/app/admin/logic/store_product/StoreProductLogic.php +++ b/app/admin/logic/store_product/StoreProductLogic.php @@ -11,6 +11,7 @@ use app\common\model\store_branch_product_exchange\StoreBranchProductExchange; use app\common\model\store_category\StoreCategory; use app\common\model\store_product_attr_value\StoreProductAttrValue; use app\common\model\store_product_cate\StoreProductCate; +use app\common\model\store_product_unit\StoreProductUnit; use app\common\model\system_store\SystemStore; use app\common\model\system_store_storage\SystemStoreStorage; use Illuminate\Support\Facades\Log; @@ -288,18 +289,10 @@ class StoreProductLogic extends BaseLogic public static function detail($params): array { $data = StoreProduct::where('id', $params['id'])->findOrEmpty()->toArray(); - if ($data) { - $data['cate_arr'] = []; - $id_1 = StoreCategory::where('id', $data['cate_id'])->value('pid'); - if ($id_1) { - $id_2 = StoreCategory::where('id', $id_1)->value('pid'); - if ($id_2 == 0) { - $data['cate_arr'] = [$id_1, $data['cate_id']]; - } else { - $data['cate_arr'] = [$id_2, $id_1, $data['cate_id']]; - } - } + if(empty($data)){ + throw new BusinessException('商品不存在'); } + $data['unit_name']=StoreProductUnit::where('id', $data['unit'])->value('name'); return $data; } diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index f28c21255..f4c5afff4 100644 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -17,6 +17,7 @@ use app\common\enum\OrderEnum; use app\common\enum\user\UserTerminalEnum; use app\common\enum\YesNoEnum; use app\common\logic\BaseLogic; +use app\common\logic\CapitalFlowLogic; use app\common\model\finance\CapitalFlow; use app\common\model\store_finance_flow\StoreFinanceFlow; use app\common\model\store_order\StoreOrder; @@ -57,7 +58,7 @@ class UserLogic extends BaseLogic Db::startTrans(); try { - $res=User::create([ + $res = User::create([ 'avatar' => $avatar, 'real_name' => $params['real_name'], 'nickname' => $params['nickname'], @@ -78,21 +79,21 @@ class UserLogic extends BaseLogic public static function checkAddress(array $params) { - $user_ship=$params['user_ship']??0; - if($user_ship==2){ - if(!isset($params['village'])){ + $user_ship = $params['user_ship'] ?? 0; + if ($user_ship == 2) { + if (!isset($params['village'])) { throw new BusinessException('请设置村参数'); } - $arr=User::where('user_ship',$user_ship)->alias('user')->join('user_address address','user.id=address.uid and village='.$params['village'])->find(); + $arr = User::where('user_ship', $user_ship)->alias('user')->join('user_address address', 'user.id=address.uid and village=' . $params['village'])->find(); if ($arr) { throw new BusinessException('该区域已有村长请重新选择'); } - }elseif($user_ship==3){ - if(!isset($params['brigade'])){ + } elseif ($user_ship == 3) { + if (!isset($params['brigade'])) { throw new BusinessException('请设置队参数'); } - $arr=User::where('user_ship',$user_ship)->alias('user')->join('user_address address','user.id=address.uid and village='.$params['village'] .' and brigade='.$params['brigade'])->find(); - if($arr){ + $arr = User::where('user_ship', $user_ship)->alias('user')->join('user_address address', 'user.id=address.uid and village=' . $params['village'] . ' and brigade=' . $params['brigade'])->find(); + if ($arr) { throw new BusinessException('该区域已有队长请重新选择'); } } @@ -107,37 +108,37 @@ class UserLogic extends BaseLogic $avatar = !empty($params['avatar']) ? FileService::setFileUrl($params['avatar']) : $defaultAvatar; Db::startTrans(); try { - $data=[ + $data = [ 'avatar' => $avatar, - 'real_name' => $params['real_name']??"", - 'nickname' => '用户'.time(), + 'real_name' => $params['real_name'] ?? "", + 'nickname' => '用户' . time(), 'account' => $params['mobile'], 'password' => $password, 'mobile' => $params['mobile'], - 'label_id' => $params['label_id']??0, - 'store_id' => $params['store_id']??0, + 'label_id' => $params['label_id'] ?? 0, + 'store_id' => $params['store_id'] ?? 0, ]; - if(isset($params['user_ship']) &&$params['user_ship']==4){ - $data['user_ship']=4; + if (isset($params['user_ship']) && $params['user_ship'] == 4) { + $data['user_ship'] = 4; } - $res=User::create($data); + $res = User::create($data); UserCreateLog::create([ 'uid' => $res['id'], - 'create_uid' => $params['create_uid']??0, - 'store_id' => $params['store_id']??0, - 'staff_id' => $params['staff_id']??0, - 'user_ship' => $data['user_ship']??0, + 'create_uid' => $params['create_uid'] ?? 0, + 'store_id' => $params['store_id'] ?? 0, + 'staff_id' => $params['staff_id'] ?? 0, + 'user_ship' => $data['user_ship'] ?? 0, ]); UserAddress::create([ 'uid' => $res['id'], - 'real_name' => $params['real_name']??"", - 'mobile' => $params['mobile']??'', - 'province' => $params['province']??'', - 'city' => $params['city']??'', - 'area' => $params['area']??'', - 'street' => $params['street']??'', - 'village' => $params['village']??'', - 'brigade' => $params['brigade']??'', + 'real_name' => $params['real_name'] ?? "", + 'mobile' => $params['mobile'] ?? '', + 'province' => $params['province'] ?? '', + 'city' => $params['city'] ?? '', + 'area' => $params['area'] ?? '', + 'street' => $params['street'] ?? '', + 'village' => $params['village'] ?? '', + 'brigade' => $params['brigade'] ?? '', 'is_default' => 1, ]); Db::commit(); @@ -167,7 +168,7 @@ class UserLogic extends BaseLogic // 'mobile' => $params['mobile'] ?? '', // 'sex' => $params['sex'] ?? 0, // 'is_disable' => $params['is_disable'] ?? 0, - 'label_id'=>$params['label_id'] + 'label_id' => $params['label_id'] ]); Db::commit(); @@ -188,8 +189,21 @@ class UserLogic extends BaseLogic public static function detail(int $userId): array { $field = [ - 'id', 'account', 'nickname', 'avatar', 'real_name','integral','label_id','user_ship', - 'sex', 'mobile', 'create_time', 'login_time', 'channel','now_money','purchase_funds' + 'id', + 'account', + 'nickname', + 'avatar', + 'real_name', + 'integral', + 'label_id', + 'user_ship', + 'sex', + 'mobile', + 'create_time', + 'login_time', + 'channel', + 'now_money', + 'purchase_funds' ]; $user = User::where(['id' => $userId])->field($field) @@ -197,8 +211,8 @@ class UserLogic extends BaseLogic $user['channel'] = UserTerminalEnum::getTermInalDesc($user['channel']); $user->sex = $user->getData('sex'); - $user['number']=StoreFinanceFlow::where('other_uid',$userId)->where(['status'=>0,'financial_pm'=>1,'type'=>1])->sum('number'); - $user['user_ship_name']=$user->user_ship>0?UserShip::where('id',$user->user_ship)->value('title'):"一般用户"; + $user['number'] = StoreFinanceFlow::where('other_uid', $userId)->where(['status' => 0, 'financial_pm' => 1, 'type' => 1])->sum('number'); + $user['user_ship_name'] = $user->user_ship > 0 ? UserShip::where('id', $user->user_ship)->value('title') : "一般用户"; return $user->toArray(); } @@ -218,66 +232,116 @@ class UserLogic extends BaseLogic ]); } + /** + * 更新采购款 + */ + public static function PurchaseFunds(array $params) + { + $find = User::where(['id' => $params['id']])->find(); + Db::startTrans(); + try { + $capitalFlowDao = new CapitalFlowLogic($find, 'user'); + if ($params['type'] == 1) { + $capitalFlowDao->userIncome('system_purchase_add', 'system', 0, $params['purchase_funds'],'',1); + $find->purchase_funds = bcadd($params['purchase_funds'], $find['purchase_funds'], 2); + $find->save(); + } else { + $capitalFlowDao->userExpense('system_purchase_dec', 'system', 0, $params['purchase_funds']); + $find->purchase_funds = bcsub($params['purchase_funds'], $find['purchase_funds'], 2); + $find->save(); + } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } + /** + * 更新余额 + */ + public static function nowMoney(array $params) + { + $find = User::where(['id' => $params['id']])->find(); + Db::startTrans(); + try { + $capitalFlowDao = new CapitalFlowLogic($find, 'user'); + if ($params['type'] == 1) { + $capitalFlowDao->userIncome('system_balance_add', 'system', 0, $params['now_money'],); + $find->now_money = bcadd($params['now_money'], $find['now_money'], 2); + $find->save(); + } else { + $capitalFlowDao->userExpense('system_balance_reduce', 'system', 0, $params['now_money']); + $find->now_money = bcsub($params['now_money'], $find['now_money'], 2); + $find->save(); + } + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + throw new BusinessException($e->getMessage()); + } + } public static function dealDetails($params) { - switch ($params['type']){ + switch ($params['type']) { case 1: //采购款明细 - $categories = ['user_balance_recharge', 'user_order_purchase_pay','system_purchase_add','user_balance_recharge_refund']; + $categories = ['user_balance_recharge', 'user_order_purchase_pay', 'system_purchase_add', 'user_balance_recharge_refund']; $query = CapitalFlow::where('uid', $params['id']) ->whereIn('category', $categories); $count = $query->count(); $data = $query - ->page($params['page_no'],$params['page_size']) - ->order('id','desc') + ->page($params['page_no'], $params['page_size']) + ->order('id', 'desc') ->select()->toArray(); - foreach ($data as &$value){ - if($value['category'] == 'user_order_purchase_pay'){ - $value['order_sn'] = StoreOrder::where('id',$value['link_id'])->value('order_id'); - }elseif($value['category'] == 'user_balance_recharge'){ - $value['order_sn'] = UserRecharge::where('id',$value['link_id'])->value('order_id'); + foreach ($data as &$value) { + if ($value['category'] == 'user_order_purchase_pay') { + $value['order_sn'] = StoreOrder::where('id', $value['link_id'])->value('order_id'); + } elseif ($value['category'] == 'user_balance_recharge') { + $value['order_sn'] = UserRecharge::where('id', $value['link_id'])->value('order_id'); } } break; case 2: //余额明细 - $category = ['system_balance_add','user_order_balance_pay']; + $category = ['system_balance_add', 'user_order_balance_pay']; $query = CapitalFlow::where('uid', $params['id']) ->whereIn('category', $category); $count = $query->count(); $data = $query - ->page($params['page_no'],$params['page_size']) - ->order('id','desc') + ->page($params['page_no'], $params['page_size']) + ->order('id', 'desc') ->select()->toArray(); - foreach ($data as &$value){ - $value['order_sn'] = StoreOrder::where('id',$value['link_id'])->value('order_id'); + foreach ($data as &$value) { + $value['order_sn'] = StoreOrder::where('id', $value['link_id'])->value('order_id'); } break; case 3: //礼品券明细 - $query = UserSign::where(['uid'=>$params['id']]); + $query = UserSign::where(['uid' => $params['id']]); $count = $query->count(); - $data =$query - ->page($params['page_no'],$params['page_size']) - ->order('id','desc') + $data = $query + ->page($params['page_no'], $params['page_size']) + ->order('id', 'desc') ->select()->toArray(); break; case 4: //返还金明细 -todo back - $query = VipFlow::with('store')->where(['user_id'=>$params['id']]); + $query = VipFlow::with('store')->where(['user_id' => $params['id']]); $count = $query->count(); $data = $query - ->page($params['page_no'],$params['page_size']) - ->order('id','desc') + ->page($params['page_no'], $params['page_size']) + ->order('id', 'desc') ->select()->toArray(); - foreach ($data as &$value){ - if($value['status'] == 0){ - $value['title'] = "购买商品".$value['all']."元获得".$value['number']."元返还金"; - }else{ + foreach ($data as &$value) { + if ($value['status'] == 0) { + $value['title'] = "购买商品" . $value['all'] . "元获得" . $value['number'] . "元返还金"; + } else { //退回到余额、微信、采购款 $back = self::dealTitleCate($value['pay_type']); - $value['title'] = "返还金解冻".$value['number']."元退回到".$back; + $value['title'] = "返还金解冻" . $value['number'] . "元退回到" . $back; } } break; @@ -289,27 +353,24 @@ class UserLogic extends BaseLogic 'lists' => $data, 'count' => $count ]; - - } - public static function giftList($uid,$params) + public static function giftList($uid, $params) { - $query = StoreProductGift::with(['store','user','goodsName'])->where('uid',$uid); + $query = StoreProductGift::with(['store', 'user', 'goodsName'])->where('uid', $uid); $count = $query->count(); - $list = $query->page($params['page_no'],$params['page_size']) - ->order('id','desc') + $list = $query->page($params['page_no'], $params['page_size']) + ->order('id', 'desc') ->select()->toArray(); return [ 'lists' => $list, 'count' => $count ]; - } public static function dealTitleCate($pay_type) { - switch ($pay_type){ + switch ($pay_type) { case 18: $title = "采购款"; break; @@ -317,17 +378,17 @@ class UserLogic extends BaseLogic $title = "现金"; break; case 3: - $title ="余额"; + $title = "余额"; break; case 7: case 9: - $title ="微信"; + $title = "微信"; break; case 13: - $title ="支付宝"; + $title = "支付宝"; break; default: - $title ="默认"; + $title = "默认"; } return $title; } diff --git a/app/admin/logic/warehouse_product/WarehouseProductLogic.php b/app/admin/logic/warehouse_product/WarehouseProductLogic.php index e528840ed..99376e77e 100644 --- a/app/admin/logic/warehouse_product/WarehouseProductLogic.php +++ b/app/admin/logic/warehouse_product/WarehouseProductLogic.php @@ -154,8 +154,9 @@ class WarehouseProductLogic extends BaseLogic 'nums' => $params['nums'], 'before_nums' => $storege['nums'], 'after_nums' => $after_nums, - 'purchase' => $params['purchase'] ?? '', - 'total_price' => $params['total_price'] ?? '', + 'price' => $params['price'] ?? 0, + 'purchase' => $params['purchase'] ?? 0, + 'total_price' => $params['total_price'] ?? 0, 'admin_id' => $params['admin_id'], 'code' => $params['code'] ?? '', 'status' => 1, diff --git a/app/common/logic/CapitalFlowLogic.php b/app/common/logic/CapitalFlowLogic.php index bd4e7c410..2ecc3e446 100644 --- a/app/common/logic/CapitalFlowLogic.php +++ b/app/common/logic/CapitalFlowLogic.php @@ -80,8 +80,8 @@ class CapitalFlowLogic extends BaseLogic $model->before_balance = bcadd($this->user['now_money'], $amount, 2); $model->balance = $this->user['now_money']; } else { - $model->before_balance = $this->user['now_money']; - $model->balance = $this->user['now_money']; + $model->before_balance = $this->user['purchase_funds']; + $model->balance = bcsub($this->user['purchase_funds'], $amount, 2); } $model->create_time = date('Y-m-d H:i:s'); $model->type = 'out'; @@ -176,6 +176,8 @@ class CapitalFlowLogic extends BaseLogic return "系统增加余额{$amount}元"; case 'system_purchase_add': return "系统增加采购款{$amount}元"; + case 'system_purchase_dec': + return "系统减少采购款{$amount}元"; case 'system_balance_reduce': return "系统减少余额{$amount}元"; case 'user_balance_recharge_refund': diff --git a/app/common/model/OperationLog.php b/app/common/model/OperationLog.php index 2cfe5164e..ff67252ff 100644 --- a/app/common/model/OperationLog.php +++ b/app/common/model/OperationLog.php @@ -6,4 +6,6 @@ namespace app\common\model; class OperationLog extends BaseModel { + // protected $json = ['params']; + } \ No newline at end of file diff --git a/public/apidoc-ui.zip b/public/apidoc-ui.zip deleted file mode 100644 index 3032a96f3..000000000 Binary files a/public/apidoc-ui.zip and /dev/null differ