pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加取消任务接口

AddValidOverTime
506583276@qq.com 2 years ago
parent
72d495d56b
commit
c3bdc88f16
2 changed files with 39 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 41
      BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
  2. 19
      BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

41
BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
View File

@ -185,7 +185,7 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
Set(ref isSetBarCode, value); Set(ref isSetBarCode, value);
// IsNeedBarCode = IsSetBarCode ? Need.不需要 : Need.需要; // IsNeedBarCode = IsSetBarCode ? Need.不需要 : Need.需要;
} }
} }
@ -199,7 +199,7 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
Set(ref isSetCertificate, value); Set(ref isSetCertificate, value);
//IsNeedCertificateModel = IsSetCertificate ? Need.不需要 : Need.需要; //IsNeedCertificateModel = IsSetCertificate ? Need.不需要 : Need.需要;
} }
} }
private string setSpuCerStatus; private string setSpuCerStatus;
@ -330,7 +330,7 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
return; return;
} }
if (TaskId>0&&string.IsNullOrEmpty(SpuId))//修改界面刷新配置数据 if (TaskId > 0 && string.IsNullOrEmpty(SpuId))//修改界面刷新配置数据
{ {
SearchSku(SkuId); SearchSku(SkuId);
} }
@ -375,7 +375,7 @@ namespace BBWY.Client.ViewModels.PackTask
ProductNo = ProductNo, ProductNo = ProductNo,
Brand = Brand, Brand = Brand,
SkuId = SkuId, SkuId = SkuId,
} }
}; };
@ -452,7 +452,7 @@ namespace BBWY.Client.ViewModels.PackTask
} }
var productSku = packTaskService.GetProductSku(skuid); var productSku = packTaskService.GetProductSku(skuid);
if (productSku == null || !productSku.Success||productSku.Data==null) if (productSku == null || !productSku.Success || productSku.Data == null)
return; return;
BrandName = productSku.Data.BrandName; BrandName = productSku.Data.BrandName;
CertificateModel = productSku.Data.Cers; CertificateModel = productSku.Data.Cers;
@ -461,7 +461,7 @@ namespace BBWY.Client.ViewModels.PackTask
CertificateModel = new CertificateModel[] { CertificateModel = new CertificateModel[] {
new CertificateModel{ } new CertificateModel{ }
}; };
} }
foreach (var item in CertificateModel) foreach (var item in CertificateModel)
@ -504,7 +504,7 @@ namespace BBWY.Client.ViewModels.PackTask
IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要; IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要;
IsSetBarCode = !config.NeedBar; IsSetBarCode = !config.NeedBar;
IsSetCertificate =!config.NeedCer; IsSetCertificate = !config.NeedCer;
bool isSelected = false; bool isSelected = false;
foreach (var item in increates) foreach (var item in increates)
@ -533,7 +533,7 @@ namespace BBWY.Client.ViewModels.PackTask
return; return;
} }
//加载配置文件 //加载配置文件
} }
public void SearSpuCer() public void SearSpuCer()
@ -591,7 +591,7 @@ namespace BBWY.Client.ViewModels.PackTask
IsSetBarCode = true; IsSetBarCode = true;
IsSetCertificate = true; IsSetCertificate = true;
BarCodeModel = null; BarCodeModel = null;
CertificateModel = null; CertificateModel = null;
SkuTitle = string.Empty; SkuTitle = string.Empty;
GoodsNumber = 0; GoodsNumber = 0;
@ -631,13 +631,16 @@ namespace BBWY.Client.ViewModels.PackTask
IsNeedCertificateModel = model.CertificateModel == null ? Need.不需要 : Need.需要; IsNeedCertificateModel = model.CertificateModel == null ? Need.不需要 : Need.需要;
CertificatePosition = model.CertificatePosition; CertificatePosition = model.CertificatePosition;
TaskId = model.TaskId; TaskId = model.TaskId;
string[] increateDatas = model.Increment1.Split(',');
List<string> increateDatas = new List<string>();
if (model.Increment1 != null)
increateDatas = model.Increment1.Split(',').ToList();
bool isTrue = false; bool isTrue = false;
foreach (var item in increates) foreach (var item in increates)
{ {
isTrue = false; isTrue = false;
if (increateDatas.Contains(item)) if (increateDatas.Count()>0&& increateDatas.Contains(item))
{ {
isTrue = true; isTrue = true;
} }
@ -650,7 +653,7 @@ namespace BBWY.Client.ViewModels.PackTask
}); });
}); });
} }
// SearchSku(SkuId); // SearchSku(SkuId);
} }
private void OpenSkuDetail(object param) private void OpenSkuDetail(object param)
@ -712,14 +715,14 @@ namespace BBWY.Client.ViewModels.PackTask
SkuCount = SkuCount, SkuCount = SkuCount,
UserId = globalContext.User.Id.ToString(), UserId = globalContext.User.Id.ToString(),
ShopId = globalContext.User.Shop.ShopId.ToString(), ShopId = globalContext.User.Shop.ShopId.ToString(),
NeedBar =IsNeedBarCode==Need.需要, NeedBar = IsNeedBarCode == Need.需要,
NeedCer =IsNeedCertificateModel==Need.需要 NeedCer = IsNeedCertificateModel == Need.需要
//IsWorry = IsWorry //IsWorry = IsWorry
}; };
if (IsNeedBarCode == Need.需要) if (IsNeedBarCode == Need.需要)
{ {
if (BarCodeModel == null ||IsSetBarCode|| BarCodeModel.Id <= 0) if (BarCodeModel == null || IsSetBarCode || BarCodeModel.Id <= 0)
{ {
new TipsWindow("请设置条形码模板").Show(); new TipsWindow("请设置条形码模板").Show();
return; return;
@ -737,12 +740,12 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
createTaskModel.CertificateId = CertificateModel.Where(c => c.Id > 0).FirstOrDefault()?.Id; createTaskModel.CertificateId = CertificateModel.Where(c => c.Id > 0).FirstOrDefault()?.Id;
} }
catch catch
{ {
} }
createTaskModel.CerId = string.Join(",", CertificateModel.Where(c => c.Id > 0).Select(c => c.Id));// createTaskModel.CerId = string.Join(",", CertificateModel.Where(c => c.Id > 0).Select(c => c.Id));//
} }
ApiResponse<object> res = null; ApiResponse<object> res = null;

19
BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
View File

@ -404,7 +404,7 @@ namespace BBWY.Server.Business
try try
{ {
var qikuResponse = restApiService.SendRequest("http://qiku.qiyue666.com/", var qikuResponse = restApiService.SendRequest("http://qiku.qiyue666.com/",
"api/PackPurchaseTask/PublicPurchaseTask", "/api/PackPurchaseTask/BatchPublicPurchaseTask",
qikuPackSkuConfigRequest, qikuPackSkuConfigRequest,
null, null,
HttpMethod.Post); HttpMethod.Post);
@ -528,12 +528,27 @@ namespace BBWY.Server.Business
var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform); var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform);
var payOrderResponse = platformSDKBusiness.CancelPurchaseOrder(request); var payOrderResponse = platformSDKBusiness.CancelPurchaseOrder(request);
if (payOrderResponse.Success) if (payOrderResponse.Success)//取消成功
{ {
//var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne(); //var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
fsql.Update<PurchaseOrderV2>(request.OrderId) fsql.Update<PurchaseOrderV2>(request.OrderId)
.Set(po => po.OrderState, Enums.PurchaseOrderState.已取消) .Set(po => po.OrderState, Enums.PurchaseOrderState.已取消)
.ExecuteAffrows(); .ExecuteAffrows();
try
{
var qikuResponse = restApiService.SendRequest("http://qiku.qiyue666.com/",
$"/api/PackPurchaseTask/CancelOrderPackTask?orderId={request.OrderId}",
null,
null,
HttpMethod.Post);
if (qikuResponse.StatusCode != System.Net.HttpStatusCode.OK)
throw new Exception(qikuResponse.Content);
}
catch (Exception ex)
{
nLogManager.GetLogger($"取消打包任务-{request.OrderId}").Error(ex, JsonConvert.SerializeObject(request));
}
} }

Write Preview
Loading…
Cancel
Save