1

BBWY.Client/BBWY.Client.csproj

@@ -1,7 +1,7 @@
     <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Resources\Images\bbwylogo.ico</ApplicationIcon>

BBWY.Client/ViewModels/Order/OrderListVoewModel_DongDong.cs

@@ -61,8 +61,8 @@ namespace BBWY.Client.ViewModels
                 if (order == null)
                     order = OrderList.FirstOrDefault(o => !string.IsNullOrEmpty(o.BuyerAccount)
                                                           && o.BuyerAccount == buyerAccount
-                                                          && order.Consignee != null
-                                                          && !order.Consignee.IsDecode);
+                                                          && o.Consignee != null
+                                                          && !o.Consignee.IsDecode);
 
                 if (order == null || order.Consignee == null || order.Consignee.IsDecode)
                     return;

BBWY.Server.Business/PlatformSDK/JDBusiness.cs

@@ -696,6 +696,28 @@ namespace BBWY.Server.Business
             }
         }
 
+        private void RollBackWhenStartPromotionError(DeleteSkuListRequest deleteSkuRequest, StartPromotionTaskRequest2 startRequest, string brandName, bool haveGiftTemplateSku)
+        {
+            var jdClient = GetJdClient(deleteSkuRequest.AppKey, deleteSkuRequest.AppSecret);
+
+            #region 设置完整标题
+            {
+                var req = new WareWriteUpdateWareTitleRequest();
+                req.wareId = long.Parse(startRequest.MainProductSpu);
+                if (!startRequest.FullTitle.StartsWith(brandName))
+                    req.title = $"{brandName}{startRequest.FullTitle}";
+                else
+                    req.title = startRequest.FullTitle;
+                var response = jdClient.Execute(req, startRequest.AppToken, DateTime.Now.ToLocalTime());
+                if (response.IsError)
+                    throw new BusinessException($"设置完整标题出错-{(string.IsNullOrEmpty(response.ErrorMsg) ? response.ErrMsg : response.ErrorMsg)}");
+            }
+            #endregion
+
+            if (haveGiftTemplateSku)
+                DeleteSkuList(deleteSkuRequest);
+        }
+
         /// <summary>
         /// 添加JD促销活动sku
         /// </summary>
@@ -918,7 +940,7 @@ namespace BBWY.Server.Business
                             wareId = wareId,
                             //skuId = long.Parse(sku.Id),
                             jdPrice = giftSku.Price ?? 0,
-                            stockNum = 500,
+                            stockNum = 9999,
                             barCode = barCode,
                             saleAttrs = new List<SkuWriteUpdateSkusItemSaleAttrs>()
                         {
@@ -1012,6 +1034,37 @@ namespace BBWY.Server.Business
                     }
                     #endregion
 
+                    #region 设置sku全国仓库存
+                    {
+                        stepText = "设置sku全国仓库存";
+                        try
+                        {
+                            foreach (var giftSkuId in giftSkuIdList)
+                            {
+                                var req = new StockWriteUpdateSkuStockRequest();
+                                req.skuId = long.Parse(giftSkuId);
+                                req.stockNum = 9999;
+                                req.storeId = 0;
+                                var res = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime());
+                                if (res.IsError)
+                                    throw new BusinessException($"设置全国仓库存失败-{(string.IsNullOrEmpty(res.ErrorMsg) ? res.ErrMsg : res.ErrorMsg)}");
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            RollBackWhenStartPromotionError(new DeleteSkuListRequest()
+                            {
+                                AppKey = request.AppKey,
+                                AppSecret = request.AppSecret,
+                                AppToken = request.AppToken,
+                                Platform = request.Platform,
+                                SkuList = giftSkuIdList
+                            }, request, brandName, haveGiftTemplateSku);
+                            throw ex;
+                        }
+                    }
+                    #endregion
+
                     #endregion
 
                     #region 查询上架的赠品
@@ -1051,8 +1104,7 @@ namespace BBWY.Server.Business
                         res.Json = JObject.Parse(res.Body);
                     if (res.IsError)
                     {
-                        if (haveGiftTemplateSku)
-                            DeleteSkuList(deleteGiftSkuRequest);
+                        RollBackWhenStartPromotionError(deleteGiftSkuRequest, request, brandName, haveGiftTemplateSku);
                         throw new BusinessException($"创建活动失败-{(string.IsNullOrEmpty(res.ErrorMsg) ? res.ErrMsg : res.ErrorMsg)}");
                     }
 
@@ -1098,8 +1150,7 @@ namespace BBWY.Server.Business
                     var res = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime());
                     if (res.IsError)
                     {
-                        if (haveGiftTemplateSku)
-                            DeleteSkuList(deleteGiftSkuRequest);
+                        RollBackWhenStartPromotionError(deleteGiftSkuRequest, request, brandName, haveGiftTemplateSku);
                         throw new BusinessException($"创建活动失败-{(string.IsNullOrEmpty(res.ErrorMsg) ? res.ErrMsg : res.ErrorMsg)}");
                     }
                 }
@@ -1115,9 +1166,7 @@ namespace BBWY.Server.Business
                     var res = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime());
                     if (res.IsError)
                     {
-                        if (haveGiftTemplateSku)
-                            DeleteSkuList(deleteGiftSkuRequest);
-
+                        RollBackWhenStartPromotionError(deleteGiftSkuRequest, request, brandName, haveGiftTemplateSku);
                         throw new BusinessException($"审核活动失败-{(string.IsNullOrEmpty(res.ErrorMsg) ? res.ErrMsg : res.ErrorMsg)}");
                     }
                 }