edit

SiteCore/taoObj/api_userId_response.cs

@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+
+namespace SiteCore.taoObj
+{
+    public class api_userId_response
+    {
+
+        public Response response { get; set; }
+
+        public class Response
+        {
+            /// <summary>
+            /// 
+            /// </summary>
+            public Data data { get; set; }
+            /// <summary>
+            /// 
+            /// </summary>
+            public string success { get; set; }
+            public int code { get; set; }
+        }
+
+        public class Data
+        {
+            /// <summary>
+            /// 
+            /// </summary>
+            public List<ContentItem> content { get; set; }
+        }
+
+        public class ContentItem
+        {
+            /// <summary>
+            /// 
+            /// </summary>
+            public string buyerOpenUid { get; set; }
+            /// <summary>
+            /// 
+            /// </summary>
+            public string buyerNick { get; set; }
+            /// <summary>
+            /// 
+            /// </summary>
+        }
+
+
+
+
+
+
+    }
+}

SiteCore/taobao/apiHelper.cs

@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using NHibernate.Type;
+using SiteCore.taoObj;
 using SQLData;
 using System;
 using System.Collections.Generic;
@@ -437,5 +438,35 @@ namespace SiteCore
             return res;
         }
 
+        public static string API_GetUserId(string waybillCode, string nickName)
+        {
+            var res_obj = new
+            {
+                posCode = waybillCode,
+                buyerNicks = nickName
+            };
+            string ro_json = JsonConvert.SerializeObject(res_obj);
+
+            string res = Base_Request(ro_json, "ds.tb.user.openuid.get");
+            if (res == "")
+            {
+                return "";
+            }
+            try
+            {
+                api_userId_response api = JsonConvert.DeserializeObject<api_userId_response>(res);
+                if (api != null && api.response.code == 200 && api.response.data.content != null && api.response.data.content.Count > 0)
+                {
+                    return api.response.data.content[0].buyerOpenUid;
+                }
+            }
+            catch (Exception ex)
+            {
+
+            }
+
+            return "";
+        }
+
     }
 }

SiteCore/taobao/commonHelper.cs

@@ -268,7 +268,7 @@ namespace SiteCore
                     //用昵称找之前的订单
                     string name = ceErpTrade.buyer_nick;
                     StringBuilder CeErpTradeSql = new StringBuilder();
-                    CeErpTradeSql.AppendFormat("select top 1 * from ce_erptrade where buyer_nick='{0}' order by created desc;", name);
+                    CeErpTradeSql.AppendFormat("select top 1 * from ce_erptrade where buyer_nick='{0}' and tid <> '{1}' order by created desc;", name, trade.tid);
                     DataSet data = DbHelper.DbConn.ExecuteDataset(CeErpTradeSql.ToString());
                     DataTable datatable = data.Tables[0];
 
@@ -1801,7 +1801,7 @@ namespace SiteCore
             }
             return new designApiResponseVo(-1, check_info);
         }
-
+        static List<int> products = new List<int>() { 29, 2489, 2500, 2501, 2502, 2503, 2504, 2505, 2506, 2507, 2533, 2534, 2539, 2558, 2576, 2577, 2578, 2579, 2580, 2581, 2582, 2583, 2584, 2585, 2586, 2587, 2588, 2589, 2590, 2591, 2592, 2593, 2594, 2595, 2596, 2597, 2598, 2599, 2600, 2601, 2602, 2603, 2604, 2615, 2616, 2617, 2618, 2619, 2620, 2621, 2622, 2634, 2639, 2644, 2645, 2646, 2648, 2649, 2650 };
         public static designApiResponseVo checkOrderDesignInfo(CeErpTradeCell ceErpTradeCell, string post = "")
         {
             if (ceErpTradeCell.DispatchSort == 2)
@@ -1833,7 +1833,7 @@ namespace SiteCore
                 DataTable data = DbHelper.DbConn.ExecuteDataset(info_sql).Tables[0];
                 int a = Convert.ToInt32(data.Rows[0]["total"]);
                 bool drop = false;
-                if (DateTime.Now.Hour >= 17 && DateTime.Now.Hour <= 7 && ceErpTradeCell.ProductId == 29 && (ceErpTradeCell.ShopId == 14 || ceErpTradeCell.ShopId == 56))
+                if (DateTime.Now.Hour >= 17 && DateTime.Now.Hour <= 7 && products.IndexOf(ceErpTradeCell.ProductId) > -1 && (ceErpTradeCell.ShopId == 14 || ceErpTradeCell.ShopId == 56))
                 {
                     drop = false;
                 }
@@ -1848,7 +1848,7 @@ namespace SiteCore
                 }
 
                 //卡片五款
-                if (ceErpTradeCell.ProductId == 29 && ceErpTradeCell.ShopId > 0)
+                if (products.IndexOf(ceErpTradeCell.ProductId) > -1 && ceErpTradeCell.ShopId > 0)
                 {
                     bool num_bool = true;
                     bool size_bool = false;
@@ -2012,6 +2012,10 @@ namespace SiteCore
         {
             try
             {
+                if (entity.seller_memo.IndexOf("种子纸") > -1)
+                {
+                    return;
+                }
                 CeErpProduct cp = CeErpProduct.GetById(entity.ProductId);
                 double price = 0;
                 if (cp == null)

Web/EDelivery/PddDelivering.aspx

@@ -43,7 +43,7 @@
                 <div field="CheckMemo" width="50" align="center" headeralign="center">查单备注</div>
                 <div name="address" width="80" align="center" headeralign="center" renderer="addressRenderer">收货地址</div>
                 <div name="orderscus" width="60" align="center" headeralign="center" renderer="orderCusRenderer">供应商</div>
-                <div field="AfterSaleMethod" width="80" align="center" headeralign="center">售后方案</div>
+                <div field="AfterSaleMethod" id="id_AfterSaleMethod" runat="server" visible="false" width="80" align="center" headeralign="center">售后方案</div>
 
                 <div field="UnusualCon" width="50" align="center" headeralign="center">异常解释</div>
                 <div name="orderstatus" width="50" align="center" headeralign="center" renderer="orderStatusRenderer">状态</div>

Web/EDelivery/PddDelivering.aspx.cs

@@ -38,6 +38,7 @@ public partial class EDelivery_PddDelivering : BasePage
             //id_makeSupplier.Visible = false;
             id_othermemo.Visible = false;
             id_payment_cyt.Visible = false;
+            id_AfterSaleMethod.Visible = false;
         }
         else
         {
@@ -47,6 +48,7 @@ public partial class EDelivery_PddDelivering : BasePage
             //id_makeSupplier.Visible = true;
             id_othermemo.Visible = true;
             id_payment_cyt.Visible = true;
+            id_AfterSaleMethod.Visible = true;
         }
         if (CurrentUser.UserPost.Post.Code != "AfterSale" || CurrentUser.UserPost.Post.Code == "AfterSaleMaster")
         {

Web/EDelivery/WaitingDelivery.aspx

@@ -43,7 +43,7 @@
                 <div field="CheckMemo" width="50" align="center" headeralign="center">查单备注</div>
                 <div name="address" width="80" align="center" headeralign="center" renderer="addressRenderer">收货地址</div>
                 <div name="orderscus" width="60" align="center" headeralign="center" renderer="orderCusRenderer">供应商</div>
-                <div field="AfterSaleMethod" width="80" align="center" headeralign="center">售后方案</div>
+                <div field="AfterSaleMethod" id="id_AfterSaleMethod" runat="server" visible="false" width="80" align="center" headeralign="center">售后方案</div>
 
                 <div field="UnusualCon" width="50" align="center" headeralign="center">异常解释</div>
                 <div name="orderstatus" width="50" align="center" headeralign="center" renderer="orderStatusRenderer">状态</div>

Web/EDelivery/WaitingDelivery.aspx.cs

@@ -37,6 +37,7 @@ public partial class EDelivery_WaitingDelivery : BasePage
             id_assignSupplier.Visible = false;
             //id_makeSupplier.Visible = false;
             id_othermemo.Visible = false;
+            id_AfterSaleMethod.Visible = false;
             id_payment_cyt.Visible = false;
         }
         else
@@ -47,6 +48,7 @@ public partial class EDelivery_WaitingDelivery : BasePage
             //id_makeSupplier.Visible = true;
             id_othermemo.Visible = true;
             id_payment_cyt.Visible = true;
+            id_AfterSaleMethod.Visible = true;
         }
         if (CurrentUser.UserPost.Post.Code != "AfterSale" || CurrentUser.UserPost.Post.Code == "AfterSaleMaster")
         {

Web/EOrder/OrderList.aspx

@@ -66,11 +66,6 @@
                 height: auto;
             }
     </style>
-    <script>
-        function openFile() {
-            window.location.href = 'file:///C:/Users/231010/Downloads/(N_20241014173145C)-测试.cdr';
-        }
-    </script>
     </asp:Content>
     <asp:Content ID="Content2" ContentPlaceHolderID="btn" runat="Server">
         <a class="mini-button mini-button-primary new_use_btn_blue" iconcls="icon-ok" onclick="getMyOrder()">领单</a>
@@ -93,7 +88,6 @@
         <a id="btnOrderReset" runat="server" visible="false" class="mini-button mini-button-danger new_use_btn_red" iconcls="icon-reload" onclick="resetFn()">重置</a>
         <a id="btnOrderDelete" runat="server" visible="false" class="mini-button mini-button-danger new_use_btn_red" iconcls="icon-stop" onclick="deleteFn()">删除</a>
         <a id="btnClearRefund" runat="server" visible="false" class="mini-button mini-button-danger new_use_btn_red" iconcls="icon-remove" onclick="clearRefundFn()">清空退款状态</a>
-        <a runat="server" class="mini-button mini-button-danger new_use_btn_red" iconcls="icon-remove" onclick="openFile()">cese</a>
         <div class="hz">
             <div style="margin-left: 10px;" id="id_gatherPayment">(0)</div>
         </div>

Web/EOrder/Order_Detail.aspx

@@ -44,7 +44,7 @@
             if (tradeData != null && tradeData.length > 0) {
                 var tData = tradeData[0];
                 $("#detailMemo").html("备注：" + tData.seller_memo);
-                $("#productId").html("商品id：" + tData.ProductId);
+                $("#productId").html("商品id：" + tData.ProductName);
                 var afhtml = "";
                 if (tData.AfterSaleState > 0 && tData.status != "CLOSE") {
                     if (tData.AfterSaleState == 4) {