hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
xman 2025-05-31 18:08:05 +08:00
commit 48de1eb9ea
16 changed files with 347 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/alisms/config.php
View File

@ -6,7 +6,7 @@ return [
'title' => '应用key',
'type' => 'string',
'content' => [],
'value' => 'your key',
'value' => 'LTAI5t87F5mAkaXVKfLcmnrB',
'rule' => 'required',
'msg' => '',
'tip' => '',
@ -18,7 +18,7 @@ return [
'title' => '密钥secret',
'type' => 'string',
'content' => [],
'value' => 'your secret',
'value' => 'fk7KgdqRdJUS6Jc99TlB6mNLKorrsD',
'rule' => 'required',
'msg' => '',
'tip' => '',
@ -30,7 +30,7 @@ return [
'title' => '签名',
'type' => 'string',
'content' => [],
'value' => 'your sign',
'value' => '超邦手',
'rule' => 'required',
'msg' => '',
'tip' => '',
@ -43,14 +43,9 @@ return [
'type' => 'array',
'content' => [],
'value' => [
'register' => 'SMS_114000000',
'resetpwd' => 'SMS_114000000',
'changepwd' => 'SMS_114000000',
'changemobile' => 'SMS_114000000',
'profile' => 'SMS_114000000',
'notice' => 'SMS_114000000',
'mobilelogin' => 'SMS_114000000',
'bind' => 'SMS_114000000',
'stop_custom' => 'SMS_487200413',
'start_custom' => 'SMS_487260356',
'start_worker' => 'SMS_487375365',
],
'rule' => 'required',
'msg' => '',

2
addons/alisms/info.ini
View File

@ -5,6 +5,6 @@ author = FastAdmin
website = https://www.fastadmin.net
version = 1.0.10
state = 1
url = http://fast.cc:8088/addons/alisms
url = http://127.0.0.1:8088/addons/alisms
license = regular
licenseto = 15976

8
addons/alisms/library/Alisms.php
View File

@ -2,6 +2,8 @@
namespace addons\alisms\library;
use think\Db;
/**
* 阿里大于SMS短信发送
*/
@ -91,6 +93,12 @@ class Alisms
{
$this->error = '';
$params = $this->_params();
Db::name('sms_record')->insert([
'receiver' => $params['PhoneNumbers'],
'content' => $params['TemplateParam'],
'template_id' => $params['TemplateCode'],
]);
return true;
$params['Signature'] = $this->_signed($params);
$response = $this->_curl($params);
if ($response !== false) {

10
application/admin/command/Test.php
View File

@ -4,6 +4,7 @@ namespace app\admin\command;
use app\admin\addresmart\Address;
use app\admin\controller\orders\DispatchLogic;
use app\admin\controller\SendMailLogic;
use app\admin\model\Order;
use app\admin\model\OrderDispatch;
use app\admin\model\OrderReview;
@ -31,9 +32,12 @@ class Test extends Command
protected function execute(Input $input, Output $output)
{
$order = (new Order())->find(110);
$id = (new DispatchLogic())->getMaxScoreWorker($order);
dd($id);
// $ret = SendMailLogic::sendToCustomStart('13038128325','今日的风儿','173xxxxxxxx');
$ret = SendMailLogic::sendToCustomStop('17381847365');
dd($ret);
// dd($ret);
}

83
application/admin/controller/Order.php
View File

@ -43,7 +43,6 @@ class Order extends Backend
parent::_initialize();
$this->model = new \app\admin\model\Order;
$this->view->assign("statusList", $this->model->getStatusList());
$sources = Db::name('source')
->where('status', 1)
->field(['id', 'title', 'key_word', 'pid'])
@ -439,7 +438,54 @@ class Order extends Backend
}
public function addAbnormal($ids = null){
public function warning($ids = null)
{
if (false === $this->request->isPost()) {
$order = $this->model->where('id', $ids)->find();
$abnormals = model('abnormal')->where('type', 3)->order('sort', 'desc')->select();
$options = [];
foreach ($abnormals as $abnormal) {
$options [] = $abnormal->toArray();
}
return $this->fetch('warning', ['row' => $order, 'options' => $options]);
}
$params = $this->request->post('row/a');
if (empty($params)) {
$this->error(__('Parameter %s can not be empty', ''));
}
$params = $this->preExcludeFields($params);
$order = model('order')->get($params['order_id']);
$area_id = substr($order->area_id, 0, 4);
$res = Admin::where('area_ids', 'like', '%' . $area_id . '%')
->column('id');
$message = $params['detail'] ?? '';
$insert = [];
foreach ($res as $re) {
$insert [] = [
'to_id' => $re,
'type' => 1,
'title' => '订单内容变更',
'content' => '【订单内容变更】您有一条订单信息被修改，修改内容为：【' . $message . '】，请注意查收。'
];
}
$build = new Message();
$build->saveAll($insert);
$this->success('操作成功');
}
public function addAbnormal($ids = null)
{
if (false === $this->request->isPost()) {
$abnormals = model('abnormal')->where('type', 1)->order('sort', 'desc')->select();
@ -494,7 +540,8 @@ class Order extends Backend
}
public function delete($ids = null){
public function delete($ids = null)
{
if (false === $this->request->isPost()) {
$options = \model('abnormal')->where('type', 2)->select();
@ -511,42 +558,53 @@ class Order extends Backend
}
$params = $this->preExcludeFields($params);
$send_mail = $params['notify'] ?? false;
$result = false;
Db::startTrans();
try {
$order = model('order')->get($params['order_id'], ['dispatch']);
if (!$order) {
$this->error('Not Find');
}
try {
$params['status'] = \app\admin\model\Order::STATUS_CANCEL;
unset($params['notify']);
$result = $order->allowField(true)->save($params);
if(!empty($order->dispatch)){
if (!empty($order->dispatch->id)) {
$orderLogic = new OrderLogic();
$orderLogic->cancelOrderDispatch($order->dispatch, $this->auth, '订单被取消', false);
}
//日志
$hookparams['order'] = $order;
$hookparams['role'] = 1;
$hookparams['auth'] = $this->auth;
$hookparams['remark'] = $params['remark'] ?? '';
Hook::listen('order_change', $hookparams);
}
Db::commit();
} catch (ValidateException | PDOException | Exception $e) {
Db::rollback();
$this->error($e->getMessage());
}
if ($result === false) {
$this->error(__('No rows were inserted'));
}
if ($send_mail) {
SendMailLogic::sendToCustomStop($order->tel);
}
$this->success();
}
public function send($ids = null){
public function send($ids = null)
{
if (false === $this->request->isPost()) {
$options = \model('admin')->select();
@ -614,6 +672,7 @@ class Order extends Backend
// 重新索引数组
return array_values($filtered_codes);
}
/**
* 编辑
*
@ -622,7 +681,8 @@ class Order extends Backend
* @throws DbException
* @throws \think\Exception
*/
public function invoice($ids = null){
public function invoice($ids = null)
{
if (false === $this->request->isPost()) {
$order = model('order')->get($ids);
return $this->fetch('order/invoice/add', ['row' => $order]);
@ -652,7 +712,8 @@ class Order extends Backend
$this->success();
}
function findElementByValue($data, $targetValue, $path = []) {
function findElementByValue($data, $targetValue, $path = [])
{
foreach ($data as $item) {
// 将当前节点的 label 添加到路径中
$newPath = array_merge($path, [$item['label']]);

73
application/admin/controller/SendMailLogic.php Normal file
View File

@ -0,0 +1,73 @@
<?php
namespace app\admin\controller;
class SendMailLogic
{
/**
* 给工人发送开始前短信
* @param $tel
* @return bool
*/
public static function sendToWorker($toTel)
{
$config = get_addon_config('alisms');
if (!isset($config['template']['start_worker'])) {
return false;
}
$alisms = new \addons\alisms\library\Alisms();
$result = $alisms->mobile($toTel)
->template($config['template']['start_worker'])
->param([])
->send();
return $result;
}
/**
* 给客户接单的信息
* @param $tel
* @return bool
*/
public static function sendToCustomStart($toTel,$work_name,$work_tel)
{
$config = get_addon_config('alisms');
if (!isset($config['template']['start_custom'])) {
return false;
}
$alisms = new \addons\alisms\library\Alisms();
$result = $alisms->mobile($toTel)
->template($config['template']['start_custom'])
->param([
'name' => $work_name,
'phone' => $work_tel
])
->send();
return $result;
}
/**
* 给客户取消订单的信息
* @param $tel
* @return bool
*/
public static function sendToCustomStop($toTel)
{
$config = get_addon_config('alisms');
if (!isset($config['template']['stop_custom'])) {
return false;
}
$alisms = new \addons\alisms\library\Alisms();
$result = $alisms->mobile($toTel)
->template($config['template']['stop_custom'])
->param()
->send();
return $result;
}
}

3
application/admin/controller/aftersales/Aftersale.php
View File

@ -175,12 +175,13 @@ class Aftersale extends Backend
Message::create([
'to_id' => $params['dispatch_admin_id'],
'type' => 1,
'title' => '订单报错通知',
'title' => '售后申请通知',
'content' => '【售后申请通知】您有一条售后申请待处理，请前往订单售后界面进行处理！'
]);
$result = $this->model->allowField(true)->save($params);
$order->aftersale_id = $this->model->id;
$order->status = Order::STATUS_AFTERSALE;
$order->save();
Db::commit();
} catch (ValidateException|PDOException|Exception $e) {

1
application/admin/lang/zh-cn/order.php
View File

@ -21,6 +21,7 @@ return [
'Status 50' => '待结算',
'Set status to 50' => '设为待结算',
'Status 60' => '已完成',
'Status 70' => '售后',
'Set status to 60' => '设为已完成',
'Status -10' => '取消',
'Set status to -10' => '设为取消',

12
application/admin/model/Order.php
View File

@ -55,18 +55,23 @@ class Order extends Model
const STATUS_CHECKONCE = 41; //审核未通过
const STATUS_AUDITING = 50; //审核中
const STATUS_FINISHED = 60; //已完成
const STATUS_AFTERSALE= 70; //已完成
const STATUS_CANCEL = -10; //取消
public function getStatusList()
{
return ['0' => __('Status 0'),'10' => __('Status 10'), '20' => __('Status 20'),
//'30' => __('Status 30'),
'40' => __('Status 40'),
'41' => __('Status 41'),
'50' => __('Status 50'), '60' => __('Status 60'), '-10' => __('Status -10')];
'50' => __('Status 50'),
'60' => __('Status 60'),
'70' => __('Status 70'),
'-10' => __('Status -10')];
}
@ -186,6 +191,11 @@ class Order extends Model
return $this->belongsTo(Admin::class,'admin_id',);
}
public function admin(){
return $this->belongsTo(Admin::class,'admin_id',joinType: 'left')
->setEagerlyType(0);
}
public function item(){
return $this->belongsTo(Item::class,'item_id',);
}

6
application/admin/view/order/abnormal.html
View File

@ -14,7 +14,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">异常类型:</label>
<label class="control-label col-xs-12 col-sm-2">报错类型:</label>
<div class="col-xs-12 col-sm-8">
<select id="c-coupon" data-live-search="true" title="请选择" data-rule="required" name="row[abnormal_id]" class="form-control">
@ -26,7 +26,7 @@
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">异常类型:</label>
<label class="control-label col-xs-12 col-sm-2">紧急程度:</label>
<div class="col-xs-12 col-sm-8">
<select data-live-search="true" title="请选择" data-rule="required" name="row[level]" class="form-control">
@ -38,7 +38,7 @@
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">异常详情:</label>
<label class="control-label col-xs-12 col-sm-2">报错详情:</label>
<div class="col-xs-12 col-sm-8">
<textarea id="c-detail" data-rule="required" class="form-control" rows="5" name="row[detail]" cols="50"></textarea>
</div>

4
application/admin/view/order/delete.html
View File

@ -31,6 +31,10 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">短信通知客户: <input type="checkbox" name="row[notify]"> </label>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">

41
application/admin/view/order/warning.html Normal file
View File

@ -0,0 +1,41 @@
<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="{:url('order/warning')}">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">订单编号</label>
<div class="col-xs-12 col-sm-8">
<input id="c-order_id"
disabled
class="form-control" type="text" value="{$row->order_no}">
</div>
</div>
<input type="hidden" name="row[order_id]" value="{$row->id}" >
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">异常类型:</label>
<div class="col-xs-12 col-sm-8">
<select id="c-coupon" data-live-search="true" title="请选择" data-rule="required" name="row[abnormal_id]" class="form-control">
{foreach $options as $item}
<option value="{$item['id']}">{$item['title']}</option>
{/foreach}
</select>
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">异常详情:</label>
<div class="col-xs-12 col-sm-8">
<textarea id="c-detail" data-rule="required" class="form-control" rows="5" name="row[detail]" cols="50"></textarea>
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<button type="submit" class="btn btn-primary btn-embossed">{:__('OK')}</button>
</div>
</div>
</form>

4
application/admin/view/setting/abnormal/index.html
View File

@ -2,9 +2,9 @@
{:build_heading()}
<div class="panel-heading">
<ul class="nav nav-tabs" data-field="type">
<li class="{:$Think.get.type === (string)1 ? 'active' : ''}"><a href="#t-1" data-value="1" data-toggle="tab">订单异常类型</a></li>
<li class="{:$Think.get.type === (string)1 ? 'active' : ''}"><a href="#t-1" data-value="1" data-toggle="tab">订单报错类型</a></li>
<li class="{:$Think.get.type === (string)2 ? 'active' : ''}"><a href="#t-2" data-value="2" data-toggle="tab">订单取消类型</a></li>
<li class="{:$Think.get.type === (string)2 ? 'active' : ''}"><a href="#t-3" data-value="3" data-toggle="tab">订单报错类型</a></li>
<li class="{:$Think.get.type === (string)2 ? 'active' : ''}"><a href="#t-3" data-value="3" data-toggle="tab">订单异常类型</a></li>
</ul>
</div>
<div class="panel-body">

2
public/assets/js/addons.js
View File

@ -1,6 +1,8 @@
define([], function () {
require([], function () {
//绑定data-toggle=addresspicker属性点击事件
console.log('111');
$(document).on('click', "[data-toggle='addresspicker']", function () {
var that = this;
var callback = $(that).data('callback');

33
public/assets/js/backend/order.js
View File

@ -91,6 +91,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
"41": __('Status 41'),
"50": __('Status 50'),
"60": __('Status 60'),
"70": __('Status 70'),
"-10": __('Status -10'),
/*"-20": __('Status -20'),
"-30": __('Status -30')*/
@ -199,7 +200,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
extend: 'data-toggle="tooltip" data-container="body"',
classname: 'btn btn-xs btn-info btn-editone',
visible: function (row) {
if (row.status != 60) {
if (row.status != 60 && row.status != 70) {
return true;
}
return false;
@ -237,6 +238,24 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
},
refresh: true,
},
{
name: "warning",
text: "发起异常",
title: "发起异常",
extend: 'data-toggle="tooltip" data-container="body"',
classname: 'btn btn-xs btn-dialog',
icon: 'fa fa-add',
url: 'order/warning',
visible: function (row) {
if (row.status == 10) {
return true;
}
return false;
},
dropdown: "更多",
refresh: true,
},
{
name: "mapdispatch",
text: "地图派单",
@ -277,12 +296,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
//return false;
},
error: function (data, ret) {
console.log(data, ret);
Layer.alert(ret.msg);
return false;
},
visible: function (row) {
if (row.status > 0) {
if (row.status == 10) {
return true;
}
return false;
@ -325,7 +343,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
refresh:true,
dropdown: "更多",
visible: function (row) {
if (row.status != 60) {
if (row.status != 60 && row.status != 70) {
return true;
}
return false;
@ -341,7 +359,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
dropdown: "更多",
visible: function (row) {
if (row.status == 60) {
if (row.status == 60 || row.status == 70) {
return true;
}
return false;
@ -356,7 +374,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
url: 'aftersales/aftersale/add',
dropdown: "更多",
visible: function (row) {
if (row.status!==-10) {
if (row.status !== -10 && row.status !== 70) {
return true;
}
return false;
@ -473,6 +491,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
addabnormal: function () {
Form.api.bindevent($("#add-form"));
},
warning: function () {
Form.api.bindevent($("#add-form"));
},
delete: function () {
Form.api.bindevent($("form[role=form]"));
},

2
public/assets/js/backend/orders/invoice.js
View File

@ -60,7 +60,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
buttons:[
{
name: 'edit',
text: "修改",
text: "开票",
icon: 'fa fa-pencil',
title: __('Edit'),
extend: 'data-toggle="tooltip" data-container="body"',