Skip to content

Z
zptz-sass-kelaidian
提交 b14fb582 authored 作者: 窦斌's avatar 窦斌
浏览文件
操作

Merge branch 'master' of http://gitlab.bluearp.com/ldj/zptz-sass-kelaidian

上级 23fa6c28 aa81d556
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 1017 行增加 和 20 行删除
app/Http/Controllers/Api/MobileWeb/AftersaleOrderController.php 0 → 100644
浏览文件 @ b14fb582
<?php
namespace App\Http\Controllers\Api\MobileWeb;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Http\Requests\Validators\Api\MobileWeb\AftersaleOrderValidator;
use BlueCity\Core\Inc\ErrorInc;
use App\Services\Api\MobileWeb\AftersaleOrderService;
use App\Services\DealPicService;
// 移动端-售后单
class AftersaleOrderController extends Controller
{
// 列表每页显示数据个数
protected $show_count = 10;
public function __construct()
{
$this->dataValidator = new AftersaleOrderValidator();
}
/**
* 售后列表
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
* @return [type] [description]
*/
public function index(Request $request) {
// 验证数据
$error_message = $this->dataValidator->indexValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$return_data = AftersaleOrderService::index($request->all(), $this->show_count,1);
return response()->json($return_data);
}
/**
* 售后立即处理
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
* @return [type] [description]
*/
public function handle_ive(Request $request) {
// 验证数据
$error_message = $this->dataValidator->handle_iveValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$data = $request->all();
$data['ip'] = $request->ip();
$return_data = AftersaleOrderService::handle_ive($data);
return response()->json($return_data);
}
/**
* 日常反馈
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
* @return [type] [description]
*/
public function dailyFeedback(Request $request) {
// 验证数据
$error_message = $this->dataValidator->dailyFeedbackValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$data = $request->all();
$data['ip'] = $request->ip();
$return_data = AftersaleOrderService::dailyFeedback($data);
return response()->json($return_data);
}
/**
* 申请完成
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
* @return [type] [description]
*/
public function quality (Request $request) {
// 验证数据
$error_message = $this->dataValidator->dailyFeedbackValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$data = $request->all();
$data['ip'] = $request->ip();
$return_data = AftersaleOrderService::quality($data);
return response()->json($return_data);
}
/**
* 上传图片
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
*/
public function upload(Request $request)
{
$session = $request['session'];
// if (empty($request['file'])) {
// return response()->json(['ErrorCode' => 2, 'ErrorMessage' => '请上传文件', 'Data' => []]);
// }
$request['path'] = './afterSale/'.date('Ym');
$return_data = DealPicService::upload($request);
if ($return_data['code'] == 200) {
return response()->json(['ErrorCode' => 1, 'ErrorMessage' => '上传成功', 'Data' => $return_data['data']]);
} else {
return response()->json(['ErrorCode' => 2, 'ErrorMessage' => $return_data['msg'], 'Data' => '']);
}
}
/**
* 详情
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
* @return [type] [description]
*/
public function info (Request $request) {
// 验证数据
$error_message = $this->dataValidator->infoValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$data = $request->all();
$data['ip'] = $request->ip();
$return_data = AftersaleOrderService::info($data);
return response()->json($return_data);
}
}
app/Http/Controllers/Api/MobileWeb/StatementsListController.php 0 → 100644
浏览文件 @ b14fb582
<?php
namespace App\Http\Controllers\Api\MobileWeb;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Http\Requests\Validators\Api\MobileWeb\StatementsListValidator;
use BlueCity\Core\Inc\ErrorInc;
use App\Services\Api\MobileWeb\StatementsListService;
use App\Services\DealPicService;
// 移动端-账单
class StatementsListController extends Controller
{
// 列表每页显示数据个数
protected $show_count = 10;
public function __construct()
{
$this->dataValidator = new StatementsListValidator();
}
/**
* 售后列表
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
* @return [type] [description]
*/
public function index(Request $request) {
// 验证数据
$error_message = $this->dataValidator->indexValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$return_data = StatementsListService::index($request->all(), $this->show_count,1);
return response()->json($return_data);
}
/**
* 售后立即处理
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
* @return [type] [description]
*/
public function handle_ive(Request $request) {
// 验证数据
$error_message = $this->dataValidator->handle_iveValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$data = $request->all();
$data['ip'] = $request->ip();
$return_data = AftersaleOrderService::handle_ive($data);
return response()->json($return_data);
}
/**
* 日常反馈
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
* @return [type] [description]
*/
public function dailyFeedback(Request $request) {
// 验证数据
$error_message = $this->dataValidator->dailyFeedbackValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$data = $request->all();
$data['ip'] = $request->ip();
$return_data = AftersaleOrderService::dailyFeedback($data);
return response()->json($return_data);
}
/**
* 申请完成
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
* @return [type] [description]
*/
public function quality (Request $request) {
// 验证数据
$error_message = $this->dataValidator->dailyFeedbackValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$data = $request->all();
$data['ip'] = $request->ip();
$return_data = AftersaleOrderService::quality($data);
return response()->json($return_data);
}
/**
* 上传图片
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
*/
public function upload(Request $request)
{
$session = $request['session'];
// if (empty($request['file'])) {
// return response()->json(['ErrorCode' => 2, 'ErrorMessage' => '请上传文件', 'Data' => []]);
// }
$request['path'] = './afterSale/'.date('Ym');
$return_data = DealPicService::upload($request);
if ($return_data['code'] == 200) {
return response()->json(['ErrorCode' => 1, 'ErrorMessage' => '上传成功', 'Data' => $return_data['data']]);
} else {
return response()->json(['ErrorCode' => 2, 'ErrorMessage' => $return_data['msg'], 'Data' => '']);
}
}
/**
* 详情
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-12
* @param Request $request [description]
* @return [type] [description]
*/
public function info (Request $request) {
// 验证数据
$error_message = $this->dataValidator->infoValidator($request->all());
if ($error_message) {
return response()->json(['ErrorCode'=>ErrorInc::INVALID_PARAM, 'ErrorMessage'=>$error_message->first(), 'Data'=>[$error_message]]);
}
$data = $request->all();
$data['ip'] = $request->ip();
$return_data = AftersaleOrderService::info($data);
return response()->json($return_data);
}
}
app/Http/Controllers/DatasBase/TipsController.php
浏览文件 @ b14fb582
......@@ -25,10 +25,11 @@ class TipsController extends BaseController
*/
public function index(Request $request){
if($admin_pt_id = $request->get('session_token')['admin_groupnew'] == 2){
$orderList = OrderList::where('stauas',20)->where('ser_id',$request->get('session_token')['id'])->count();
$orderList = OrderList::where('stauas',20)->where('ser_id',$request->get('session_token')['id'])->get();
if(!empty($orderList)) {
$list[0]['msg'] = "您有新工单未领取";
$list[0]['count'] = $orderList;
$list[0]['count'] = count($orderList);
$list[0]['orderList'] = $orderList;
$list[0]['url'] = 'Ordersystem/OrderList';
}else{
$list = [];
......
app/Http/Controllers/Orders/OrderListController.php
浏览文件 @ b14fb582
......@@ -51,6 +51,8 @@ use App\Services\SettlementThreeService;
use App\Services\SysStoresService;
use App\Services\TicketListService;
use App\Services\UserService;
use App\Services\OrderDeductionFeeService;
use App\Services\WarehouseService;
use BlueCity\Core\Inc\ErrorInc;
use BlueCity\Data\Service\ZhiPei\OrderService as zhiPeiOrder;
use DB;
......@@ -148,8 +150,16 @@ class OrderListController extends BaseController
//$ansql = "p_id in (".$session_token['admin_pt_id'].")";
}
if($session_token['admin_groupnew']!=7){
$where .= ' and company_id='.$session_token['company_id'];
// if($session_token['admin_groupnew']!=7){
// $where .= ' and company_id='.$session_token['company_id'];
// }
if (!in_array($session_token['admin_groupnew'], [2,3,7])){//管理员可以看全部
$where.=" and company_id='".$session_token['company_id']."'";
}
if ($session_token['admin_groupnew'] == 3) {
$where.=" and agency_id='".$session_token['company_id']."'";
// $where['gone_order_list.agency_id'] = $session['company_id'];
}
//统计数量
......@@ -1725,7 +1735,7 @@ class OrderListController extends BaseController
$orderListArr = OrderListService::getOrderListByID($id);
if(!$orderListArr){
return $this->error('无此定单', ErrorInc::MYSQL_FAILED, []);exit;
return $this->error('无此订单', ErrorInc::MYSQL_FAILED, []);exit;
}
$goodid = OrderMsg::where('id',$orderListArr['order_goods_id'])->value('goods_id');
......@@ -1821,7 +1831,36 @@ class OrderListController extends BaseController
exit;
}
}
// 扣费
$post_data['adm_id'] = $orderListArr['admin_id'];
$post_data['company_id'] = $orderListArr['company_id'];
$post_data['order_number'] = $orderListArr['sys_num'];
$post_data['reo_price'] = -0.5;
$reduce_price = OrderDeductionFeeService::deductFee($post_data);
// 扣库存
$ware_id = DB::table('warehouse')
->where('company_id', $orderListArr['agency_id'])
->value('id');
if (empty($ware_id)) {
// 新增默认仓库
$add_ware['shck_ckmc'] = '默认仓库';
$add_ware['company_id'] = $company_id;
$ware_id = DB::table('warehouse')->insertGetId($add_ware);
}
$warehouse_data['ware_id'] = $ware_id;
$warehouse_data['sys_num'] = $orderListArr['sys_num'];
$warehouse_data['serial_number'] = $orderListArr['serial_number'];
$find_goods_data = DB::table('order_msg')
->where('id', $orderListArr['order_goods_id'])
->get();
if ($find_goods_data) {
foreach ($find_goods_data as $key => $value) {
$goods_data[$key]['goods_num'] = 0-$value['goods_num'];
$goods_data[$key]['goods_id'] = $value['goods_id'];
}
$warehouse_data['goods_data'] = $goods_data;
$reduce_wago_res = WarehouseService::chargeWareGoodsNum($warehouse_data);
}
if ($request->input('fahuo_type')==1 || $request->input('stats1')==1){
Management::where('trace_code',$orderListArr['serial_number'])->update($info);// 追溯
$ret = $this->feedbackOne($orderListArr, $input, $admin_acc, $company);
......
app/Http/Controllers/Service/PayController.php
浏览文件 @ b14fb582
......@@ -265,6 +265,18 @@ class PayController extends BaseController
$notify_url = 'http://jdh.bluearp.com/index.php/api/service/Pay/notify';
$timestamp = time();
$wepay_res = WashPayservice::createJsBizPackage($total_fee, $out_trade_no, $body, $notify_url, $timestamp, $config);
// 新增在线支付记录
$were_add_data['were_company_id'] = $find_order['reo_company_id']; //所属公司id
$were_add_data['were_admin_id'] = $find_order['reo_adm_id']; //客户单位id，会员id
$were_add_data['were_type'] = 1;
$were_add_data['out_trade_no'] = $find_order['reo_order_number']; //商户订单号
$were_add_data['were_description'] = '充值-'.$find_order['reo_price'].'元'; //商品描述
$were_add_data['were_pay_total_money'] = $find_order['reo_price']; //支付总金额(单位分)
$were_add_data['were_pay_way'] = 1; //在线支付方式1微信小程序支付
$were_add_data['were_pay_type'] = 1; //在线支付类型1付款2退款
$were_add_data['were_create_time'] = date('Y-m-d H:i:s');
$were_add_data_res = DB::table('weixin_record')->insert($were_add_data);
return response()->json($wepay_res);
}
......@@ -353,6 +365,17 @@ class PayController extends BaseController
$result = $aliPay->aliPay();
$result = $result['alipay_trade_precreate_response'];
if($result['code'] && $result['code']=='10000'){
// 新增在线支付记录
$were_add_data['were_company_id'] = $find_order['reo_company_id']; //所属公司id
$were_add_data['were_admin_id'] = $find_order['reo_adm_id']; //客户单位id，会员id
$were_add_data['were_type'] = 1;
$were_add_data['out_trade_no'] = $find_order['reo_order_number']; //商户订单号
$were_add_data['were_description'] = '充值-'.$find_order['reo_price'].'元'; //商品描述
$were_add_data['were_pay_total_money'] = $find_order['reo_price']; //支付总金额(单位分)
$were_add_data['were_pay_way'] = 2; //在线支付方式1微信小程序支付
$were_add_data['were_pay_type'] = 1; //在线支付类型1付款2退款
$were_add_data['were_create_time'] = date('Y-m-d H:i:s');
$were_add_data_res = DB::table('weixin_record')->insert($were_add_data);
//这里处理你的业务逻辑，如生成订单
// return $result['qr_code'];//这里是支付宝返回的付款url，需要返回到页面生成二维码
return response()->json(['code'=>200, 'msg'=>'success', 'data'=>$result['qr_code']]);
......@@ -368,16 +391,19 @@ class PayController extends BaseController
CommonService::addLog('支付回调:', json_encode($data,true), 1, 'aliPayNotify');
if ($request['trade_status'] == 'TRADE_SUCCESS') {
$find_order = DB::table('recharge_order')
->where('reo_order_number', $postObj->out_trade_no)
->where('reo_order_number', $request['out_trade_no'])
->first();
if ($find_order->reo_pay_state == 1) {
if ($find_order['reo_pay_state'] == 1) {
echo "success"; //请不要修改或删除
die;
}
$update_were = DB::table('weixin_record')
->where('out_trade_no', $request['out_trade_no'])
->update(['were_pay_state'=>2,'were_transaction_id'=>$request['trade_no']]);
$update_order = DB::table('recharge_order')
->where('reo_order_number', $postObj->out_trade_no)
->update(['reo_pay_state'=>2,'reo_paid_money'=>$find_order->reo_price,'reo_pay_way'=>1,'reo_pay_check'=>1, 'reo_pay_time'=>date('Y-m-d H:i:s')]);
->where('reo_order_number', $request['out_trade_no'])
->update(['reo_pay_state'=>2,'reo_paid_money'=>$find_order['reo_price'],'reo_pay_way'=>2,'reo_pay_check'=>1, 'reo_pay_time'=>date('Y-m-d H:i:s')]);
$find_data = DB::table('admin_recharge')
->where('adre_company_id', $find_order['reo_company_id'])
->first();
......@@ -389,9 +415,8 @@ class PayController extends BaseController
}
$find_data['find_order'] = $find_order;
$find_data['shop_update'] = $shop_update;
$find_data['find_shop'] = $find_shop;
Common::write_log($find_data, 1, 'aliPayNotify1');
$find_data['update_order'] = $update_order;
CommonService::addLog('支付回调:', json_encode($find_data,true), 1, 'aliPayNotify');
echo "success"; //请不要修改或删除
} elseif($request['trade_status'] == 'TRADE_FINISHED') {
//判断该笔订单是否在商户网站中已经做过处理
......
app/Http/Controllers/Service/ServiceProviderController.php
浏览文件 @ b14fb582
......@@ -531,7 +531,7 @@ class ServiceProviderController extends BaseController
}
$session = $request->get('session_token');
//保存主要信息
$adminData = $request->only(['enable', 'company_name', 'is_lidao', 'admin_name', 'admin_acc', 'type','brand_service','service_type']);
$adminData = $request->only(['enable', 'company_name', 'is_lidao', 'admin_name', 'admin_acc', 'type','brand_service','service_type', 'admin_groupnew']);
$admin_acc = Admin::where("admin_acc",$adminData['admin_acc'])->where("company_id",$session['company_id'])->first();
if($admin_acc){
return $this->error('账户名已存在', ErrorInc::INVALID_PARAM);
......@@ -543,6 +543,23 @@ class ServiceProviderController extends BaseController
// $adminData = $request->only(array_keys($this->validateRules['rules']));
$adminData = $this->_setAdminData($adminData, $request);
$adminData['company_id'] = $session['company_id'];
if ($adminData['admin_groupnew'] == 3) {//经销商新增一个公司
$adminData['admin_groupnew'] = 3;
$com_data['com_type'] = 2;
$com_data['com_name'] = $data['service_name'];
$com_data['com_phone'] = $data['phone'];
$com_data['com_start_time'] = date('Y-m-d H:i:s');
$com_data['com_create_time'] = date('Y-m-d H:i:s');
$com_data['com_end_time'] = date('Y-m-d H:i:s', strtotime('+50 year'));
$com_data['com_admin_id'] = $session['id'];
$company_id = DB::table('company')->insertGetId($com_data);
$adminData['company_id'] = $company_id;
// 新增默认仓库
$add_ware['shck_ckmc'] = '默认仓库';
$add_ware['company_id'] = $company_id;
$ware_id = DB::table('warehouse')->insertGetId($add_ware);
}
$adminID = AdminService::insertData($adminData);
if ($adminID) {
//保存资料信息
......@@ -638,11 +655,10 @@ class ServiceProviderController extends BaseController
private function _setAdminData($adminData, Request $request)
{
$adminData['admin_password'] = md5($request->input('admin_password'));//密码
$adminData['admin_groupnew'] = $request->input('admin_groupnew',2);//服务商
$adminData['admin_groupnew'] = $request->input('admin_groupnew',2);//2服务商3经销商
$adminData['mouth_pay'] = $request->input('mouth_pay', 1);//结算状态
$adminData['unified'] = $request->input('unified', 1);//价格状态
$adminData['reward'] = $request->input('reward', 1);//奖惩设置
$adminData['admin_groupnew'] = 2;//服务商
$adminData['admin_group'] = 2;//旧版服务商
//经营品牌
......
app/Http/Controllers/Service/WarehouseController.php 0 → 100644
浏览文件 @ b14fb582
<?php
/**
* 支付管理
*/
namespace App\Http\Controllers\Service;
use App\Http\Controllers\BaseController;
use App\Http\Controllers\Common\CommonController;
use App\Services\WashPayservice;
use App\Services\PayService;
use BlueCity\Core\Inc\ErrorInc;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Input;
use Maatwebsite\Excel\Facades\Excel;
use BlueCity\Core\Sdk\MiscSapi;
use Illuminate\Support\Facades\DB;
use App\Services\CommonService;
use App\Models\Warehouse;
use App\Services\BmmcService;
class WarehouseController extends BaseController
{
public function __construct()
{
// $service = new ServiceProviderService();
$this->bootWithService($service);
}
/**
* 仓库列表
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-06
* @param Request $request [description]
* @return [type] [description]
*/
public function index(Request $request) {
$session = Request()->get('session_token');//用户信息
$Db = new Warehouse();
if($request->filled('shck_ckmc')){ //仓库名称
$shck_ckmc = $request->input('shck_ckmc');
$Db = $Db->where('shck_ckmc', 'like','%'.$shck_ckmc.'%');
}
$page_size = $request->input('page_size',10);
$page = $request->input('page',1);
if ($session['admin_groupnew'] != 7) {
$Db = $Db->where('company_id', $session['company_id']);
}
if($page<1){
$page = 1;
}
$paginate = $Db->orderBy('id','DESC')->paginate($page_size);
$list = self::dataToArray($paginate->items());
$all_button = BmmcService::whereButton($request->input('token'),$request->input('Pri_id'));
$data['button_top'] = $export['button_top']??[];//顶部按钮
$data['button_search'] = $export['button_search']??[];//搜索栏按钮
if (empty($list)) {
// 新增默认仓库
$add_ware['shck_ckmc'] = '默认仓库';
$add_ware['company_id'] = $session['company_id'];
$ware_id = DB::table('warehouse')->insertGetId($add_ware);
}
$paginate = $Db->orderBy('id','DESC')->paginate($page_size);
$list = self::dataToArray($paginate->items());
if($list){
foreach ($list as $k =>$v){
$list[$k]['ware_goods_num'] = DB::table('ware_goods')
->where('wago_ware_id', $v['id'])
->sum('wago_stock_num');
$button = ['wareGoods', 'addGoodsNum'];
$button = BmmcService::getListButton($button,$all_button);
$list[$k]['button_one'] = $button['button_one']??[];
$list[$k]['button_two'] = $button['button_two']??[];
$list[$k]['button_three'] = $button['button_three']??[];
}
$data['list'] = $list;
$data['page'] = [
'count' => $paginate->total(),
'page'=>$paginate->currentPage(),
'page_size'=>$page_size,
'allPage'=>$paginate->lastPage()
];
return $this->success('获取成功', $data);
}else{
return $this->error('暂无数据', ErrorInc::DATA_EMPTY,$data);
}
}
/**
* 增加库存
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-09
* @param Request $request [description]
*/
public function addGoodsNum(Request $request) {
if (empty($request['ware_id'])) {
return response()->json(['Data' =>'', 'ErrorMessage' => '请选择仓库', 'ErrorCode' => 2]);
}
if (empty($request['goods_id'])) {
return response()->json(['Data' =>'', 'ErrorMessage' => '请选择商品', 'ErrorCode' => 2]);
}
if (empty($request['goods_num'])) {
return response()->json(['Data' =>'', 'ErrorMessage' => '请选择数量', 'ErrorCode' => 2]);
}
$find_goods = DB::table('pj_goods')
->where('pg_id', $request['goods_id'])
->first();
if (empty($find_goods)) {
return response()->json(['Data' =>'', 'ErrorMessage' => '未查询到此商品', 'ErrorCode' => 2]);
}
if ($find_goods['is_delect'] == 2) {
return response()->json(['Data' =>'', 'ErrorMessage' => '此商品已停用', 'ErrorCode' => 2]);
}
$find_data = DB::table('ware_goods')
->where('wago_ware_id', $request['ware_id'])
->where('wago_goo_id', $request['goods_id'])
->first();
DB::beginTransaction();
if (empty($find_data)) {
$add_data['wago_company_id'] = $session['company_id'];
$add_data['wago_ware_id'] = $request['ware_id'];
$add_data['wago_goo_id'] = $request['goods_id'];
$add_data['wago_stock_num'] = $request['goods_num'];
$add_res = DB::table('ware_goods')->insertGetId($add_data);
} else {
$update['wago_stock_num'] = $find_data['wago_stock_num'] + $request['goods_num'];
$add_res = DB::table('ware_goods')
->where('wago_id', $find_data['wago_id'])
->update($update);
$add_res = $find_data['wago_id'];
}
$add_record['goio_ware_id'] = $request['ware_id'];
$add_record['goio_wago_id'] = $add_res;
$add_record['goio_goo_id'] = $request['goods_id'];
$add_record['goio_num'] = $request['goods_num'];
$add_record['goio_type'] = '增加库存';
$add_record_res = DB::table('goods_inout')->insert($add_record);
if ($add_res && $add_record_res) {
DB::commit();
return response()->json(['Data' =>'', 'ErrorMessage' => '成功', 'ErrorCode' => 1]);
} else {
DB::rollback();
return response()->json(['Data' =>'', 'ErrorMessage' => '失败', 'ErrorCode' => 2]);
}
}
/**
* 仓库商品列表
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-10
* @param Request $request [description]
* @return [type] [description]
*/
public function wareGoods(Request $request) {
$session = Request()->get('session_token');//用户信息
$page_size = $request->input('page_size',10);
$page = $request->input('page',1);
$paginate = DB::table('ware_goods')
->leftjoin('pj_goods','pg_id', '=', 'wago_goo_id')
->where('wago_ware_id', $request['ware_id'])
->select('ware_goods.*', 'pj_goods.pg_goodsname', 'brand_name', 'pg_series')
->paginate($page_size);
$list = $paginate->items();
if($list){
foreach ($list as $k =>$v){
$list[$k]['ware_goods_num'] = DB::table('ware_goods')
->where('wago_ware_id', $v['id'])
->sum('wago_stock_num');
$button = [];
$button = BmmcService::getListButton($button,$all_button);
$list[$k]['button_one'] = $button['button_one']??[];
$list[$k]['button_two'] = $button['button_two']??[];
$list[$k]['button_three'] = $button['button_three']??[];
}
$data['list'] = $list;
$data['page'] = [
'count' => $paginate->total(),
'page'=>$paginate->currentPage(),
'page_size'=>$page_size,
'allPage'=>$paginate->lastPage()
];
return $this->success('获取成功', $data);
}else{
return $this->error('暂无数据', ErrorInc::DATA_EMPTY,$data);
}
}
/**
* 出入库记录
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-11
* @param Request $request [description]
* @return [type] [description]
*/
public function wareGoodsRecord(Request $request) {
$session = Request()->get('session_token');//用户信息
$page_size = $request->input('page_size',10);
$page = $request->input('page',1);
$paginate = DB::table('goods_inout as g')
->leftjoin('pj_goods as p', 'p.pg_id', '=', 'g.goio_goo_id')
->leftjoin('warehouse as w', 'g.goio_ware_id', '=', 'w.id')
->leftjoin('company as c','c.com_id', '=', 'w.company_id')
->where('com_id', $session['company_id'])
->select('shck_ckmc', 'pg_goodsname', 'goio_num', 'goio_type', 'goio_sys_num', 'goio_serial_number', 'goio_old_num', 'goio_new_num')
->paginate($page_size);
$list = $paginate->items();
if($list){
foreach ($list as $k =>$v){
if (empty($v['goio_sys_num'])) {
$list[$k]['goio_sys_num'] = '--';
}
if (empty($v['goio_serial_number'])) {
$list[$k]['goio_serial_number'] = '--';
}
// $button = [];
// $button = BmmcService::getListButton($button,$all_button);
// $list[$k]['button_one'] = $button['button_one']??[];
// $list[$k]['button_two'] = $button['button_two']??[];
// $list[$k]['button_three'] = $button['button_three']??[];
}
$data['list'] = $list;
$data['page'] = [
'count' => $paginate->total(),
'page'=>$paginate->currentPage(),
'page_size'=>$page_size,
'allPage'=>$paginate->lastPage()
];
return $this->success('获取成功', $data);
}else{
return $this->error('暂无数据', ErrorInc::DATA_EMPTY,$data);
}
}
}
app/Models/RechargeOrder.php 0 → 100644
浏览文件 @ b14fb582
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class RechargeOrder extends Model
{
protected $table ='recharge_order';
protected $guarded = [];
public $timestamps=false;
}
app/Models/Warehouse.php 0 → 100644
浏览文件 @ b14fb582
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class Warehouse extends Model
{
protected $table ='warehouse';
protected $guarded = [];
public $timestamps=false;
}
app/Services/DealPicService.php
浏览文件 @ b14fb582
......@@ -46,7 +46,7 @@ class DealPicService extends Service{
// 上传的是视频
$path_type_name = 'video';//文件夹名
} else {
return ['code'=>500, 'msg'=>'不支持的上传类型', 'data'=>''];
return ['code'=>500, 'msg'=>'不支持的上传类型'.$client_file_type, 'data'=>''];
}
//定义文件名
......
app/Services/OrderDeductionFeeService.php 0 → 100644
浏览文件 @ b14fb582
<?php
/**
|--------------------------------------------------------------------------
* 订单扣费
|--------------------------------------------------------------------------
| 派单的时候扣运营商（开店铺的填写订单）的，完成的时候扣经销商（地区代理，施工）
*/
namespace App\Services;
use App\Factory\OrderFactory;
use App\Models\Admin;
use App\Models\AdminInfor;
use App\Models\AdminToken;
use App\Models\AdminCertificate;
use App\Models\Certification;
use App\Models\ScoresSend;
use BlueCity\Core\Service\Service;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\DB;
class OrderDeductionFeeService extends Service
{
public static $instance;
public $modelMain = null;
public function __construct()
{
if (!$this->modelMain) $this->modelMain = new Admin();
}
/**
* @return mixed
*/
public static function getInstance()
{
if (is_null(static::$instance)) {
static::$instance = new static;
}
return static::$instance;
}
/**
* 订单扣费
* @authors ldj
* @email 909490343@qq.com
* @date 2024-09-10
* @param [type] $data [description]
* @return [type] [description]
*/
public static function deductFee($data) {
$find_company_info = DB::table('company')
->where('com_id', $data['company_id'])
->first();
$find_balance = DB::table('admin_recharge')
->where('adre_company_id', $data['company_id'])
->first();
$add_dfee['reo_adm_id'] = $data['adm_id'];
$add_dfee['reo_company_id'] = $data['company_id'];
$add_dfee['reo_order_number'] = $data['order_number'];
$add_dfee['reo_price'] = $data['reo_price'];
$add_dfee['reo_pay_state'] = 1;
$add_dfee['reo_state'] = 1;
$add_dfee['reo_create_time'] = date('Y-m-d H:i:s');
$add_dfee['reo_pay_time'] = date('Y-m-d H:i:s');
$add_dfee['reo_pay_way'] = 1;
$add_dfee['reo_type'] = 2;
$add_dfee['reo_client_type'] = 2;
$update['adre_banlance'] = $find_balance['adre_banlance'] + $data['reo_price'];
if (($update['adre_banlance'] + $find_balance['adre_credit_limit']) <= 0) {
return ['code'=>500, 'msg'=>'余额不足，请充值'];
}
$add_res = DB::table('recharge_order')->insertGetId($add_dfee);
$update_res = DB::table('admin_recharge')
->where('adre_id', $find_balance['adre_id'])
->update($update);
if ($add_res && $update_res) {
return ['code'=>200, 'msg'=>'操作成功'];
}
}
/**
* 插入新的数据获取ID值
* @param array $adminData
*
* @return int $id
*/
public static function insertData(array $adminData) {
return Admin::insertGetId($adminData);
}
/**
* 插入新的数据获取ID值
* @param array $adminData
*
* @return int $id
*/
public static function insertAdminInfo(array $adminData) {
return AdminInfor::insertGetId($adminData);
}
/**
* 插入新的数据获取ID值
* @param array $scoresSend
*
* @return int $id
*/
public static function insertScoresSend(array $scoresSend) {
return ScoresSend::insertGetId($scoresSend);
}
/**
* 插入新的数据获取ID值
* @param array $scoresSend
*
* @return int $id
*/
public static function insertCertification(array $certification) {
return Certification::insertGetId($certification);
}
/**
* 获取订单列表
* @param array $params
* @param array $columns
* @return array|mixed
*/
public static function getAdmins($params, $columns = ['id', 'company_name'])
{
$db = new Admin();
return CommonService::getMysqlData($db, $params,$columns,['id'=>'desc']);
}
/**获取admin详细内容
*
* @param int $ID ID
*
* @return array|mixed
*/
public function getAdminByID($ID)
{
return Admin::where('id',$ID)->first();
}
/**获取admin详细内容
*
* @param $key
* @param $value
* @param $select
* @param string $type
*
* @return mixed
*/
public static function getAdminBy($key, $value, $select = [] , $type = 'get')
{
$db = new Admin();
if(in_array($key, ['id'])) {
$type = 'first';
}
if($type == 'first') {
if (count($select) == 1) {
$type = 'value';
}
}
$list = CommonService::getMysqlData($db,[$key=>$value],$select,[],$type);
return $list;
}
}
app/Services/OrderListService.php
浏览文件 @ b14fb582
......@@ -567,10 +567,12 @@ class OrderListService extends Service
}
// }
if ($session['admin_groupnew'] != 7){//管理员可以看全部
if (!in_array($session['admin_groupnew'], [2,3,7])){//管理员可以看全部
$where['gone_order_list.company_id'] = $session['company_id'];
}
if ($session['admin_groupnew'] == 3) {
$where['gone_order_list.agency_id'] = $session['company_id'];
}
$where = CommonService::jointWhere($where);
$page_size = $input['page_size']??10;
......
app/Services/PayService.php 0 → 100644
浏览文件 @ b14fb582
<?php
namespace App\Services;
use Illuminate\Database\Eloquent\Model;
use BlueCity\Core\Service\Service;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Redis;
use Illuminate\Support\Facades\DB;
use BlueCity\Core\Inc\ErrorInc;
use Illuminate\Support\Facades\Request;
use App\Models\Common;
class PayService extends Service
{
public static $instance;
public $modelMain = null;
public $mainValidator = null;
public function __construct()
{
$this->charset = 'utf8';
}
/**
* @return mixed
*/
public static function getInstance()
{
if (is_null(static::$instance)) {
static::$instance = new static;
}
return static::$instance;
}
protected $appId;
protected $notifyUrl;
protected $charset;
//私钥值
protected $rsaPrivateKey;
protected $totalFee;
protected $outTradeNo;
protected $orderName;
public function setAppid($appid)
{
$this->appId = $appid;
}
public function setNotifyUrl($notifyUrl)
{
$this->notifyUrl = $notifyUrl;
}
public function setRsaPrivateKey($saPrivateKey)
{
$this->rsaPrivateKey = $saPrivateKey;
}
public function setTotalFee($payAmount)
{
$this->totalFee = $payAmount;
}
public function setOutTradeNo($outTradeNo)
{
$this->outTradeNo = $outTradeNo;
}
public function setOrderName($orderName)
{
$this->orderName = $orderName;
}
/**
* 发起订单
* @return array
*/
public function aliPay()
{
//请求参数
$requestConfigs = array(
'out_trade_no'=>$this->outTradeNo,
'total_amount'=>$this->totalFee, //单位 元
'subject'=>$this->orderName, //订单标题
'timeout_express'=>'2h' //该笔订单允许的最晚付款时间，逾期将关闭交易。取值范围：1m～15d。m-分钟，h-小时，d-天，1c-当天（1c-当天的情况下，无论交易何时创建，都在0点关闭）。 该参数数值不接受小数点， 如 1.5h，可转换为 90m。
);
$commonConfigs = array(
//公共参数
'app_id' => $this->appId,
'method' => 'alipay.trade.precreate', //接口名称
'format' => 'JSON',
'charset'=>$this->charset,
'sign_type'=>'RSA2',
'timestamp'=>date('Y-m-d H:i:s'),
'version'=>'1.0',
'notify_url' => $this->notifyUrl,
'biz_content'=>json_encode($requestConfigs),
);
$commonConfigs["sign"] = $this->generateSign($commonConfigs, $commonConfigs['sign_type']);
//沙箱网关接口，正式版网关接口自行修改
$result = $this->curlPost('https://openapi.alipay.com/gateway.do',$commonConfigs);
return json_decode($result,true);
}
public function generateSign($params, $signType = "RSA") {
return $this->sign($this->getSignContent($params), $signType);
}
protected function sign($data, $signType = "RSA") {
$priKey=$this->rsaPrivateKey;
$res = "-----BEGIN RSA PRIVATE KEY-----\n" .
wordwrap($priKey, 64, "\n", true) .
"\n-----END RSA PRIVATE KEY-----";
($res) or die('您使用的私钥格式错误，请检查RSA私钥配置');
if ("RSA2" == $signType) {
openssl_sign($data, $sign, $res, version_compare(PHP_VERSION,'5.4.0', '<') ? SHA256 : OPENSSL_ALGO_SHA256); //OPENSSL_ALGO_SHA256是php5.4.8以上版本才支持
} else {
openssl_sign($data, $sign, $res);
}
$sign = base64_encode($sign);
return $sign;
}
/**
* 校验$value是否非空
* if not set ,return true;
* if is null , return true;
**/
protected function checkEmpty($value) {
if (!isset($value))
return true;
if ($value === null)
return true;
if (trim($value) === "")
return true;
return false;
}
public function getSignContent($params) {
ksort($params);
$stringToBeSigned = "";
$i = 0;
foreach ($params as $k => $v) {
if (false === $this->checkEmpty($v) && "@" != substr($v, 0, 1)) {
// 转换成目标字符集
$v = $this->characet($v, $this->charset);
if ($i == 0) {
$stringToBeSigned .= "$k" . "=" . "$v";
} else {
$stringToBeSigned .= "&" . "$k" . "=" . "$v";
}
$i++;
}
}
unset ($k, $v);
return $stringToBeSigned;
}
/**
* 转换字符集编码
* @param $data
* @param $targetCharset
* @return string
*/
function characet($data, $targetCharset) {
if (!empty($data)) {
$fileType = $this->charset;
if (strcasecmp($fileType, $targetCharset) != 0) {
$data = mb_convert_encoding($data, $targetCharset, $fileType);
//$data = iconv($fileType, $targetCharset.'//IGNORE', $data);
}
}
return $data;
}
public function curlPost($url = '', $postData = '', $options = array())
{
if (is_array($postData)) {
$postData = http_build_query($postData);
}
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_POSTFIELDS, $postData);
curl_setopt($ch, CURLOPT_TIMEOUT, 30); //设置cURL允许执行的最长秒数
if (!empty($options)) {
curl_setopt_array($ch, $options);
}
//https请求 不验证证书和host
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
$data = curl_exec($ch);
curl_close($ch);
return $data;
}
}
app/Services/WarehouseService.php 0 → 100644
浏览文件 @ b14fb582
差异被折叠。
routes/api.php
浏览文件 @ b14fb582
差异被折叠。
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论