ad

app/admin/controller/InterOrder.php

@@ -467,7 +467,7 @@ class InterOrder extends \app\admin\BaseController{
         $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 and b.is_del=0 and b.department='网络部'",'left')
-            ->join('cgd_info c',"a.orderCode=b.sequenceNo and c.is_del=0 and c.department='网络部'",'left')->json
+            ->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 ,

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'];