Browse Source

Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/hainan

master
Lemon 4 years ago
parent
commit
b82ea135fc
  1. 10
      MySQL_change.sql
  2. 170
      app/AdminAgent/Controllers/IndustryOrderController.php
  3. 18
      app/AdminAgent/Controllers/IndustryProductController.php
  4. 213
      app/AdminAgent/Forms/IndustryProductBuy.php
  5. 1
      app/AdminAgent/routes.php
  6. 2
      app/AdminSupplier/Controllers/DiyFormController.php
  7. 25
      app/AdminSupplier/Controllers/IndustryOrderController.php
  8. 4
      app/AdminSupplier/Controllers/IndustryProductController.php
  9. 8
      app/Http/Controllers/IndustryProductWxpay.php
  10. 3
      app/Models/IndustryOrder.php
  11. 4
      ready.md
  12. 2
      resources/lang/zh_CN/industry-order.php

10
MySQL_change.sql

@ -304,10 +304,18 @@ ALTER TABLE `industry_orders`
ADD COLUMN `paid_money` DECIMAL(20,2) NOT NULL DEFAULT '0.00' COMMENT '已付款金额' AFTER `pay_type`, ADD COLUMN `paid_money` DECIMAL(20,2) NOT NULL DEFAULT '0.00' COMMENT '已付款金额' AFTER `pay_type`,
ADD COLUMN `prepay_price` DECIMAL(8,2) NOT NULL DEFAULT '0.00' COMMENT '下单时产品的订金/定金' AFTER `deleted_at`, ADD COLUMN `prepay_price` DECIMAL(8,2) NOT NULL DEFAULT '0.00' COMMENT '下单时产品的订金/定金' AFTER `deleted_at`,
ADD COLUMN `prepay_timeout` INT(11) NOT NULL DEFAULT '0' COMMENT '订金/定金支付超时时间,单位:分钟' AFTER `prepay_price`, ADD COLUMN `prepay_timeout` INT(11) NOT NULL DEFAULT '0' COMMENT '订金/定金支付超时时间,单位:分钟' AFTER `prepay_price`,
ADD COLUMN `single_price` DECIMAL(8,2) NOT NULL DEFAULT '0.00' COMMENT '下单时的单人头交易费' AFTER `prepay_timeout`;
ADD COLUMN `single_price` DECIMAL(8,2) NOT NULL DEFAULT '0.00' COMMENT '下单时的单人头交易费' AFTER `prepay_timeout`,
ADD COLUMN `info` JSON NULL DEFAULT NULL COMMENT '客户信息收集' AFTER `single_price`;
# 17:46 ‎2021/‎10/‎17 # 17:46 ‎2021/‎10/‎17
ALTER TABLE `products` ALTER TABLE `products`
ADD COLUMN `logitude` DECIMAL(20,14) NOT NULL DEFAULT 0 COMMENT '经度' AFTER `diy_form_id`, ADD COLUMN `logitude` DECIMAL(20,14) NOT NULL DEFAULT 0 COMMENT '经度' AFTER `diy_form_id`,
ADD COLUMN `latitude` DECIMAL(20,14) NOT NULL DEFAULT 0 COMMENT '纬度' AFTER `logitude`, ADD COLUMN `latitude` DECIMAL(20,14) NOT NULL DEFAULT 0 COMMENT '纬度' AFTER `logitude`,
ADD COLUMN `address` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '地址' AFTER `latitude`; ADD COLUMN `address` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '地址' AFTER `latitude`;
# 10:43 ‎2021/‎10/‎18
ALTER TABLE `industry_orders`
CHANGE COLUMN `trade_deposit` `trade_deposit` DECIMAL(20,2) NOT NULL DEFAULT '0.00' COMMENT '需要扣除的交易金' AFTER `prepay_timeout`;

170
app/AdminAgent/Controllers/IndustryOrderController.php

@ -2,19 +2,15 @@
namespace App\AdminAgent\Controllers; namespace App\AdminAgent\Controllers;
use App\AdminAgent\Renderable\SelectIndustryProductSpec;
use App\AdminAgent\Repositories\IndustryOrder; use App\AdminAgent\Repositories\IndustryOrder;
use App\Common\OrderStatus; use App\Common\OrderStatus;
use App\Common\PayType; use App\Common\PayType;
use App\Common\ProductStatus;
use App\Models\AdminSetting; use App\Models\AdminSetting;
use App\Models\IndustryProduct;
use App\Models\IndustryProductSpec;
use Dcat\Admin\Admin; use Dcat\Admin\Admin;
use Dcat\Admin\Form;
use Dcat\Admin\Grid; use Dcat\Admin\Grid;
use Dcat\Admin\Show; use Dcat\Admin\Show;
use Dcat\Admin\Http\Controllers\AdminController; use Dcat\Admin\Http\Controllers\AdminController;
use Dcat\Admin\Widgets\Table;
use EasyWeChat\Factory; use EasyWeChat\Factory;
use EasyWeChat\Kernel\Http\StreamResponse; use EasyWeChat\Kernel\Http\StreamResponse;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
@ -33,15 +29,37 @@ class IndustryOrderController extends AdminController
$grid->disableCreateButton(); $grid->disableCreateButton();
$grid->disableActions(); $grid->disableActions();
$grid->model()->where('agent_id', Admin::user()->id);
$grid->column('id')->sortable(); $grid->column('id')->sortable();
$grid->column('supplier.company_name', '供应商');
$grid->column('supplier.company_name', '供应商')->limit(10);
$grid->column('supplier.contact_phone', '供应商电话'); $grid->column('supplier.contact_phone', '供应商电话');
$grid->column('order_no')->limit(10); $grid->column('order_no')->limit(10);
$grid->column('num'); $grid->column('num');
$grid->column('price'); $grid->column('price');
$grid->column('name', '预留姓名'); $grid->column('name', '预留姓名');
$grid->column('mobile', '预留手机'); $grid->column('mobile', '预留手机');
$grid->column('title');
$grid->column('info', '客户信息')
->display('查看')
->modal('客户信息', function ($modal) {
$info = $this->info ?? [];
$info = array_map(function($v) {
if (isset($v['value'], $v['type'])) {
if ($v['type'] == 'image') {
if (is_array($v['value'])) {
return array_reduce($v['value'], fn($v2, $v3) => $v2 . '<img data-action="preview-img" src="' . $v3 . '" style="max-width:120px;max-height:200px;cursor:pointer" class="img img-thumbnail"> &nbsp;');
} else {
return '<img data-action="preview-img" src="' . $v['value'] . '" style="max-width:120px;max-height:200px;cursor:pointer" class="img img-thumbnail">';
}
} else {
return is_string($v['value']) ? $v['value'] : join(',', $v['value']);
}
}
return is_string($v) ? $v : json_encode($v);
}, $info);
return Table::make([], $info);
})->xl();
$grid->column('title')->limit(15);
$grid->column('picture')->image('', 80, 80); $grid->column('picture')->image('', 80, 80);
$grid->column('status') $grid->column('status')
->using(OrderStatus::array()) ->using(OrderStatus::array())
@ -49,7 +67,7 @@ class IndustryOrderController extends AdminController
->display(fn() => '<a class="btn btn-sm btn-primary" href="' . admin_url('industry_order/list', $this->id) . '">付款</a>') ->display(fn() => '<a class="btn btn-sm btn-primary" href="' . admin_url('industry_order/list', $this->id) . '">付款</a>')
->if(fn() => $this->status == OrderStatus::PAY_EARNEST) ->if(fn() => $this->status == OrderStatus::PAY_EARNEST)
->display(fn() => '<a class="btn btn-sm btn-primary" href="' . admin_url('industry_order/list', $this->id) . '">付尾款</a>'); ->display(fn() => '<a class="btn btn-sm btn-primary" href="' . admin_url('industry_order/list', $this->id) . '">付尾款</a>');
$grid->column('paid_at', '订单确认时间');
$grid->column('paid_at');
$grid->column('verify_qrcode', '核销二维码') $grid->column('verify_qrcode', '核销二维码')
->if(fn() => $this->verify_code) ->if(fn() => $this->verify_code)
->then(function ($column) { ->then(function ($column) {
@ -135,25 +153,33 @@ class IndustryOrderController extends AdminController
} else { } else {
$msg = $pay_config['return_msg'] ?? '获取支付信息失败'; $msg = $pay_config['return_msg'] ?? '获取支付信息失败';
} }
Admin::script("Dcat.swal.info('支付失败$msg', null);");
Admin::script("Dcat.swal.info('支付:$msg', null);");
} else { } else {
$status_text = $show->model()->status == OrderStatus::PAY_EARNEST ?
'\'当前状态:<b style="color:red;">'.OrderStatus::array()[$show->model()->status].'</b>\''
: 'null';
$back_url = admin_url('industry_order/list');
Admin::js('@qrcode'); Admin::js('@qrcode');
Admin::script(<<<JS Admin::script(<<<JS
Dcat.swal.info(null, null, {
Dcat.swal.info('<div id="qrcode" style="margin-top:1rem;"></div>', $status_text, {
type: null, type: null,
html: '<div id="qrcode" style="margin-top:1rem;"></div>',
imageWidth: 240, imageWidth: 240,
imageHeight: 240, imageHeight: 240,
animation: false, animation: false,
confirmButtonText: '我已支付,刷新页面',
confirmButtonText: '已支付,刷新',
showCancelButton: true,
cancelButtonText: '返回列表',
allowOutsideClick: false, allowOutsideClick: false,
allowEscapeKey: false, allowEscapeKey: false,
onOpen: function () { onOpen: function () {
$('#qrcode').qrcode({text:'{$pay_config['code_url']}', width:240, height:240}); $('#qrcode').qrcode({text:'{$pay_config['code_url']}', width:240, height:240});
},
onClose: function() {
window.location.reload();
} }
}).then((res) => {
if (res.dismiss === 'cancel') {
window.location.href = '$back_url';
} else {
window.location.reload();
}
}); });
JS JS
); );
@ -185,6 +211,8 @@ JS
//计算价格 //计算价格
if ($order->status == OrderStatus::PAY_EARNEST) { if ($order->status == OrderStatus::PAY_EARNEST) {
$price = $order->price - $order->paid_money; $price = $order->price - $order->paid_money;
} elseif (in_array($order->pay_type, [PayType::DEPOSIT_PAY, PayType::EARNEST_PAY])) {
$price = $order->prepay_price;
} else { } else {
$price = $order->price; $price = $order->price;
} }
@ -197,116 +225,4 @@ JS
'trade_type' => 'NATIVE', // 请对应换成你的支付方式对应的值类型 'trade_type' => 'NATIVE', // 请对应换成你的支付方式对应的值类型
]); ]);
} }
/**
* Make a form builder.
*
* @return Form
*/
protected function form()
{
$pid = request()->input('pid');
$industry = IndustryProduct::where([
['status', '=', ProductStatus::ON_SALE],
['stock', '>', 0],
])->find($pid);
return Form::make(new IndustryOrder(), function (Form $form) use ($industry) {
if (!$industry) {
Admin::exit('订单不允许编辑');
}
$form->selectTable('industry_product_spec_id', '选择产品规格')
->required()
->title('选择产品规格')
->dialogWidth('80%;min-width:825px;')
->from(SelectIndustryProductSpec::make(['industry_product_id' => request()->input('pid')]))
->model(IndustryProductSpec::class);
$form->hidden('pid')->value($industry->id); //pid要跟上面的request中的一样,否则提交出错
$form->number('num')
->min($industry->min_sale)->required()
->default($industry->min_sale);
$form->text('name')->default(Admin::user()->director)->required();
$form->mobile('mobile')->default(Admin::user()->contact_phone)->required();
$pay_type = [PayType::ONLINE, PayType::OFFLINE];
if ($industry->deposit) { //订金支付
$pay_type = [...$pay_type, PayType::DEPOSIT_PAY];
}
if ($industry->earnest) { //定金支付
$pay_type = [...$pay_type, PayType::EARNEST_PAY];
}
$options = array_filter(PayType::array(), fn($k) => in_array($k, $pay_type), ARRAY_FILTER_USE_KEY);
$form->select('pay_type')->options($options)->default(PayType::ONLINE)->required();
$form->divider();
$form->text('', '购买产品')->default($industry->title)->disable();
$form->text('', '单价')->default($industry->price)->disable();
$form->text('', '库存')->default($industry->stock)->disable();
$form->text('', '起购数量')->default($industry->min_sale)->disable();
$form->image('picture', '产品图')->default($industry->pictures)->disable();
$form->display('', '旅游须知')->default(fn() => preg_replace('/<script.*?>.*?<\/script>/is', '', $industry->know))->disable();
$form->display('', '产品详情')->default(fn() => preg_replace('/<script.*?>.*?<\/script>/is', '', $industry->content))->disable();
})->saving(function (Form $form) use ($industry) {
//禁止编辑
if ($form->isEditing()) {
return $form->response()->error('操作禁止');
}
//判断最小起购数
if ($form->num < $industry->min_sale) {
return $form->response()->error('购买数量不能小于最低起购数:' . $industry->min_sale);
}
//判断产品状态和库存
if (!$industry || $industry->status != ProductStatus::ON_SALE || $industry->stock < $form->num) {
return $form->response()->error('产品已下架或库存不足');
}
//生成订单号
list($micro, $sec) = explode(' ', microtime());
$micro = str_pad(floor($micro * 1000000), 6, 0, STR_PAD_LEFT);
$order_no = date('ymdHis', $sec) . $micro . mt_rand(1000, 9999);
//产品规格处理
$spec = IndustryProductSpec::where('industry_product_id', $form->pid)->find($form->industry_product_spec_id);
if (!$spec) {
return $form->response()->error('您选择的产品规格不存在');
}
$form->deleteInput(['pid', 'picture']);
$form->hidden(['industry_product_id', 'supplier_id', 'agent_id', 'order_no', 'price', 'title', 'picture', 'status', 'pay_type', 'paid_at', 'verify_code', 'trade_deposit', 'timeout']);
$form->name = $form->name ?? Admin::user()->director;
$form->mobile = $form->mobile ?? Admin::user()->contact_phone;
$form->industry_product_id = $industry->id;
$form->supplier_id = $industry->supplier_id;
$form->agent_id = Admin::user()->id;
$form->order_no = $order_no;
$form->price = $form->num * $spec->price;
$form->title = $industry->title;
$form->picture = $industry->pictures[0] ?? '' ;
$form->status = $form->pay_type == PayType::OFFLINE ? OrderStatus::OFFLINE_UNPAID : OrderStatus::UNPAID;
$form->paid_at = null;
$form->verify_code = '';
$form->trade_deposit = $form->num * $industry->single_deposit;
$form->single_price = $industry->single_deposit;
$form->timeout = null;
if ($form->pay_type == PayType::DEPOSIT_PAY) {
$form->prepay_price = $industry->deposit;
} else if ($form->pay_type == PayType::EARNEST_PAY) {
$form->prepay_price = $industry->earnest;
} else {
$form->prepay_price = 0;
}
})->saved(function (Form $form) {
return $form->response()->success('下单成功,请等待供应商审核订单')->redirect(admin_url('industry_order/list'));
})->deleting(function (Form $form) {
return $form->response()->error('操作禁止');
});
}
} }

18
app/AdminAgent/Controllers/IndustryProductController.php

@ -2,11 +2,15 @@
namespace App\AdminAgent\Controllers; namespace App\AdminAgent\Controllers;
use App\AdminAgent\Forms\IndustryProductBuy;
use App\AdminAgent\Repositories\IndustryProduct; use App\AdminAgent\Repositories\IndustryProduct;
use App\Common\ProductStatus; use App\Common\ProductStatus;
use Dcat\Admin\Admin;
use Dcat\Admin\Grid; use Dcat\Admin\Grid;
use Dcat\Admin\Layout\Content;
use Dcat\Admin\Show; use Dcat\Admin\Show;
use Dcat\Admin\Http\Controllers\AdminController; use Dcat\Admin\Http\Controllers\AdminController;
use Dcat\Admin\Widgets\Card;
class IndustryProductController extends AdminController class IndustryProductController extends AdminController
{ {
@ -41,7 +45,7 @@ class IndustryProductController extends AdminController
->if(fn() => true) ->if(fn() => true)
->then(function ($column) { ->then(function ($column) {
$column->append('<a class="btn btn-sm" href="' . admin_url('industry_product/list', $this->id) . '">查看</a> &nbsp;'); $column->append('<a class="btn btn-sm" href="' . admin_url('industry_product/list', $this->id) . '">查看</a> &nbsp;');
$column->append('<a class="btn btn-sm btn-success" href="' . admin_url('industry_order/list/create?pid=' . $this->id) . '">购买</a>');
$column->append('<a class="btn btn-sm btn-success" href="' . admin_url('industry_product/buy?pid=' . $this->id) . '">购买</a>');
}); });
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
@ -84,4 +88,16 @@ class IndustryProductController extends AdminController
$show->field('updated_at'); $show->field('updated_at');
}); });
} }
//购买行业产品
public function buy(Content $content): Content
{
$pid = request()->input('pid');
if (!$pid) {
Admin::exit('未指定要购买的产品');
}
return $content
->title('购买行业产品')
->body(new Card(new IndustryProductBuy()));
}
} }

213
app/AdminAgent/Forms/IndustryProductBuy.php

@ -0,0 +1,213 @@
<?php
namespace App\AdminAgent\Forms;
use App\AdminAgent\Renderable\SelectIndustryProductSpec;
use App\Common\OrderStatus;
use App\Common\PayType;
use App\Common\ProductStatus;
use App\Models\IndustryOrder;
use App\Models\IndustryProduct;
use App\Models\IndustryProductSpec;
use Dcat\Admin\Admin;
use Dcat\Admin\Widgets\Alert;
use Dcat\Admin\Widgets\Form;
use Illuminate\Support\Facades\DB;
class IndustryProductBuy extends Form
{
/**
* Handle the form request.
*
* @param array $input
*
* @return mixed
*/
public function handle(array $input)
{
$pid = request()->input('pid');
$industry = IndustryProduct::with('diyForm')->where([
['status', '=', ProductStatus::ON_SALE],
['stock', '>', 0],
])->find($pid);
if (!$industry) {
return $this->response()->error('产品不存在或已下架');
}
//最小起购数
if ($input['num'] < $industry->min_sale) {
return $this->response()->error('购买数量不能小于最低起购数:' . $industry->min_sale);
}
//产品规格
$spec = IndustryProductSpec::where([
['industry_product_id', '=', $industry->id],
['stock', '>=', $input['num']],
])->find($input['industry_product_spec_id']);
if (!$spec) {
return $this->response()->error('产品规格不存在或库存不足');
}
//信息收集表处理,保留字段类型等信息,便于后台显示
$order_info = $input['info'] ?? [];
if (!empty($industry->diyForm->fields) && !$industry->diyForm->fields->isEmpty()) {
$fields = array_column($industry->diyForm->fields->toArray(), null, 'field');
foreach ($fields as &$field) {
if ($field['required'] && !isset($order_info[$field['field']])) { //判断是否必填
return $this->error($field['field'] . '不能为空');
}
$field['value'] = $order_info[$field['field']] ?? '';
}
$order_info = $fields;
}
//生成订单号
list($micro, $sec) = explode(' ', microtime());
$micro = str_pad(floor($micro * 1000000), 6, 0, STR_PAD_LEFT);
$order_no = date('ymdHis', $sec) . $micro . mt_rand(1000, 9999);
DB::beginTransaction();
try {
//规格减库存
$affect_row = IndustryProductSpec::where([
['id', '=', $spec->id],
['stock', '>=', $input['num']],
])->decrement('stock', $input['num']);
if (!$affect_row) {
throw new \Exception('产品规格库存不足!');
}
//产品表减库存
$industry->stock = $industry->stock - $input['num'];
$industry->save();
if ($input['pay_type'] == PayType::DEPOSIT_PAY) {
$prepay_price = $industry->deposit * $input['num'];
} else if ($input['pay_type'] == PayType::EARNEST_PAY) {
$prepay_price = $industry->earnest * $input['num'];
} else {
$prepay_price = 0;
}
$order = IndustryOrder::create([
'agent_id' => Admin::user()->id,
'supplier_id' => $industry->supplier_id,
'order_no' => $order_no,
'industry_product_id' => $industry->id,
'industry_product_spec_id' => $input['industry_product_spec_id'],
'num' => $input['num'],
'price' => $input['num'] * $spec['price'],
'name' => $input['name'],
'mobile' => $input['mobile'],
'title' => $industry->title,
'picture' => $industry->pictures[0] ?? '',
'status' => $input['pay_type'] == PayType::OFFLINE ? OrderStatus::OFFLINE_UNPAID : OrderStatus::UNPAID,
'pay_type' => $input['pay_type'],
'paid_money' => 0,
'paid_at' => null,
'trade_deposit' => $industry->single_deposit * $input['num'],
'timeout' => null,
'created_at' => now(),
'prepay_price' => $prepay_price,
'single_price' => $industry->single_deposit,
'info' => $order_info,
]);
DB::commit();
return $this->response()->success('购买成功,正在前往支付页面')->redirect('industry_order/list/' . $order->id);
} catch (\Exception $e) {
DB::rollBack();
return $this->response()->error($e->getMessage());
}
}
/**
* Build a form here.
*/
public function form()
{
//处理图片上传
$_file = request()->file('_file_');
if ($_file && $_file->isValid()) {
$this->multipleImage(request()->input('upload_column'))->uniqueName()->saveFullUrl();
return true;
}
$pid = request()->input('pid');
$industry = IndustryProduct::with('diyForm.fields')
->where([
['status', '=', ProductStatus::ON_SALE],
['stock', '>', 0],
])->find($pid);
if (!$industry) {
return $this->response()->error('产品不存在或已下架');
}
Admin::translation('industry-order');
$this->selectTable('industry_product_spec_id', '选择产品规格')
->required()
->title('选择产品规格')
->dialogWidth('80%;min-width:825px;')
->from(SelectIndustryProductSpec::make(['industry_product_id' => $pid]))
->model(IndustryProductSpec::class);
//购买人信息
$this->hidden('pid')->value($industry->id); //pid要跟上面的request中的一样,否则提交出错
$this->number('num')->min($industry->min_sale)->required()->default($industry->min_sale);
$this->text('name', '您的姓名')->default(Admin::user()->director)->required();
$this->mobile('mobile', '您的手机号')->default(Admin::user()->contact_phone)->required();
//支付信息
$pay_type = [PayType::ONLINE, PayType::OFFLINE];
if ((float)$industry->deposit) { //订金支付
$pay_type = [...$pay_type, PayType::DEPOSIT_PAY];
}
if ((float)$industry->earnest) { //定金支付
$pay_type = [...$pay_type, PayType::EARNEST_PAY];
}
$options = array_filter(PayType::array(), fn($k) => in_array($k, $pay_type), ARRAY_FILTER_USE_KEY);
$this->select('pay_type')
->options($options)->default(PayType::ONLINE)->required()
->when(PayType::DEPOSIT_PAY, function () use ($industry) {
$this->display('deposit', '订金')->customFormat(fn() => $industry->deposit);
})->when(PayType::EARNEST_PAY, function () use ($industry) {
$this->display('earnest', '定金')->customFormat(fn() => $industry->earnest);
});
//信息收集表单
if (!empty($industry->diyForm->fields)) {
$this->html(Alert::make(null, '客户信息收集表单')->warning())->width(12);
$fields = $industry->diyForm->fields->toArray();
foreach ($fields as $v) {
if ($v['type'] == 'radio' || $v['type'] == 'checkbox') {
$this->{$v['type']}('info.' . $v['field'])->options(array_combine($v['options'], $v['options']))->required((bool)$v['required']);
} else if ($v['type'] == 'image') {
$this->multipleImage('info.' . $v['field'])->uniqueName()->saveFullUrl()->required((bool)$v['required']);
} else {
$this->{$v['type']}('info.' . $v['field'])->required((bool)$v['required']);
}
}
}
$this->html(Alert::make(null, '产品信息')->info())->width(12);
$this->text('', '购买产品')->default($industry->title)->disable();
$this->text('', '单价')->default($industry->price)->disable();
$this->text('', '库存')->default($industry->stock)->disable();
$this->text('', '起购数量')->default($industry->min_sale)->disable();
$this->multipleImage('pictures', '产品图')->default($industry->pictures)->disable();
$this->display('', '旅游须知')->default(fn() => preg_replace('/<script.*?>.*?<\/script>/is', '', $industry->know))->disable();
$this->display('', '产品详情')->default(fn() => preg_replace('/<script.*?>.*?<\/script>/is', '', $industry->content))->disable();
}
/**
* The data of the form.
*
* @return array
*/
public function default()
{
return [];
}
}

1
app/AdminAgent/routes.php

@ -24,6 +24,7 @@ Route::group([
$router->resource('special/list', 'SpecialController'); $router->resource('special/list', 'SpecialController');
$router->resource('industry_product/list', 'IndustryProductController'); $router->resource('industry_product/list', 'IndustryProductController');
$router->get('industry_product/buy', 'IndustryProductController@buy');
$router->resource('industry_order/list', 'IndustryOrderController'); $router->resource('industry_order/list', 'IndustryOrderController');
$router->get('industry_order/qrcode/{verify_code}', 'IndustryOrderController@qrcode'); $router->get('industry_order/qrcode/{verify_code}', 'IndustryOrderController@qrcode');

2
app/AdminSupplier/Controllers/DiyFormController.php

@ -94,7 +94,7 @@ class DiyFormController extends AdminController
$form->text('name')->required(); $form->text('name')->required();
$form->hasMany('fields', function (Form\NestedForm $form) { $form->hasMany('fields', function (Form\NestedForm $form) {
$form->text('field', '字段名称')->required(); $form->text('field', '字段名称')->required();
$form->switch('required', '是否必填')->default(1)->required();
$form->switch('required', '是否必填')->default(1);
$form->radio2('type', '字段类型') $form->radio2('type', '字段类型')
->required()->default('text') ->required()->default('text')
->options(admin_trans('diy-form.options')) ->options(admin_trans('diy-form.options'))

25
app/AdminSupplier/Controllers/IndustryOrderController.php

@ -10,6 +10,7 @@ use Dcat\Admin\Form;
use Dcat\Admin\Grid; use Dcat\Admin\Grid;
use Dcat\Admin\Show; use Dcat\Admin\Show;
use Dcat\Admin\Http\Controllers\AdminController; use Dcat\Admin\Http\Controllers\AdminController;
use Dcat\Admin\Widgets\Table;
class IndustryOrderController extends AdminController class IndustryOrderController extends AdminController
{ {
@ -28,12 +29,32 @@ class IndustryOrderController extends AdminController
$grid->model()->where('supplier_id', Admin::user()->id); $grid->model()->where('supplier_id', Admin::user()->id);
$grid->column('id')->sortable(); $grid->column('id')->sortable();
$grid->column('agent.company_name', '代理商名称');
$grid->column('order_no');
$grid->column('agent.company_name', '代理商名称')->limit(10);
$grid->column('order_no')->limit(10);
$grid->column('num'); $grid->column('num');
$grid->column('price'); $grid->column('price');
$grid->column('name'); $grid->column('name');
$grid->column('mobile'); $grid->column('mobile');
$grid->column('info', '信息收集')
->display('查看')
->modal('信息收集', function ($modal) {
$info = $this->info ?? [];
$info = array_map(function($v) {
if (isset($v['value'], $v['type'])) {
if ($v['type'] == 'image') {
if (is_array($v['value'])) {
return array_reduce($v['value'], fn($v2, $v3) => $v2 . '<img data-action="preview-img" src="' . $v3 . '" style="max-width:120px;max-height:200px;cursor:pointer" class="img img-thumbnail"> &nbsp;');
} else {
return '<img data-action="preview-img" src="' . $v['value'] . '" style="max-width:120px;max-height:200px;cursor:pointer" class="img img-thumbnail">';
}
} else {
return is_string($v['value']) ? $v['value'] : join(',', $v['value']);
}
}
return is_string($v) ? $v : json_encode($v);
}, $info);
return Table::make([], $info);
})->xl();
$grid->column('industry_product_id', '产品ID'); $grid->column('industry_product_id', '产品ID');
$grid->column('title')->limit(15); $grid->column('title')->limit(15);
$grid->column('picture')->image('', 60, 60); $grid->column('picture')->image('', 60, 60);

4
app/AdminSupplier/Controllers/IndustryProductController.php

@ -292,6 +292,10 @@ class IndustryProductController extends AdminController
if (in_array($form->model()->status, $user_status) && !is_null($form->status) && $form->status == 0) { if (in_array($form->model()->status, $user_status) && !is_null($form->status) && $form->status == 0) {
$form->status = ProductStatus::SOLD_OUT; $form->status = ProductStatus::SOLD_OUT;
} }
//交易金单价未设置不允许上架,状态改为未审核
else if ((float)$form->model()->single_deposit <= 0) {
$form->status = ProductStatus::UNAUDITED;
}
//非用户可编辑状态不允许修改 //非用户可编辑状态不允许修改
else if (!in_array($form->model()->status, $user_status) || !in_array($form->status, $user_status)) { else if (!in_array($form->model()->status, $user_status) || !in_array($form->status, $user_status)) {
$form->deleteInput('status'); $form->deleteInput('status');

8
app/Http/Controllers/IndustryProductWxpay.php

@ -12,6 +12,7 @@ use EasyWeChat\Factory;
use EasyWeChat\Kernel\Exceptions\Exception; use EasyWeChat\Kernel\Exceptions\Exception;
use EasyWeChat\Payment\Kernel\Exceptions\InvalidSignException; use EasyWeChat\Payment\Kernel\Exceptions\InvalidSignException;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
/** /**
* 行业产品微信支付回调 * 行业产品微信支付回调
@ -70,7 +71,7 @@ class IndustryProductWxpay
try { try {
//增加销量,库存在拍下时已经减了 //增加销量,库存在拍下时已经减了
IndustryProduct::query() IndustryProduct::query()
->where('id', $order->product_id)
->where('id', $order->industry_product_id)
->increment('sale', $order->num); ->increment('sale', $order->num);
$old_status = $order->status; $old_status = $order->status;
@ -96,8 +97,8 @@ class IndustryProductWxpay
//资金流水 //资金流水
IndustryPayLog::create([ IndustryPayLog::create([
'user_id' => $order->user_id,
'agent_id' => $order->agent_id, 'agent_id' => $order->agent_id,
'supplier_id' => $order->supplier_id,
'money' => $money, 'money' => $money,
'industry_order_id' => $order->id, 'industry_order_id' => $order->id,
'type' => 1, 'type' => 1,
@ -123,7 +124,8 @@ class IndustryProductWxpay
$fail('Unknown error 2'); $fail('Unknown error 2');
}); });
} catch (InvalidSignException | Exception $e) { } catch (InvalidSignException | Exception $e) {
return 'error' . $e->getFile() . $e->getMessage() . $e->getLine();
LOG::debug('行业产品支付', [$e->getFile(), $e->getLine(), $e->getMessage()]);
return 'error';
} }
return $response; return $response;

3
app/Models/IndustryOrder.php

@ -10,6 +10,9 @@ class IndustryOrder extends BaseModel
use HasDateTimeFormatter; use HasDateTimeFormatter;
use SoftDeletes; use SoftDeletes;
protected $casts = ['info' => 'json'];
protected $guarded = ['id'];
public function supplier() public function supplier()
{ {
return $this->belongsTo(Supplier::class)->withTrashed(); return $this->belongsTo(Supplier::class)->withTrashed();

4
ready.md

@ -24,9 +24,13 @@ TRUNCATE `demand`;
TRUNCATE `demand_bidding`; TRUNCATE `demand_bidding`;
TRUNCATE `demand_products`; TRUNCATE `demand_products`;
TRUNCATE `deposit_log`; TRUNCATE `deposit_log`;
TRUNCATE `diy_forms`;
TRUNCATE `diy_form_fields`;
TRUNCATE `guides`; TRUNCATE `guides`;
TRUNCATE `industry_orders`; TRUNCATE `industry_orders`;
TRUNCATE `industry_pay_logs`;
TRUNCATE `industry_products`; TRUNCATE `industry_products`;
TRUNCATE `industry_product_specs`;
TRUNCATE `messages`; TRUNCATE `messages`;
TRUNCATE `message_reads`; TRUNCATE `message_reads`;
TRUNCATE `mini_program_drafts`; TRUNCATE `mini_program_drafts`;

2
resources/lang/zh_CN/industry-order.php

@ -4,6 +4,8 @@ return [
'IndustryOrder' => '行业产品订单', 'IndustryOrder' => '行业产品订单',
'industry-order' => '行业产品订单', 'industry-order' => '行业产品订单',
'industry_order' => '行业产品订单', 'industry_order' => '行业产品订单',
'industry_product' => '行业产品',
'buy' => '购买',
], ],
'fields' => [ 'fields' => [
'supplier_id' => '供应商ID', 'supplier_id' => '供应商ID',

Loading…
Cancel
Save