edit

SiteCore/Handler/sync.order.cs

@@ -66,7 +66,7 @@ namespace SiteCore.Handler
             //CeErpTradeCell entity = CeErpTradeCell.GetByCtid("2484048723252587257");
             //int sid = commonHelper.autoDistributeToSupplier(entity);
             // string a  = apiHelper.API_GetPrintData("YT8951457355085");
-            //tmcHelper.Api_TmcTradeMsg("{\"content\":{\"businessType\":\"GUARANTEE\",\"buyerMemo\":\"\",\"consolidateType\":\"\",\"createTime\":1744213772000,\"deliveryType\":\"OFFLINE\",\"discountFee\":0.0,\"flag\":\"NONE\",\"latestDeliveryTime\":1744818568000,\"lines\":[{\"mark2\":[],\"num\":1,\"outerId\":\"\",\"payment\":270.0,\"picUrl\":\"https://img.alicdn.com/bao/uploaded/i2/2214103531955/O1CN01DdUiJW1QJRIWIiuyV_!!0-item_pic.jpg\",\"platServiceFee\":0.0,\"price\":30.0,\"refOlId\":\"4295347347682697938\",\"refSkuId\":\"0\",\"refSpuId\":\"795632307774\",\"refundStatus\":\"NO_REFUND\",\"sellPrice\":30.0,\"singleFee\":270.0,\"spuOuterId\":\"\",\"standards\":\"\",\"status\":\"NOT_SHIPPED\",\"title\":\"【优惠价】纸质书签定制古风可手写硬卡纸制作来图定做创意卡片打印logo高档异形卡书法古典标签小卡印刷中国风文创设计\",\"totalFee\":270.0,\"totalPrice\":30.0,\"totalSellPrice\":30.0}],\"logisticsOrderNo\":\"\",\"mark2\":[],\"modifyTime\":1744213828000,\"openBuyerId\":\"AAHnRHraABkUZRPgSx30RW3E\",\"openBuyerNick\":\"s**\",\"openSellerNick\":\"福同鑫旗舰店\",\"orderSource\":\"SYNC\",\"orderTime\":1744212346000,\"payTime\":1744213768000,\"payment\":270.0,\"platServiceFee\":0.0,\"posCode\":\"futongxin\",\"posId\":613307,\"postFee\":240.0,\"props\":{\"payType\":\"ALI_PAY\",\"govSubsidyAmount\":0},\"receivedPayment\":0.0,\"receiverCity\":\"成都市\",\"receiverCountry\":\"中国\",\"receiverDistrict\":\"成华区\",\"receiverId\":\"d3709f8bce7faa8f6cc4587ff26feb66$\",\"receiverState\":\"四川省\",\"receiverTown\":\"猛追湾街道\",\"refOid\":\"4295347347682697938\",\"refType\":\"TMALL\",\"refundStatus\":\"NO_REFUND\",\"sellerMemo\":\"40x110mm-1000张-卡片-300克铜板纸-双面印刷覆哑膜直角裁切-summer67821-条条-打孔配流苏\",\"serviceFee\":0.0,\"status\":\"NOT_SHIPPED\",\"totalFee\":270.0,\"totalPrice\":30.0,\"totalSellPrice\":30.0,\"type\":\"SALE\"}}");
+            //tmcHelper.Api_TmcTradeMsg("{\"content\":{\"businessType\":\"GUARANTEE\",\"buyerMemo\":\"\",\"consolidateType\":\"\",\"createTime\":1744776673000,\"deliveryType\":\"OFFLINE\",\"discountFee\":15.0,\"flag\":\"YELLOW\",\"latestDeliveryTime\":1744949468000,\"lines\":[{\"mark2\":[],\"num\":1,\"outerId\":\"ALBGJ_1\",\"payment\":15.0,\"picUrl\":\"https://img.alicdn.com/bao/uploaded/i4/2233288693/O1CN01vImzW92E5Riiut2OS_!!2233288693.jpg\",\"platServiceFee\":0.0,\"price\":30.0,\"refOlId\":\"4303406414239764408\",\"refSkuId\":\"4818107244523\",\"refSpuId\":\"660415484506\",\"refundStatus\":\"REFUNDING\",\"sellPrice\":15.0,\"singleFee\":15.0,\"spuOuterId\":\"ALBGJ_1\",\"standards\":\"定制（尺寸图案logo二维码）\",\"status\":\"NOT_SHIPPED\",\"title\":\"珠宝开单卡定制玉石文玩售后服务卡片淘宝翡翠抖音直播间标签贴纸\",\"totalFee\":15.0,\"totalPrice\":30.0,\"totalSellPrice\":15.0}],\"logisticsOrderNo\":\"\",\"mark2\":[],\"modifyTime\":1744857847000,\"openBuyerId\":\"AAHZRHraABkUZRPgSx3O0f6_\",\"openBuyerNick\":\"路**\",\"openSellerNick\":\"米笛儿旗舰店\",\"orderSource\":\"SYNC\",\"orderTime\":1744776665000,\"payTime\":1744776668000,\"payment\":15.0,\"platServiceFee\":0.0,\"posCode\":\"midier\",\"posId\":598777,\"postFee\":0.0,\"props\":{\"payType\":\"ALI_PAY\",\"govSubsidyAmount\":0},\"receivedPayment\":0.0,\"receiverCity\":\"杭州市\",\"receiverCountry\":\"中国\",\"receiverDistrict\":\"萧山区\",\"receiverId\":\"b9e96393fff0e146e86ca91106043bfa$\",\"receiverState\":\"浙江省\",\"receiverTown\":\"城厢街道\",\"refOid\":\"4303406414239764408\",\"refType\":\"TMALL\",\"refundStatus\":\"PART_REFUNDED\",\"sellerMemo\":\"补差价：4303338699442764408-路飞二档\",\"serviceFee\":0.0,\"status\":\"NOT_SHIPPED\",\"totalFee\":15.0,\"totalPrice\":30.0,\"totalSellPrice\":15.0,\"type\":\"SALE\"}}");
             //refundTmcHelper.Api_TmcRefundMsg("{\"content\":{\"afterStatus\":\"SUCCESS\",\"createTime\":1735287446000,\"desc\":\"\",\"interceptInvestor\":\"NONE\",\"interceptStatus\":\"NONE\",\"interceptType\":\"NONE\",\"lines\":[{\"num\":2,\"outerId\":\"\",\"price\":50.0,\"refAid\":\"313001208133750610\",\"refAlId\":\"313001208133750610\",\"refBoughtSkuId\":\"\",\"refOid\":\"4181722704291751006\",\"refOlId\":\"4181722704291751006\",\"refSkuId\":\"0\",\"refSpuId\":\"865893808768\",\"refundFee\":98.86,\"refundStatus\":\"SUCCESS\",\"title\":\"新年会抽奖券定制2025蛇年公司活动正副可撕代金券打印纪念票根奖品兑换尾牙晚宴邀请卡号码牌创意入场券设计\",\"totalFee\":98.86,\"type\":1}],\"logisticsCompany\":\"\",\"logisticsOrderNo\":\"\",\"mark2\":[],\"openBuyerNick\":\"0**\",\"openSellerNick\":\"万慕办公旗舰店\",\"posCode\":\"wanmu\",\"posId\":598798,\"reason\":\"订单信息拍错（规格/尺码/颜色等）\",\"receiverCity\":\"\",\"receiverCountry\":\"中国\",\"receiverDistrict\":\"\",\"receiverId\":\"\",\"receiverState\":\"\",\"receiverTown\":\"\",\"receiverZip\":\"\",\"refAid\":\"313001208133750610\",\"refOid\":\"4181722704291751006\",\"refPlatform\":\"TB\",\"refType\":\"TMALL\",\"refundCreateTime\":1735287358000,\"refundFee\":\"98.86\",\"refundPhase\":\"ON_SALE\",\"refundTime\":1735289443000,\"refundUpdateTime\":1735289443000,\"refundVersion\":1735287358100,\"senderAddress\":\"\",\"senderCity\":\"\",\"senderCountry\":\"中国\",\"senderDistrict\":\"\",\"senderMobile\":\"\",\"senderName\":\"\",\"senderPhone\":\"\",\"senderState\":\"\",\"senderTown\":\"\",\"senderZip\":\"\",\"status\":\"SUCCESS\",\"statusCode\":\"SUCCESS\",\"statusName\":\"退款成功\",\"totalFee\":\"98.86\",\"type\":\"REFUND\",\"updateTime\":1735289479000}}");
             List<string> lw = new List<string>();
             string tid = GetPostString("ctid");
@@ -5887,7 +5887,7 @@ namespace SiteCore.Handler
                     //string comCode = cpCode.Split('-')[0].ToString();
                     string apires = "";
                     string supplierName = commonHelper.getSupplierNameById(entity.SupplierId);
-                    if (!string.IsNullOrEmpty(isTogether) && Convert.ToInt32(isTogether) == 1)
+                    if ((!string.IsNullOrEmpty(isTogether) && Convert.ToInt32(isTogether) == 1) || (!string.IsNullOrEmpty(isTogether) && Convert.ToInt32(isTogether) == 0) || string.IsNullOrEmpty(isTogether))
                     {
                         if (ctid.IndexOf("N") != -1)
                         {
@@ -5939,10 +5939,17 @@ namespace SiteCore.Handler
                                     commonHelper.sendCytExpress(exinfo);
                                 }
                                 LogHelper.addLog(ctid, CurrentUser.UserID, "发货成功-" + cpCode + "-" + curUseWayBillCode);
+                                if (!string.IsNullOrEmpty(isTogether))
+                                {
+                                    if (Convert.ToInt32(isTogether) > 0)
+                                    {
+                                        StringBuilder sqlsb = new StringBuilder();
+                                        sqlsb.AppendFormat("update ce_erptradecell with(rowlock) set OrderState=7,OutSid='{2}' where tid='{0}' and OrderState=6 and SupplierId={1}", entity.tid, entity.SupplierId, curUseWayBillCode);
+                                        DbHelper.DbConn.ExecuteNonQuery(sqlsb.ToString());
+                                    }
+                                }
                                 //CeErpDataSendOrderInfo.createObject(entity.ctid);
-                                StringBuilder sqlsb = new StringBuilder();
-                                sqlsb.AppendFormat("update ce_erptradecell with(rowlock) set OrderState=7,OutSid='{2}',FinishDeliveryTime=GETDATE(),UpdateTime=GETDATE(),IsReturn=0,MemoOpt=0 where tid='{0}' and OrderState=6 and SupplierId={1}", entity.tid, entity.SupplierId, curUseWayBillCode);
-                                DbHelper.DbConn.ExecuteNonQuery(sqlsb.ToString());
+
 
                             }
                             catch (Exception ex)
@@ -10733,6 +10740,12 @@ namespace SiteCore.Handler
                 {
                     if (entity.OrderState == -1)
                     {
+                        CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(entity.ctid);
+                        if (string.IsNullOrEmpty(ceErpTradeCellExtend.spu_id))
+                        {
+                            returnErrorMsg("订单spu没有确认无法通过审核！");
+                            return;
+                        }
                         if (entity.FinishPlaceTime == null)
                         {
                             entity.OrderState = 2;

SiteCore/taobao/commonHelper.cs

@@ -2668,5 +2668,39 @@ namespace SiteCore
 
             return responseStr;
         }
+
+        public static void setSpuData(CeErpTrade father)
+        {
+            string orderSql = string.Format("SELECT * FROM [dbo].[CE_ErpTradeOrder] WHERE tid = '{0}' and total_fee > 0", father.tid);
+            DataTable table = SqlHelper.ExecuteDataSet(orderSql).Tables[0];
+            string spu_id = "";
+            if (table != null && table.Rows.Count == 1)
+            {
+                spu_id = table.Rows[0]["spu_id"].ToString();
+            }
+            string cellSql = string.Format("SELECT ctid FROM [dbo].[CE_ErpTradeCell] WHERE tid = '{0}'", father.tid);
+            DataTable data = SqlHelper.ExecuteDataSet(cellSql).Tables[0];
+            if (data != null && data.Rows.Count > 0)
+            {
+                foreach (DataRow row in data.Rows)
+                {
+                    CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(row["ctid"].ToString());
+                    if (ceErpTradeCellExtend == null)
+                    {
+                        ceErpTradeCellExtend = new CeErpTradeCellExtend();
+                        ceErpTradeCellExtend.ctid = row["ctid"].ToString();
+                    }
+                    ceErpTradeCellExtend.spu_id = spu_id;
+                    if (ceErpTradeCellExtend.ID == 0)
+                    {
+                        ceErpTradeCellExtend.Create();
+                    }
+                    else
+                    {
+                        ceErpTradeCellExtend.Update();
+                    }
+                }
+            }
+        }
     }
 }

SiteCore/taobao/tmcHelper.cs

@@ -1021,6 +1021,7 @@ namespace SiteCore
 
                     entity.Create();
                     CeErpTradeCellExtend.createInfo(entity.ctid);
+                    commonHelper.setSpuData(trade);
                 }
                 catch (Exception ex)
                 {
@@ -1516,6 +1517,7 @@ namespace SiteCore
                 CeErpSukuraData.createInfo(entity.ctid, 1);
                 //dataHelper.sendErpTradeCellInfo(new dataSendTradeCellBean(entity, father));
                 isNeedCellOrder = false;
+                commonHelper.setSpuData(father);
             }
             else if (smemo.IndexOf("拿样订单") != -1)
             {
@@ -1573,6 +1575,7 @@ namespace SiteCore
                 CeErpSukuraData.createInfo(entity.ctid, 1);
                 //dataHelper.sendErpTradeCellInfo(new dataSendTradeCellBean(entity, father));
                 isNeedCellOrder = false;
+                commonHelper.setSpuData(father);
             }
 
 
@@ -1694,36 +1697,7 @@ namespace SiteCore
                     }
 
                 }
-                string orderSql = string.Format("SELECT * FROM [dbo].[CE_ErpTradeOrder] WHERE tid = '{0}' and total_fee > 0", father.tid);
-                DataTable table = SqlHelper.ExecuteDataSet(orderSql).Tables[0];
-                string spu_id = "";
-                if (table != null && table.Rows.Count == 1)
-                {
-                    spu_id = table.Rows[0]["spu_id"].ToString();
-                }
-                string cellSql = string.Format("SELECT ctid FROM [dbo].[CE_ErpTradeCell] WHERE tid = '{0}'", father.tid);
-                DataTable data = SqlHelper.ExecuteDataSet(cellSql).Tables[0];
-                if (data != null && data.Rows.Count > 0)
-                {
-                    foreach (DataRow row in data.Rows)
-                    {
-                        CeErpTradeCellExtend ceErpTradeCellExtend = CeErpTradeCellExtend.getByTid(row["ctid"].ToString());
-                        if (ceErpTradeCellExtend == null)
-                        {
-                            ceErpTradeCellExtend = new CeErpTradeCellExtend();
-                            ceErpTradeCellExtend.ctid = row["ctid"].ToString();
-                        }
-                        ceErpTradeCellExtend.spu_id = spu_id;
-                        if (ceErpTradeCellExtend.ID == 0)
-                        {
-                            ceErpTradeCellExtend.Create();
-                        }
-                        else
-                        {
-                            ceErpTradeCellExtend.Update();
-                        }
-                    }
-                }
+                commonHelper.setSpuData(father);
                 //autoCell(tid);
             }
 

Web/EOrder/js/p_order.js

@@ -1345,6 +1345,10 @@ function onCopyUpLoaderUrl(e) {
         showToast("订单不符合要求，无法外链");
         return;
     }
+    if (rec.OrderState == -1) {
+        showToast("待审核订单不符合要求，无法外链");
+        return;
+    }
     let url = 'https://file.lingtao8.com/?tid=' + rec.ctid + "&userId=" + rec.CustomerUserId;
     copyTextPlus(url);
 }