zhuyiyi il y a 9 mois
Parent
commit
aef307e435

+ 11 - 0
BizCom/Dao/CeErpExpressInfo.cs

@@ -191,6 +191,17 @@ namespace BizCom
             set { _isMultiDelivery = value; }
         }
 
+        private string _postData = "";
+
+        /// <summary>
+        ///Ă澼ĘýžÝ
+        /// </summary>
+        [Property]
+        public string postData
+        {
+            get { return _postData; }
+            set { _postData = value; }
+        }
 
         public static CeErpExpressInfo GetByCtid(string ctid)
         {

+ 11 - 0
BizCom/Dao/CeErpTrade.cs

@@ -484,6 +484,17 @@ namespace BizCom
             get { return _attachments; }
             set { _attachments = value; }
         }
+
+        private string _receiverId = "";
+        /// <summary>
+        /// ÊÕ»õÈËid
+        /// </summary>
+        [Property]
+        public string receiverId
+        {
+            get { return _receiverId; }
+            set { _receiverId = value; }
+        }
         public object Clone()
         {
             return this.MemberwiseClone();

+ 4 - 2
SiteCore/Handler/sync.order.cs

@@ -5909,13 +5909,14 @@ namespace SiteCore.Handler
                             //还要插入快递信息到 快递信息表
                             CeErpExpressInfo exinfo = new CeErpExpressInfo();
                             exinfo.tid = entity.ctid;
-                            exinfo.out_sid = entity.OutSid;
+                            exinfo.out_sid = curUseWayBillCode;
                             exinfo.company_code = cpCode;
                             exinfo.company_name = cpName;
                             exinfo.supplierUserName = commonHelper.getSupplierNameById(entity.SupplierId);
                             exinfo.deliveryType = "发货成功";
                             exinfo.print_time = DateTime.Now;
                             exinfo.printUser = CurrentUser.UserName;
+                            exinfo.postData = pData_str;
                             exinfo.Create();
                             commonHelper.UpdateRelationOrder(entity.ctid);
                             CeErpSukuraData.createInfo(ctid, 4);
@@ -5971,13 +5972,14 @@ namespace SiteCore.Handler
 
                         CeErpExpressInfo exinfo = new CeErpExpressInfo();
                         exinfo.tid = entity.ctid;
-                        exinfo.out_sid = entity.OutSid;
+                        exinfo.out_sid = curUseWayBillCode;
                         exinfo.company_code = cpCode;
                         exinfo.company_name = cpName;
                         exinfo.supplierUserName = commonHelper.getSupplierNameById(entity.SupplierId);
                         exinfo.deliveryType = "发货成功";
                         exinfo.print_time = DateTime.Now;
                         exinfo.printUser = CurrentUser.UserName;
+                        exinfo.postData = pData_str;
                         exinfo.Create();
                         commonHelper.UpdateRelationOrder(entity.ctid);
                         CeErpSukuraData.createInfo(entity.ctid, 4);

+ 2 - 0
SiteCore/taoObj/api_trade_info.cs

@@ -11,6 +11,8 @@ namespace SiteCore.taoObj
         public BizOrder bizOrder { get; set; }
         public class BizOrder
         {
+            public string receiverId { get; set; }
+
             /// <summary>
             /// 下单平台的订单id
             /// </summary>

+ 1 - 0
SiteCore/taobao/preSalesHelper.cs

@@ -2219,6 +2219,7 @@ namespace SiteCore.Handler
                 trade = new CeErpTrade();
                 trade.tid = bizOrder.thirdOrderId;
                 trade.type = bizOrder.orderPlatform;
+                trade.receiverId = bizOrder.receiverId;
                 if (!string.IsNullOrEmpty(bizOrder.payAmount))
                 {
                     trade.price = Convert.ToDouble(bizOrder.payAmount);

+ 1 - 0
SiteCore/taobao/tmcHelper.cs

@@ -462,6 +462,7 @@ namespace SiteCore
             trade.buyer_id = GetNull_tostring(tObj.openBuyerId);
             trade.receiver_state = tObj.receiverState;
             trade.receiver_city = tObj.receiverCity;
+            trade.receiverId = tObj.receiverId;
             trade.receiver_town = GetNoNullValue_string(tObj.receiverTown);
             trade.receiver_district = GetNoNullValue_string(tObj.receiverDistrict);
             if (trade.type == "JD" && tObj.status == "CANCEL")