增量读取订单功能 90% 新的二级oem 50%
This commit is contained in:
1 parent
e3f4e34def
commit
171064f03f
31 files changed
+1169
-624
No files matched your search
@@ -15,7 +15,7 @@ namespace Work.ERP.API.Orders
|
||||
{
|
||||
public class ShipGiftServiceApi
|
||||
{
|
||||
public async Task<bool> SendShipGift(string[] orderIds, int giftType, decimal amount, decimal oemGiftAmount)
|
||||
public async Task<bool> SendShipGift(string[] orderIds, int giftType, decimal amount, decimal oemGiftAmount, decimal parentOemGiftAmount, string oemId, string parentOemId)
|
||||
{
|
||||
string data = JsonConvert.SerializeObject(new
|
||||
{
|
||||
@@ -25,7 +25,10 @@ namespace Work.ERP.API.Orders
|
||||
userName = BaseClass.UserName,
|
||||
giftOrderType = (int)giftType,
|
||||
amount = (int)(amount * 100),
|
||||
oemAmount = (int)(oemGiftAmount * 100)
|
||||
oemAmount = (int)(oemGiftAmount * 100),
|
||||
parentOemAmount = (int)(parentOemGiftAmount * 100),
|
||||
oemId = oemId,
|
||||
parentOemId = parentOemId
|
||||
});
|
||||
Debug.WriteLine($"礼品单:{data}");
|
||||
var result = await ERPHttp.e57PostResponseAsync<Result>("/prod-api/api/oms-api/gift/order/deliveryFor29Erp", data);
|
||||
|
||||
@@ -151,8 +151,11 @@ namespace Work
|
||||
BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order"));
|
||||
BaseClass.RechargeAmountTotal = BaseRegex.GetDecimalJson(ref html, "recharge_amount_total");
|
||||
BaseClass.OemGiftAmount = BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order");
|
||||
BaseClass.ParentOemGiftAmount = BaseRegex.GetDecimalJson(ref html, "parent_gift_oem_amount_per_order");
|
||||
BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id");
|
||||
BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name");
|
||||
BaseClass.ParentOemId = BaseRegex.GetStringJson(ref html, "parent_oem_id");
|
||||
BaseClass.ParentOemName = BaseRegex.GetStringJson(ref html, "parent_oem_name");
|
||||
BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner");
|
||||
#if DEBUG
|
||||
if (!string.IsNullOrEmpty(BaseRegex.GetStringJson(ref html, "order_api_url")) && !BaseClass.LoginApiUrl.Contains("localhost") && !BaseClass.LoginApiUrl.Contains("127.0.0.1"))
|
||||
|
||||
@@ -218,7 +218,7 @@ namespace Work._29Tools.BLL
|
||||
sb.Append("&order_id=").Append(order.order_id);
|
||||
sb.Append("&ds_order_id=").Append(dropShopOrderId);
|
||||
sb.Append("&dropship_product_list=").Append("[");
|
||||
foreach (var item in order.orderItems)
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
sb.Append("{\"spu_id\":\"").Append(item.product_id).Append("\",\"sku_id\":\"").Append(item.sku_id).Append("\",\"product_cnt\":").Append(item.sku_cnt).Append("},");
|
||||
}
|
||||
|
||||
@@ -271,7 +271,7 @@ namespace TemuKJD.ToolForms
|
||||
this.txtShopGoodsName.Text = orderItem.title;
|
||||
this.txtShopSpecName.Text = orderItem.SkuAttrStr;
|
||||
this.txtShopOrderItemCnt.Text = orderItem.sku_cnt.ParseToString();
|
||||
this.txtShopOrderItemPrice.Text = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count).ParseToString();
|
||||
this.txtShopOrderItemPrice.Text = (orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.OrderItems?.Count).ParseToString();
|
||||
|
||||
this.txtOrderId.Text = orderItem.order_id;
|
||||
var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == orderItem.shop_id.ParseToString());
|
||||
@@ -608,7 +608,7 @@ namespace TemuKJD.ToolForms
|
||||
|
||||
if (IsAutoBuy && GlobalConfig.AutoBuyConfig.IsLimitMinProfit)
|
||||
{
|
||||
var salePrice = orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.orderItems?.Count;
|
||||
var salePrice = orderItem.real_price * 0.01m + orderItem.ItemOrder?.postage_price * 0.01m / orderItem.ItemOrder?.OrderItems?.Count;
|
||||
var profit = salePrice - buyPrice * 0.01m;
|
||||
var limitProfit = GlobalConfig.AutoBuyConfig.MinProfit * 0.01m;
|
||||
if (profit < limitProfit)
|
||||
@@ -1323,7 +1323,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (order.IsWaitBuy)
|
||||
{
|
||||
foreach (var item in order.orderItems)
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
if (item.out_product_id == upSpuCode || item.product_id == upSpuCode)
|
||||
{
|
||||
@@ -1388,7 +1388,7 @@ namespace TemuKJD.ToolForms
|
||||
{
|
||||
if (order.IsWaitBuy)
|
||||
{
|
||||
foreach (var item in order.orderItems)
|
||||
foreach (var item in order.OrderItems)
|
||||
{
|
||||
if ((item.out_product_id == pddBuyMap.spu_code && item.out_sku_id == pddBuyMap.sku_code) ||
|
||||
(item.out_product_id == pddBuyMap.spu_code && item.SkuAttrStr == pddBuyMap.sku_code) ||
|
||||
@@ -1515,8 +1515,11 @@ namespace TemuKJD.ToolForms
|
||||
string basePostageKey = WarehousePostageInfo.DicWarehousePostage.Keys.FirstOrDefault(pk => (orderItem.ItemOrder?.province_name).ParseToString().Contains(pk));
|
||||
decimal basePostage = basePostageKey.IsNullOrEmpty() ? WarehousePostageInfo.DicWarehousePostage.Values.Min() : WarehousePostageInfo.DicWarehousePostage[basePostageKey];
|
||||
|
||||
body["oemAmount"] = (BaseClass.PostagePerOrderDiff * 100).ParseToInt().ParseToString();
|
||||
body["postage"] = ((basePostage + BaseClass.PostagePerOrderDiff) * 100).ParseToInt().ParseToString();
|
||||
body["parentOemId"] = BaseClass.ParentOemId;
|
||||
body["parentOemAmount"] = (BaseClass.ParentPostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
body["oemId"] = BaseClass.OemId;
|
||||
body["oemAmount"] = (BaseClass.PostageOemAmount * 100).ParseToInt().ParseToString();
|
||||
body["postage"] = ((basePostage + BaseClass.ParentPostageOemAmount + BaseClass.PostageOemAmount) * 100).ParseToInt().ParseToString();
|
||||
}
|
||||
var url = "https://po.e57.cn/prod-api/api/oms-api/externalProcurement/saveOrUpdate";
|
||||
var dataStr = JsonHelper.SerializeObject(body);
|
||||
|
||||
Reference in new issue
Block a user