zhuyiyi 2 months ago
parent
commit
ac82e2d923
3 changed files with 16 additions and 3 deletions
  1. 10 2
      SiteCore/Handler/sync.order.cs
  2. 4 0
      SiteCore/taobao/apiCaiYingTong.cs
  3. 2 1
      ecomServer/MainForm.cs

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

@@ -66,7 +66,7 @@ namespace SiteCore.Handler
             DataStruct dStruct = GetPostStruct();
 
             //string a = SecurityHelper.DecryptSymmetric("BnK3+504SQ8=");
-            //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\新建文件夹\\tj21hf.psd");
+            //jiemiUtils.ossFileDecrypt("C:\\Users\\231010\\Downloads\\(250924170328638492)-210x140mm-10个-UV转印贴彩色模切-GL-gzb520gzb-广东省-龙井《4765947843000325546-琳19890725》.ai");
             //apiHelper.Api_SyncOrderByTime("598825");
             //apiHelper.API_GetWaybill("ZTO-CAINIAO-TZJK", "4233447147588233939");
             //apiHelper.Api_SyacOrder("2460143282114312263", "yujia");
@@ -228,7 +228,15 @@ namespace SiteCore.Handler
             };
 
             string shopname = GetPostString("shopname");
-            if (shopname.Length > 0) lw.Add(string.Format("seller_nick = '{0}'", shopname));
+            if (shopname.Length > 0)
+            {
+                CeErpShop ceErpShop = CeErpShop.GetShopIdByName(shopname);
+                if(ceErpShop != null)
+                {
+                    lw.Add(string.Format("shopId = {0}", ceErpShop.ID));
+                }
+                
+            }
 
             string addwechat = GetPostString("addwechat");
             if (addwechat.Length > 0)

+ 4 - 0
SiteCore/taobao/apiCaiYingTong.cs

@@ -333,6 +333,10 @@ namespace SiteCore.Handler
             string cpCode = GetString("cpCode");
 
             CeErpTradeCell entity = CeErpTradeCell.GetByCtid(tid);
+            if (entity == null)
+            {
+                entity = CeErpTradeCell.GetByCode(tid);
+            }
             if (entity != null)
             {
                 bool isUseLastWayBillCode = true;

+ 2 - 1
ecomServer/MainForm.cs

@@ -123,6 +123,7 @@ namespace ErpServer
                                  typeof(CeErpDesignInfo),
                                  typeof(shopInfo),
                                  typeof(CeErpTradeCellExtend),
+                                 typeof(CeErpInvoice),
                                  typeof(CeErpTradeSpu),
                                  typeof(CeErpSukuraData),
                                  typeof(CeErpTradeAfterSaleLog)
@@ -152,7 +153,7 @@ namespace ErpServer
         string dinggaolvSync = "";
         string unusualSync = "";
         string refundSync = "";
-        
+
 
         private void MainForm_Load(object sender, EventArgs e)
         {