Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Sale.php

@@ -322,6 +322,8 @@ class Sale extends Base
                     }
 
                 }
+
+                $outCodeS=[];
                 if($sendtype==1){
                     foreach ($addrlist as $value){
                         $temp=[];
@@ -421,7 +423,9 @@ class Sale extends Base
                                             "order_status" => $out['status'],"before_status"=> $out['status']
                                         ]);
 
-                                        $standing_book_da['outCode'] = $outCode;
+
+                                        $outCodeS[]=$outCode;
+//                                        $standing_book_da['outCode'] = $outCode;
                                     }
                              //   }
                         }else{
@@ -438,6 +442,23 @@ class Sale extends Base
                     else Db::name('standing_book')->insert(array_merge($standing_book_da, ['addtime' => date('Y-m-d H:i:s'), 'standBookNo' => makeNo('IO')]));
                 } else Db::name('standing_book')->insert(array_merge($standing_book_da, ['addtime' => date('Y-m-d H:i:s'), 'standBookNo' => makeNo('IO')]));
 
+
+                foreach ($outCodeS as $outCodeTemp) {
+                    $rs = Db::name('standing_book')->where('orderCode', $orderCode)->order('outCode')->find();
+
+                    if (!empty($rs)) {
+                        if ($rs['outCode'] == '') Db::name('standing_book')->where('id', $rs['id'])->update(['outCode' => $outCodeTemp, 'updatetime' => date('Y-m-d H:i:s')]);
+                        else {
+                            unset($rs['id']);
+                            $rs['standBookNo'] = makeNo('IO');
+                            $rs['outCode'] = $outCodeTemp;
+                            $rs['addtime'] = date('Y-m-d H:i:s');
+                            Db::name('standing_book')->insert($rs);
+                        }
+                    }
+                }
+
+
                 Db::commit();
                 return error_show(0,"咨询订单创建成功",["order_code"=>$orderCode]);
             }