Browse Source

Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
d17602506f
  1. 4
      BBWY.JDSDK/Request/SkuWriteUpdateSkusRequest.cs
  2. 6
      BBWY.Server.API/Controllers/TestController.cs
  3. 122
      BBWY.Server.Business/PlatformSDK/JDBusiness.cs
  4. 1
      BBWY.Server.Business/Sync/OrderSyncBusiness.cs
  5. 43
      BBWY.Server.Business/TestBusiness.cs

4
BBWY.JDSDK/Request/SkuWriteUpdateSkusRequest.cs

@ -43,6 +43,8 @@ namespace Jd.Api.Request
public List<SkuWriteUpdateSkusItemSaleAttrs> multiCateProps { get; set; } public List<SkuWriteUpdateSkusItemSaleAttrs> multiCateProps { get; set; }
public int? promiseId { get; set; } public int? promiseId { get; set; }
public string saleAttrTemplateId { get; set; }
} }
public class SkuWriteUpdateSkusItemSaleAttrs public class SkuWriteUpdateSkusItemSaleAttrs
@ -57,5 +59,7 @@ namespace Jd.Api.Request
public List<string> attrValueAlias { get; set; } public List<string> attrValueAlias { get; set; }
public int index { get; set; } public int index { get; set; }
public List<int?> attrValuesSeqNo { get; set; }
} }
} }

6
BBWY.Server.API/Controllers/TestController.cs

@ -23,5 +23,11 @@ namespace BBWY.Server.API.Controllers
testBusiness.StatisticsProduct(); testBusiness.StatisticsProduct();
} }
[HttpPost]
public void XiuFu()
{
testBusiness.XiuFu();
}
} }
} }

122
BBWY.Server.Business/PlatformSDK/JDBusiness.cs

@ -1000,7 +1000,7 @@ namespace BBWY.Server.Business
for (var i = 0; i < request.GiftTemplateSkuList.Count(); i++) for (var i = 0; i < request.GiftTemplateSkuList.Count(); i++)
{ {
var giftSku = request.GiftTemplateSkuList[i]; var giftSku = request.GiftTemplateSkuList[i];
var colorProperty = colorSaleAttrs[takeColorIndex]; var colorPropertyValue = colorSaleAttrs[takeColorIndex];
var p = new SkuWriteUpdateSkusItem() var p = new SkuWriteUpdateSkusItem()
{ {
@ -1013,14 +1013,26 @@ namespace BBWY.Server.Business
outerId = $"{request.OuterId}{(i + 1).ToString().PadLeft(3, '0')}", outerId = $"{request.OuterId}{(i + 1).ToString().PadLeft(3, '0')}",
saleAttrs = new List<SkuWriteUpdateSkusItemSaleAttrs>() saleAttrs = new List<SkuWriteUpdateSkusItemSaleAttrs>()
{ {
new SkuWriteUpdateSkusItemSaleAttrs() //new SkuWriteUpdateSkusItemSaleAttrs()
//{
// type = "com.jd.pop.ware.ic.api.domain.Prop",
// attrId = colorProperty.Value<string>("attId"),
// attrValues = new List<string>() { colorProperty.Value<string>("id") },
// index = takeColorIndex,
// attrValuesSeqNo = new List<int?>(){ takeColorIndex }
//}
new SkuWriteUpdateSkusItemSaleAttrs()
{ {
type = "com.jd.pop.ware.ic.api.domain.Prop", type = "com.jd.pop.ware.ic.api.domain.Prop",
attrId = colorProperty.Value<string>("attId"), attrId = colorPropertyValue.Value<string>("attId"),
attrValues = new List<string>() { colorProperty.Value<string>("id") }, //attrValues = new List<string>() { colorPropertyValue.Value<string>("id") },
index = takeColorIndex attrValueAlias = new List<string>(){ giftSku.Title }, // colorPropertyValue.Value<string>("name")
index = takeColorIndex,
attrValuesSeqNo = new List<int?>(){ takeColorIndex }
} }
} },
saleAttrTemplateId = "POP_MODEL"
//promiseId = 30603710 //固定时效模板Id 48小时发货 //promiseId = 30603710 //固定时效模板Id 48小时发货
}; };
@ -1037,26 +1049,26 @@ namespace BBWY.Server.Business
} }
} }
//修改标题参数 ////修改标题参数
updateSkuTitleParamList.Add(new WareWriteUpdateWareSaleAttrvalueAliasRequestItem() //updateSkuTitleParamList.Add(new WareWriteUpdateWareSaleAttrvalueAliasRequestItem()
{ //{
attrId = p.saleAttrs[0].attrId, // attrId = p.saleAttrs[0].attrId,
attrValues = p.saleAttrs[0].attrValues, // attrValues = p.saleAttrs[0].attrValues,
attrValueAlias = new List<string>() { giftSku.Title } // attrValueAlias = new List<string>() { giftSku.Title }
}); //});
//修改商品细节图参数 ////修改商品细节图参数
var imgUrlBuilder = new StringBuilder(); //var imgUrlBuilder = new StringBuilder();
var imgIndexBuilder = new StringBuilder(); //var imgIndexBuilder = new StringBuilder();
imgUrlBuilder.Append($"{giftSku.Logo.Substring(giftSku.Logo.IndexOf("jfs"))},"); //imgUrlBuilder.Append($"{giftSku.Logo.Substring(giftSku.Logo.IndexOf("jfs"))},");
imgIndexBuilder.Append("1,"); //imgIndexBuilder.Append("1,");
imageWriteUpdateRequestList.Add(new ImageWriteUpdateRequest() //imageWriteUpdateRequestList.Add(new ImageWriteUpdateRequest()
{ //{
wareId = wareId, // wareId = wareId,
colorId = colorProperty.Value<string>("id"), // colorId = colorProperty.Value<string>("id"),
imgUrl = imgUrlBuilder.ToString().Trim(','), // imgUrl = imgUrlBuilder.ToString().Trim(','),
imgIndex = imgIndexBuilder.ToString().Trim(',') // imgIndex = imgIndexBuilder.ToString().Trim(',')
}); //});
takeColorIndex--; takeColorIndex--;
skusParamList.Add(p); skusParamList.Add(p);
@ -1127,27 +1139,55 @@ namespace BBWY.Server.Business
} }
} }
var newSkuList = res.Json["jingdong_sku_write_updateSkus_responce"]["skuList"].ToList().Select(x => x.Value<string>("skuId")).ToList(); var newSkuIdList = res.Json["jingdong_sku_write_updateSkus_responce"]["skuList"].ToList().Select(x => x.Value<string>("skuId")).ToList();
giftSkuIdList.AddRange(newSkuList); giftSkuIdList.AddRange(newSkuIdList);
}
#endregion
#region sku改名
{ var newSkuList = res.Json["jingdong_sku_write_updateSkus_responce"]["skuList"].ToList();
stepText = "sku改名"; var imgIndex = 1;
var req = new WareWriteUpdateWareSaleAttrvalueAliasRequest() StringBuilder colorBuilder = new StringBuilder();
StringBuilder imgUrlBuilder = new StringBuilder();
StringBuilder imgIndexBuilder = new StringBuilder();
foreach (var skuJToken in newSkuList)
{
var skuTitle = skuJToken["saleAttrs"][0]["attrValueAlias"][0].ToString();
var colorId = skuJToken["saleAttrs"][0]["attrValues"][0].ToString();
var currentImgIndex = imgIndex;
imgIndex++;
var giftSku = request.GiftTemplateSkuList.FirstOrDefault(x => x.Title == skuTitle);
var imgUrl = giftSku.Logo.Substring(giftSku.Logo.IndexOf("jfs"));
colorBuilder.Append($"{colorId},");
imgUrlBuilder.Append($"{imgUrl},");
imgIndexBuilder.Append($"{currentImgIndex},");
}
imageWriteUpdateRequestList.Add(new ImageWriteUpdateRequest()
{ {
wareId = wareId, wareId = wareId,
props = updateSkuTitleParamList colorId = colorBuilder.ToString().TrimEnd(','),
}; imgUrl = imgUrlBuilder.ToString().TrimEnd(','),
var res = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime()); imgIndex = imgIndexBuilder.ToString().TrimEnd(',')
if (res.Json == null) });
res.Json = JObject.Parse(res.Body);
if (res.IsError)
throw new BusinessException($"sku改名失败-{(string.IsNullOrEmpty(res.ErrorMsg) ? res.ErrMsg : res.ErrorMsg)}");
} }
#endregion #endregion
//#region sku改名
//{
// stepText = "sku改名";
// var req = new WareWriteUpdateWareSaleAttrvalueAliasRequest()
// {
// wareId = wareId,
// props = updateSkuTitleParamList
// };
// var res = jdClient.Execute(req, request.AppToken, DateTime.Now.ToLocalTime());
// if (res.Json == null)
// res.Json = JObject.Parse(res.Body);
// if (res.IsError)
// throw new BusinessException($"sku改名失败-{(string.IsNullOrEmpty(res.ErrorMsg) ? res.ErrMsg : res.ErrorMsg)}");
//}
//#endregion
#region sku修改细节图 #region sku修改细节图
stepText = "sku修改细节图"; stepText = "sku修改细节图";
foreach (var imageWriteUpdateRequest in imageWriteUpdateRequestList) foreach (var imageWriteUpdateRequest in imageWriteUpdateRequestList)

1
BBWY.Server.Business/Sync/OrderSyncBusiness.cs

@ -604,6 +604,7 @@ namespace BBWY.Server.Business
if (isNewOrder) if (isNewOrder)
{ {
dbOrder.OrderState = orderState; dbOrder.OrderState = orderState;
dbOrder.PreferentialAmount = preferentialAmount;
} }
else if ((orderState != null && orderState != dbOrder.OrderState) || else if ((orderState != null && orderState != dbOrder.OrderState) ||
buyerRemark != dbOrder.BuyerRemark || buyerRemark != dbOrder.BuyerRemark ||

43
BBWY.Server.Business/TestBusiness.cs

@ -8,6 +8,7 @@ using Microsoft.Extensions.Options;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq;
namespace BBWY.Server.Business namespace BBWY.Server.Business
{ {
@ -86,6 +87,48 @@ namespace BBWY.Server.Business
var filePath = Path.Combine(AppContext.BaseDirectory, "result.csv"); var filePath = Path.Combine(AppContext.BaseDirectory, "result.csv");
File.WriteAllLines(filePath, list, System.Text.Encoding.UTF8); File.WriteAllLines(filePath, list, System.Text.Encoding.UTF8);
} }
public void XiuFu()
{
var st = DateTime.Parse("2023-09-01");
var orderList = fsql.Select<OrderCoupon, Order>().InnerJoin((oc, o) => oc.OrderId == o.Id)
.Where((oc, o) => o.OrderState != Enums.OrderState. && o.StartTime >= st && o.PreferentialAmount == 0)
.GroupBy((oc, o) => oc.OrderId)
.ToList(g => new Order
{
Id = g.Key,
PreferentialAmount = g.Sum(g.Value.Item1.CouponPrice)
});
List<IUpdate<Order>> updateOrderList = new List<IUpdate<Order>>();
var totalCount = orderList.Count();
for (var i = 0; i < totalCount; i++)
{
var order = orderList[i];
updateOrderList.Add(fsql.Update<Order>(order.Id).Set(o => o.PreferentialAmount, order.PreferentialAmount));
if (updateOrderList.Count() == 50)
{
Console.WriteLine($"执行数据库更新 {i}/{totalCount}");
fsql.Transaction(() =>
{
foreach (var update in updateOrderList)
update.ExecuteAffrows();
});
updateOrderList.Clear();
}
}
if (updateOrderList.Count() > 0)
{
fsql.Transaction(() =>
{
foreach (var update in updateOrderList)
update.ExecuteAffrows();
});
updateOrderList.Clear();
}
Console.WriteLine("更新完毕");
}
} }
public class JPCount public class JPCount

Loading…
Cancel
Save