订单表，新增活动编码字段

app/admin/controller/After.php

@@ -1411,6 +1411,7 @@ class After extends Base
 //                "remark" => $old_sale['remark'] . $old_sale['orderCode'],
 //                "is_stock" => $is_stock,
                 "is_activity" => $is_activity,
+                "activity_code" => $actcode,
 //                "order_type" => $is_stock == 1 ? 1 : 2,
 //                "order_source" => 1,//1直接下单
 //                "poNo"=>$poNo,

app/admin/controller/Sale.php

@@ -228,6 +228,7 @@ class Sale extends Base
                 "remark"=>$remark,
                 "is_stock"=>$is_stock,
                 "is_activity"=>$is_activity===""?0:$is_activity,
+                "activity_code"=>$actcode,
                 "order_type"=>$is_stock==1?1:2,
                 "order_source"=>1,//1直接下单
 //                "poNo"=>$poNo,
@@ -941,6 +942,7 @@ class Sale extends Base
                 "arrive_time"=>$arrtime,
                 "is_stock"=>0,
                 "is_activity"=>0,
+                "activity_code"=>'',
                 "proof_id"=>0,
                 "order_type"=>3,
                 "order_source"=>2,//2咨询
@@ -1445,6 +1447,7 @@ class Sale extends Base
             "remark"=>"",
             "is_stock"=>0,
             "is_activity"=>0,
+            "activity_code"=>'',
             "proof_id"=>0,
             "order_type"=>3,//咨询商品
             "order_source"=>3,//项目
@@ -1714,6 +1717,7 @@ class Sale extends Base
             "remark"=>"",
             "is_stock"=>$good['is_stock'],
             "is_activity"=>0,
+            "activity_code"=>'',
             "proof_id"=>0,
             "order_type"=>$good['is_stock']==1?1:2,//1备库,2非库存品
             'order_source' => 3,//3项目

app/command/ImportOrderFromCHandleData.php

@@ -232,6 +232,7 @@ class ImportOrderFromCHandleData extends Command
                         "remark" => $remark,
                         "is_stock" => $is_stock,
                         "is_activity" => $is_activity === "" ? 0 : $is_activity,
+                        'activity_code' => $extend_data['activity_code'],
                         "order_type" => $order_type,
                         "order_source" => $order_source,
 //                "poNo"=>$poNo,