ad

app/admin/controller/Express.php

@@ -0,0 +1,31 @@
+<?php
+
+
+namespace app\admin\controller;
+
+
+use think\App;class Express extends Base{
+    public function __construct(App $app) {
+        $this->noLogin = ["*"];
+        parent::__construct($app);
+        $this->model = new \app\admin\model\ExpressData();
+    }
+
+    public function List(){
+        $param = $this->request->param(['outCode'=>"","outChildCode"=>"","orderCode"=>"","post_code"=>"","post_name"=>"",
+        "status"=>"","page"=>1,"size"=>15],"post","trim");
+        $where=[];
+        if($param['outCode']!='') $where[]=['OrderOut.outCode','like',"%".$param['outCode']."%"];
+        if($param['outChildCode']!='') $where[]=['OrderChild.outChildCode','like',"%".$param['outChildCode']."%"];
+        if($param['orderCode']!='') $where[]=['OrderOut.orderCode','like',"%".$param['orderCode']."%"];
+        if($param['post_code']!='') $where[]=['ExpressData.post_code','like',"%".$param['post_code']."%"];
+        if($param['post_name']!='') $where[]=['ExpressData.post_name','like',"%".$param['post_name']."%"];
+        if($param['status']!='') $where[]=['ExpressData.status','=',$param['status']];
+        $list = $this->model
+        ->withJoin(["OrderOut","OrderChild"])
+        ->where($where)
+        ->order('id desc')
+        ->paginate(["page"=>$param['page'],"list_rows"=>$param['size']]);
+        return success("获取成功",["list"=>$list->items(),"count"=>$list->total()]);
+    }
+}

app/admin/model/ExpressData.php

@@ -7,6 +7,7 @@ class ExpressData extends Base
     protected $schema = [
         'id'       =>'bigint',//
         'order_out_id'       =>'int',//发货单ID
+        'out_child_id'       =>'int',//订单号
         'post_code'       =>'varchar',//快递编号
         'post_name'       =>'varchar',//快递公司
         'post_express'       =>'varchar',//快递公司缩写
@@ -14,11 +15,31 @@ class ExpressData extends Base
         'post_data'       =>'text',//快递信息主体
         'contactor'       =>'varchar',//联系人
         'mobile'       =>'varchar',//联系电话
-        'status'       =>'tinyint',//快递状态,0物流单号暂无结果,3在途,4揽件,5疑难,6签收,7退签,8派件,9退回
+        'status'       =>'tinyint',//'Fail': 0,'WAIT_ACCEPT': 1,  # 待揽收 'ACCEPT': 2,  # 已揽收'TRANSPORT': 3,  # 运输中'DELIVERING': 4,  # 派件中'AGENT_SIGN': 5,  # 已代签收'SIGN': 6,  # 已签收'FAILED': 7  # 包裹异常
         'remark'       =>'varchar',//备注
         'crontab_num'       =>'int',//执行失败次数超过三次不执行
         'addtime'       =>'datetime',//新建时间
         'updatetime'       =>'datetime',//更新时间
-
     ];
+    protected static $status=[
+        0=>'未获取到数据',
+        1=>'待揽收',
+        2=>'已揽收',
+        3=>'运输中',
+        4=>'派件中',
+        5=>'已代签收',
+        6=>'已签收',
+        7=>'包裹异常',
+    ];
+    protected array $json=['post_data'];
+
+    public static function getStatusAttr($value){
+        return self::$status[$value]??$value;
+    }
+    public function OrderOut(){
+      return $this->belongsTo('OrderOut','order_out_id','id');
+    }
+    public function OrderChild(){
+        return $this->belongsTo('OrderOutChild','out_child_id','id');
+    }
 }

app/admin/model/OrderOut.php

@@ -29,6 +29,5 @@ class OrderOut extends Base
         'remark'       =>'varchar',//备注
         'send_uid'       =>'int',//
         'send_uname'       =>'varchar',//
-
     ];
 }

app/admin/model/OrderOutChild.php

@@ -33,6 +33,5 @@ class OrderOutChild extends Base
         'sendtime'       =>'varchar',//发货时间
         'addtime'       =>'datetime',//新建时间
         'updatetime'       =>'datetime',//更新时间
-
     ];
 }

app/cxinv/controller/Trade.php

@@ -195,9 +195,10 @@ class Trade extends Base{
     public function PoolList(){
         $params=$this->request->param(["logNo"=>"","status"=>"","name"=>"","bank"=>"","start"=>"","end"=>"","companyNo"=>"",
         "page"=>1,"size"=>20,'apply_id'=>"",'orderCode'=>'',"relaNo"=>"",'platform_type'=>'',"relaComNo"=>"",'cxCode'=>'',"pcCode"=>"",
-        "trade_type"=>"","tag_type"=>""],"post","trim");
+        "trade_type"=>"","tag_type"=>"","tradNo"=>""],"post","trim");
         $where=[["a.is_del","=",0],["b.is_del","=",0],['c.is_del','=',0],['d.is_del','=',0]];
         if($params['logNo']!=="")$where[]=["a.logNo","like","%".$params['logNo']."%"];
+        if($params['tradNo']!=='')$where[]=['a.tradNo','like','%'.$params['tradNo'].'%'];
         if($params['apply_id']!=="")$where[]=["a.apply_id","like","%".$params['apply_id']."%"];
         if($params['orderCode']!=="")$where[]=["d.orderCode","like","%".$params['orderCode']."%"];
         if($params['platform_type']!=="")$where[]=["a.platform_type","like","%".$params['platform_type']."%"];

app/cxinv/listener/ComonQrd.php

@@ -30,7 +30,7 @@ class ComonQrd
 		}
 		if($event['type']=='rinv'){
 		    $this->returnInv($event);
-		   // $this->InvToPay($event,false);
+		    $this->InvToPay($event,false);
 		}
 		if($event['type']=='check')$this->checkPay($event);
     }
@@ -87,6 +87,7 @@ class ComonQrd
 		            		$qrd['pay_status'] = ($qrd['wpay_fee']==0 &&$item->pay_fee==0) ? 3:($qrd['apay_fee']==0?1:2);
 		            	}
 		            }else{
+		                if($item->pay_tag_fee==0) continue;
                         $tag_temp['tag_fee']= $payArr[$item->sequenceNo];
                         $tag_fee = ($item->pay_tag_fee>$payArr[$item->sequenceNo])?$payArr[$item->sequenceNo]:$item->pay_tag_fee;
                         $qrd['pay_tag_fee']=$item->pay_tag_fee-$tag_fee;

app/user/controller/SystemLog.php

@@ -0,0 +1,30 @@
+<?php
+
+
+namespace app\user\controller;
+
+
+use think\App;
+class SystemLog extends Base{
+    public function __construct(App $app) {
+        $this->noLogin=["*"];
+        parent::__construct($app);
+        $this->model = new \app\user\model\SystemLog();
+    }
+
+    public function list(){
+        $params = $this->request->param(["system"=>"","controller"=>"","action"=>"","uid"=>'',"page"=>1,"size"=>10,
+        "start"=>"","end"=>""],"post","trim");
+        $where=[];
+        if($params['system']!='') $where[]=['system','=',$params['system']];
+        if($params['controller']!='') $where[]=['controller','=',$params['controller']];
+        if($params['action']!='') $where[]=['action','=',$params['action']];
+        if($params['uid']!='') $where[]=['action_id','=',$params['uid']];
+        if($params['start']!='' && $params['end']!=''){
+            $where[]=['createTime','between',[$params['start'],$params['end']]];
+        }
+        $list = $this->model->where($where)->order('id desc')
+        ->paginate(["page"=>$params['page'],"list_rows"=>$params['size']]);
+        return success("获取成功",["list"=>$list->items(),"count"=>$list->total()]);
+    }
+}

app/user/model/SystemLog.php

@@ -27,7 +27,7 @@ class SystemLog extends Base{
         'response' => 'text',
         'action_name' => 'string',
         'action_id' => 'int',
-            'client_ip'=>'string',
+         'client_ip'=>'string',
         'createTime' => 'datetime',
     ];
     protected $json = ['param','response'];
@@ -36,5 +36,9 @@ class SystemLog extends Base{
         'createTime' => 'datetime',
     ];
     protected $createTime = 'createTime';
+    protected $append=['action_msg'];
 
+     public function getActionMsgAttr($value,$data){
+           return   \SystemLog::GET_LOG_PATH($data,$data['action_name'],$data['param']);
+    }
 }

extend/lib/user/accountitem.php

@@ -2,7 +2,7 @@
 return [
         'setitem'=>[
                     'name'=>'设置用户部门',
-                    "msg"=>"%s 设置用户部门【%s】",
+                    "msg"=>"%s 设置用户部门",
                     "resplace"=>[],
                 ],
         'resetitem'=>[
@@ -12,7 +12,7 @@ return [
                 ],
         'list'=>[
                     'name'=>'部门列表',
-                    "msg"=>"%s 部门列表【%s】",
+                    "msg"=>"%s 部门列表",
                     "resplace"=>[],
                 ],
         'getitem'=>[

extend/lib/user/business.php

@@ -2,7 +2,7 @@
 return [
         'list'=>[
                     'name'=>'业务公司列表',
-                    "msg"=>"%s 业务公司列表【%s】",
+                    "msg"=>"%s 业务公司列表",
                     "resplace"=>[],
                 ],
         'create'=>[

extend/lib/user/company.php

@@ -2,17 +2,17 @@
 return [
         'list'=>[
                     'name'=>'公司列表',
-                    "msg"=>"%s 公司列表【%s】",
+                    "msg"=>"%s 公司列表",
                     "resplace"=>[],
                 ],
         'query'=>[
                     'name'=>'获取公司信息',
-                    "msg"=>"%s 获取公司信息【%s】",
+                    "msg"=>"%s 获取公司信息",
                     "resplace"=>[],
                 ],
         'companytype'=>[
                     'name'=>'获取公司类型',
-                    "msg"=>"%s 获取公司类型【%s】",
+                    "msg"=>"%s 获取公司类型",
                     "resplace"=>[],
                 ],
         'Auth'=>[

extend/lib/user/customer.php

@@ -22,12 +22,12 @@ return [
                 ],
         'list'=>[
                     'name'=>'客户列表',
-                    "msg"=>"%s 客户列表【%s】",
+                    "msg"=>"%s 客户列表",
                     "resplace"=>[],
                 ],
         'customermember'=>[
                     'name'=>'客户联系人列表',
-                    "msg"=>"%s 客户联系人列表【%s】",
+                    "msg"=>"%s 客户联系人列表",
                     "resplace"=>[],
                 ],
         'status'=>[

extend/lib/user/depart.php

@@ -2,7 +2,7 @@
 return [
         'list'=>[
                     'name'=>'部门列表',
-                    "msg"=>"%s 部门列表【%s】",
+                    "msg"=>"%s 部门列表",
                     "resplace"=>[],
                 ],
         'query'=>[

extend/lib/user/login.php

@@ -1,6 +1,6 @@
 <?php 
 return [
-        'loginIn'=>[
+        'loginin'=>[
                     'name'=>'登录',
                     "msg"=>"%s 登录【%s】",
                     "resplace"=>['username'],

extend/lib/user/supplier.php

@@ -12,7 +12,7 @@ return [
                 ],
         'list'=>[
                     'name'=>'供应商列表',
-                    "msg"=>"%s 供应商列表【%s】",
+                    "msg"=>"%s 供应商列表",
                     "resplace"=>[],
                 ],
         'info'=>[

extend/lib/user/taxcategory.php

@@ -2,27 +2,27 @@
 return [
         'list'=>[
                     'name'=>'税目列表',
-                    "msg"=>"%s 税目列表【%s】",
+                    "msg"=>"%s 税目列表",
                     "resplace"=>[],
                 ],
         'query'=>[
                     'name'=>'获取税目信息',
-                    "msg"=>"%s 获取税目信息【%s】",
-                    "resplace"=>['cat_code'],
+                    "msg"=>"%s 获取税目信息",
+                    "resplace"=>[],
                 ],
         'listbycompany'=>[
                     'name'=>'税目列表',
-                    "msg"=>"%s 税目列表【%s】",
+                    "msg"=>"%s 税目列表",
                     "resplace"=>[],
                 ],
         'taxcompanyset'=>[
                     'name'=>'公司关联税目设置',
-                    "msg"=>"%s 税目列表【%s】",
-                    "resplace"=>['tax_ids'],
+                    "msg"=>"%s 公司关联税目",
+                    "resplace"=>[],
                 ],
         'taxcompanyquery'=>[
                     'name'=>'获取公司税目信息',
-                    "msg"=>"%s 获取公司税目信息【%s】",
+                    "msg"=>"%s 获取公司税目信息",
                     "resplace"=>[],
                 ],
         'Auth'=>[

extend/lib/user/user.php

@@ -7,22 +7,22 @@ return [
                 ],
         'save'=>[
                     'name'=>'编辑用户',
-                    "msg"=>"%s 编辑用户ID【%s】",
+                    "msg"=>"%s 编辑用户ID",
                     "resplace"=>['id'],
                 ],
         'userlist'=>[
                     'name'=>'用户列表',
-                    "msg"=>"%s 用户列表【%s】",
+                    "msg"=>"%s 用户列表",
                     "resplace"=>[],
                 ],
         'userinfo'=>[
                     'name'=>'获取用户信息',
-                    "msg"=>"%s 获取用户信息【%s】",
+                    "msg"=>"%s 获取用户信息",
                     "resplace"=>[],
                 ],
         'getuserquerybycondition'=>[
                     'name'=>'条件获取匹配用户信息',
-                    "msg"=>"%s 条件获取匹配用户信息【%s】",
+                    "msg"=>"%s 条件获取匹配用户信息",
                     "resplace"=>[],
                 ],
         'userchange'=>[

extend/lib/wechat/wechat.php

@@ -1,18 +1,18 @@
 <?php 
 return [
-        'WebAuth'=>[
-                    'name'=>'',
-                    "msg"=>"",
+        'webauth'=>[
+                    'name'=>'微信授权',
+                    "msg"=>"微信授权",
                     "resplace"=>[],
                 ],
-        'getConfig'=>[
+        'getconfig'=>[
                     'name'=>'获取微信授权配置',
-                    "msg"=>"%s 获取微信授权配置【%s】",
+                    "msg"=>"%s 获取微信授权配置",
                     "resplace"=>[],
                 ],
-        'getTemplate'=>[
+        'gettemplate'=>[
                     'name'=>'获取公众号下定制模板',
-                    "msg"=>"%s 获取公众号下定制模板【%s】",
+                    "msg"=>"%s 获取公众号下定制模板",
                     "resplace"=>[],
                 ],
 ];

extend/lib/youzan/voucher.php

@@ -1,13 +1,13 @@
 <?php 
 return [
         'list'=>[
-                    'name'=>'活动列表',
-                    "msg"=>"%s 活动列表【%s】",
+                    'name'=>'有赞优惠券列表',
+                    "msg"=>"%s 有赞优惠券列表",
                     "resplace"=>[],
                 ],
         'delete'=>[
-                    'name'=>'删除功能',
-                    "msg"=>"%s 删除功能ID【%s】",
+                    'name'=>'删除有赞优惠券功能',
+                    "msg"=>"%s 删除有赞优惠券功能ID【%s】",
                     "resplace"=>['activity_id'],
                 ],
         'Auth'=>[