Merge branch 'master-dev' of wugg/cxinv into master

app/admin/controller/InterOrder.php

@@ -31,13 +31,13 @@ class InterOrder extends \app\admin\BaseController{
 		if($param['cgd_saler']!="") $where[]=["c.ownerName","like","%{$param['cgd_saler']}%"];
 
 		$count= Db::name("inter_order")->alias("a")
-		->leftJoin("qrd_info b","a.orderCode=b.sequenceNo")
-		->leftJoin("cgd_info c","a.cgdNo=c.sequenceNo")->where($where)->count();
+		->leftJoin("qrd_info b","a.orderCode=b.sequenceNo and b.is_del=0 and b.department='网络部'")
+		->leftJoin("cgd_info c","a.cgdNo=c.sequenceNo and c.is_del=0 and c.department='网络部'")->where($where)->count();
 		$total =ceil($count/$param['size']);
 		$page =$total>=$param['page'] ? intval($param['page']): intval($total);
 		$list= Db::name("inter_order")->alias("a")
-		->leftJoin("qrd_info b","a.orderCode=b.sequenceNo")
-		->leftJoin("cgd_info c","a.cgdNo=c.sequenceNo")
+		->leftJoin("qrd_info b","a.orderCode=b.sequenceNo and b.is_del=0 and b.department='网络部'")
+		->leftJoin("cgd_info c","a.cgdNo=c.sequenceNo and c.is_del=0 and c.department='网络部'")
 		->field("a.id,
 		a.orderCode,
 		b.customerName as khName,
@@ -466,8 +466,9 @@ class InterOrder extends \app\admin\BaseController{
         $post=$this->request->post();
         $id = isset($post['id'])&&$post['id']!='' ? $post['id'] :"";
         $condition = [['a.id',"=",$id]];
-        $list=Db::name('inter_order')->alias('a')->join('qrd_info b','a.orderCode=b.sequenceNo','left')
-            ->join('cgd_info c','a.cgdNo=c.sequenceNo','left')->json(["cat"])->where($condition)
+        $list=Db::name('inter_order')->alias('a')->join('qrd_info b',"a.orderCode=b.sequenceNo and b.is_del=0 and b.department='网络部'",'left')
+            ->join('cgd_info c',"a.cgdNo=c.sequenceNo and c.is_del=0 and c.department='网络部'",'left')->json
+            (["cat"])->where($condition)
             ->order("a.addtime desc")->field('a.id,
             b.goodNo ,
             a.orderCode,

app/admin/controller/OrderPay.php

@@ -930,9 +930,11 @@ class OrderPay extends BaseController{
        Db::startTrans();
         try{
             $tra=[];
+            $i=0;
             foreach ($list as $value) {
                 $temp = [];
-                $temp["tradNo"] = makeStr('S');
+                 $i++;
+                $temp["tradNo"] = makeStr('S').str_pad($i,3,'0');
                 $temp['trade_time'] = $value['tradeTime'];
                 $temp['total_fee'] = $value['trade_fee'];
                 $temp['trade_bank'] = $value['trade_bank'];