Merge branch 'version1.5' into dev_process_action_wf

app/admin/controller/After.php

@@ -28,7 +28,7 @@ class After extends Base
              return error_show(1005,"未找到订单数据");
          }
          $after_num =Db::name("order_return")->where(["orderCode"=>$orderout['orderCode'],"outCode"=>$outCode])
-             ->where("status","not in",[5,8])->sum("error_num");
+             ->where("status","not in",[5,6,8])->sum("error_num");
 
         $th_num =Db::name("order_back")->where(["orderCode"=>$orderout['orderCode'],"outCode"=>$outCode,"is_del"=>0])
             ->where("status","<",4)->sum("return_num");

app/admin/controller/CatPlat.php

@@ -2,8 +2,7 @@
 
 
 namespace app\admin\controller;
-
-use think\exception\ErrorException;use think\facade\Db;
+use think\facade\Db;
 use think\App;class CatPlat extends Base{
     public function __construct(App $app) {parent::__construct($app);}
 

app/admin/controller/Sale.php

@@ -626,6 +626,8 @@ class Sale extends Base
         }
         Db::startTrans();
         try {
+
+            $i=1;
             foreach ($addrlist as $value) {
                 $temp = [];
                 $addrs = [];
@@ -661,6 +663,13 @@ class Sale extends Base
                     }
 
                     $outCode = makeNo("DF");
+
+
+                    //改变编码规则，将原来的outCode后两位换成序列号
+                    //str_pad字符串填充
+                    $outCode = substr($outCode, 0, -2) . str_pad($i, 2, '0', STR_PAD_LEFT);
+                    $i++;
+
                     $order['send_num'] += $num;
                     $order['wsend_num'] -= $num;
                     $or = Db::name("order_num")->save($order);