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

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
257b013380 c1768657b3
commit
caa8604c23
10 changed files with 137 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      BBWY.Client/GlobalContext.cs
  2. 3
      BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs
  3. 33
      BBWY.Client/Models/Enums.cs
  4. 11
      BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
  5. 2
      BBWY.Server.API/Controllers/BatchPurchaseController.cs
  6. 31
      BBWY.Server.API/Controllers/PurchaseOrderController.cs
  7. 63
      BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
  8. 13
      BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
  9. 35
      BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
  10. 35
      BBWY.Server.Model/Enums.cs

2
BBWY.Client/GlobalContext.cs
View File

@ -9,7 +9,7 @@ namespace BBWY.Client
{
ShopServiceGroupList = new List<string>();
ShopServiceGroupLowerList = new List<string>();
ClientVersion = "10125";
ClientVersion = "10126";
}
private User user;

3
BBWY.Client/Models/APIModel/Response/BatchPurchase/PurchaseOrderV2Response.cs
View File

@ -88,9 +88,6 @@ namespace BBWY.Client.Models
//public bool? IsSubscribeKuaiDi100 { get; set; } = false;
/// <summary>
/// 采购单状态(待付款=0,待发货=1,待收货=2,待质检=3,待打包=4,待结算=5,已完成=6)
/// </summary>
public PurchaseOrderState? OrderState { get; set; }
/// <summary>

33
BBWY.Client/Models/Enums.cs
View File

@ -401,12 +401,41 @@
}
/// <summary>
/// 采购单状态 待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消= 7
/// 订单状态
/// <para>待付款 = 0</para>
/// <para>等待采购 = 1, 部分采购 = 110</para>
/// <para>待发货 = 2, 部分发货 = 120</para>
/// <para>待收货 = 3, 部分收货 = 130</para>
/// <para>已完成 = 4</para>
/// <para>锁定 = 5</para>
/// <para>已取消 = 6</para>
/// <para>暂停 = 7</para>
/// <para>已退款 = 8</para>
/// <para>Unknow = 100</para>
/// <para>打包中 = 140</para>
/// <para>待完结 = 150</para>
/// </summary>
public enum PurchaseOrderState
{
待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7
/*待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7*/
待付款 = 0,
等待采购 = 1,
部分采购 = 110,
待发货 = 2,
部分发货 = 120,
待收货 = 3,
部分收货 = 130,
已完成 = 4,
锁定 = 5,
已取消 = 6,
暂停 = 7,
已退款 = 8,
Unknow = 100,
打包中 = 140,
待完结 = 150
}
public enum Settle
{
未结算 = 0,

11
BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
View File

@ -132,14 +132,14 @@
Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待质检:#8080FF:#F2F2F2}"
Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待质检:White:#4A4A4A}"
Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待质检}"/>-->
<c:BButton Content="待打包" Width="100"
<!--<c:BButton Content="待打包" Width="100"
Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待打包:#8080FF:#F2F2F2}"
Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待打包:White:#4A4A4A}"
Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待打包}"/>
<c:BButton Content="待结算" Width="100" Visibility="Collapsed"
Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待打包}"/>-->
<!--<c:BButton Content="待结算" Width="100" Visibility="Collapsed"
Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待结算:#8080FF:#F2F2F2}"
Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=待结算:White:#4A4A4A}"
Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待结算}"/>
Command="{Binding SetPurchaseOrderStateCommand}" CommandParameter="{x:Static cmodel:PurchaseOrderState.待结算}"/>-->
<c:BButton Content="已完成" Width="100"
Background="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=已完成:#8080FF:#F2F2F2}"
Foreground="{Binding PurchaseOrderState,Converter={StaticResource objConverter},ConverterParameter=已完成:White:#4A4A4A}"
@ -407,7 +407,8 @@
</StackPanel>
<Grid >
<StackPanel Visibility="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed }" Orientation="Vertical" VerticalAlignment="Center">
<!-- Visibility="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待打包:Visible:Collapsed }"-->
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
<c:BButton x:Name="createTask" Content="发布任务" Visibility="{Binding PackState,Converter={StaticResource objConverter},ConverterParameter=待发布:Visible:Collapsed}" Style="{StaticResource LinkButton}"
Margin="5,0,0,10">
<b:Interaction.Triggers>

2
BBWY.Server.API/Controllers/BatchPurchaseController.cs
View File

@ -1,5 +1,6 @@
using BBWY.Server.Business;
using BBWY.Server.Model.Dto;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
@ -109,6 +110,7 @@ namespace BBWY.Server.API.Controllers
/// <param name="request"></param>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public UpdatePackStateResponse UpdatePurchaseOrderState([FromBody] UpdatePurchaseOrderStateRequest request)
{
return batchPurchaseBusiness.UpdatePurchaseOrderState(request);

31
BBWY.Server.API/Controllers/PurchaseOrderController.cs
View File

@ -88,16 +88,16 @@ namespace BBWY.Server.API.Controllers
purchaseOrderBusiness.CallbackFrom1688(message);
}
/// <summary>
/// 拳探发货回调
/// </summary>
/// <param name="request"></param>
[HttpPost]
[AllowAnonymous]
public void QuanTanSendGoodsCallback([FromBody] QuanTanSendGoodsNotifyRequest request)
{
purchaseOrderBusiness.QuanTanSendGoodsCallback(request);
}
///// <summary>
///// 拳探发货回调
///// </summary>
///// <param name="request"></param>
//[HttpPost]
//[AllowAnonymous]
//public void QuanTanSendGoodsCallback([FromBody] QuanTanSendGoodsNotifyRequest request)
//{
// purchaseOrderBusiness.QuanTanSendGoodsCallback(request);
//}
/// <summary>
/// 拳探改价回调
@ -109,16 +109,5 @@ namespace BBWY.Server.API.Controllers
{
purchaseOrderBusiness.QuanTanEditPriceCallback(request);
}
/// <summary>
/// 签收采购单
/// </summary>
/// <param name="request"></param>
[HttpPost]
[AllowAnonymous]
public void SignPurchaseOrder([FromBody] BBWYBSignCallBackRequest request)
{
purchaseOrderBusiness.SignPurchaseOrder(request);
}
}
}

63
BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
View File

@ -23,44 +23,44 @@ namespace BBWY.Server.Business
public override PayPurchaseOrderResponse PayPurchaseOrder(PayPurchaseOrderRequest payPurchaseOrderRequest)
{
var qtResponse = quanTanOrderClient.PayOrder(new QuanTanPayOrderRequest
{
orderId = payPurchaseOrderRequest.OrderId,
userAccount = payPurchaseOrderRequest.AppToken
}, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
if (qtResponse.Status == 200) return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState = PurchaseOrderState.待发货 };
if (qtResponse.Status == 200) return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState = PurchaseOrderState.等待采购 };
if (qtResponse.Message != null && qtResponse.Message.Contains("已支付"))
{
var res = quanTanOrderClient.GetOrderDetail(new QuanTanGetOrderDetailRequest
{
orderId = payPurchaseOrderRequest.OrderId,
userAccount = payPurchaseOrderRequest.AppToken
}, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
if (res.Status == 200)
{
PurchaseOrderState purchaseOrder = PurchaseOrderState.待发货;
switch (res.Data.Status)
{
case -1:
purchaseOrder = PurchaseOrderState.已取消;
break;
case 0:
purchaseOrder = PurchaseOrderState.待发货;
break;
case 1:
purchaseOrder = PurchaseOrderState.待收货;
break;
case 2:
case 3:
purchaseOrder = PurchaseOrderState.已完成;
break;
}
return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState = purchaseOrder };
}
throw new BusinessException("无需重复支付");
//var res = quanTanOrderClient.GetOrderDetail(new QuanTanGetOrderDetailRequest
//{
// orderId = payPurchaseOrderRequest.OrderId,
// userAccount = payPurchaseOrderRequest.AppToken
//}, payPurchaseOrderRequest.AppKey, payPurchaseOrderRequest.AppSecret);
//if (res.Status == 200)
//{
// PurchaseOrderState purchaseOrder = PurchaseOrderState.待发货;
// switch (res.Data.Status)
// {
// case -1:
// purchaseOrder = PurchaseOrderState.已取消;
// break;
// case 0:
// purchaseOrder = PurchaseOrderState.待发货;
// break;
// case 1:
// purchaseOrder = PurchaseOrderState.待收货;
// break;
// case 2:
// case 3:
// purchaseOrder = PurchaseOrderState.已完成;
// break;
// }
// return new PayPurchaseOrderResponse { Success = true, PurchaseOrderState = purchaseOrder };
//}
}
if (qtResponse.Message != null && qtResponse.Message.Contains("已删除"))
@ -72,9 +72,6 @@ namespace BBWY.Server.Business
Success = false,
Msg = qtResponse.Message
};
}
public override CancelPurchaseOrderResponse CancelPurchaseOrder(CancelPurchaseOrderRequest request)
{

13
BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs
View File

@ -443,16 +443,9 @@ namespace BBWY.Server.Business
#endregion
#region bbwyb Callback
public void SignPurchaseOrder(BBWYBSignCallBackRequest request)
{
var pv2 = fsql.Select<PurchaseOrderV2>(request.OrderId).ToOne();
if (pv2.OrderState == Enums.PurchaseOrderState.待收货)
{
fsql.Update<PurchaseOrderV2>(request.OrderId).Set(p => p.OrderState, Enums.PurchaseOrderState.待质检)
.Set(p => p.SignTime, DateTime.Now)
.ExecuteAffrows();
}
}
#endregion
/// <summary>

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

@ -448,7 +448,7 @@ namespace BBWY.Server.Business
{
Id = createOrderResponse.PurchaseOrderId,
ShopId = request.ShopId,
OrderState = createOrderResponse.IsPay ? Enums.PurchaseOrderState.待发货 : Enums.PurchaseOrderState.待付款,
OrderState = createOrderResponse.IsPay ? Enums.PurchaseOrderState.等待采购 : Enums.PurchaseOrderState.待付款,
PurchasePlatform = purchasePlatform,
ConsigneeContactName = request.Consignee.ContactName,
ConsigneeMobile = request.Consignee.Mobile,
@ -661,7 +661,7 @@ namespace BBWY.Server.Business
var currentOrderSkuFreightAmount = purchaseOrderSimpleInfo.FreightAmount / belongSkuGroups.Count(); //采购运费(按sku数均分)
var belongSkuBasicInfo = belongSkuBasicInfoList.FirstOrDefault(x=>x.Id == belongSkuGroup.Key);
var belongSkuBasicInfo = belongSkuBasicInfoList.FirstOrDefault(x => x.Id == belongSkuGroup.Key);
var purchaseOrderSku = new PurchaseOrderSku()
{
@ -712,7 +712,7 @@ namespace BBWY.Server.Business
{
Id = createOrderResponse.PurchaseOrderId,
ShopId = request.ShopId,
OrderState = createOrderResponse.IsPay ? Enums.PurchaseOrderState.待发货 : Enums.PurchaseOrderState.待付款,
OrderState = createOrderResponse.IsPay ? Enums.PurchaseOrderState.等待采购 : Enums.PurchaseOrderState.待付款,
PurchasePlatform = purchaseGroup.PurchasePlatform,
ConsigneeContactName = request.Consignee.ContactName,
ConsigneeMobile = request.Consignee.Mobile,
@ -832,8 +832,19 @@ namespace BBWY.Server.Business
select = select.Where((po, pa) => childSelect.Where(posku => posku.PurchaseOrderId == po.Id).Any());
}
select = select.WhereIf(request.PurchaserName != null, (po, pa) => po.PurchaserName == request.PurchaserName)
.WhereIf(request.PurchaseOrderState != null, (po, pa) => po.OrderState == request.PurchaseOrderState)
select = select.WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.待付款 ||
request.PurchaseOrderState == Enums.PurchaseOrderState.打包中 ||
request.PurchaseOrderState == Enums.PurchaseOrderState.待完结 ||
request.PurchaseOrderState == Enums.PurchaseOrderState.已完成 ||
request.PurchaseOrderState == Enums.PurchaseOrderState.已取消,
(po,pa) => po.OrderState == request.PurchaseOrderState)
.WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.等待采购, (po,pa) => po.OrderState == Enums.PurchaseOrderState.等待采购 ||
po.OrderState == Enums.PurchaseOrderState.部分采购)
.WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.待发货, (po, pa) => po.OrderState == Enums.PurchaseOrderState.待发货 ||
po.OrderState == Enums.PurchaseOrderState.部分发货)
.WhereIf(request.PurchaseOrderState == Enums.PurchaseOrderState.待收货, (po, pa) => po.OrderState == Enums.PurchaseOrderState.待收货 ||
po.OrderState == Enums.PurchaseOrderState.部分收货)
.WhereIf(request.PurchaserName != null, (po, pa) => po.PurchaserName == request.PurchaserName)
.WhereIf(request.StartDate != null, (po, pa) => po.CreateTime >= request.StartDate)
.WhereIf(request.EndDate != null, (po, pa) => po.CreateTime <= request.EndDate);
}
@ -946,13 +957,12 @@ namespace BBWY.Server.Business
public UpdatePackStateResponse UpdatePurchaseOrderState(UpdatePurchaseOrderStateRequest request)
{
var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
fsql.Update<PurchaseOrderV2>(order)
.Set(a => a.OrderState, request.PurchaseOrderState)
.ExecuteAffrows();
// var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
// fsql.Update<PurchaseOrderV2>(order)
//.Set(a => a.OrderState, request.PurchaseOrderState)
//.ExecuteAffrows();
// return new UpdatePackStateResponse();
fsql.Update<PurchaseOrderV2>(request.OrderId).Set(o => o.OrderState, request.PurchaseOrderState).ExecuteAffrows();
return new UpdatePackStateResponse();
}
@ -964,5 +974,6 @@ namespace BBWY.Server.Business
.ExecuteAffrows();
return new UpdatePackStateResponse();
}
}
}

35
BBWY.Server.Model/Enums.cs
View File

@ -322,17 +322,44 @@
}
/// <summary>
/// 采购单状态 待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消= 7
/// 订单状态
/// <para>待付款 = 0</para>
/// <para>等待采购 = 1, 部分采购 = 110</para>
/// <para>待发货 = 2, 部分发货 = 120</para>
/// <para>待收货 = 3, 部分收货 = 130</para>
/// <para>已完成 = 4</para>
/// <para>锁定 = 5</para>
/// <para>已取消 = 6</para>
/// <para>暂停 = 7</para>
/// <para>已退款 = 8</para>
/// <para>Unknow = 100</para>
/// <para>打包中 = 140</para>
/// <para>待完结 = 150</para>
/// </summary>
public enum PurchaseOrderState
{
待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7
/*待付款 = 0, 待发货 = 1, 待收货 = 2, 待质检 = 3, 待打包 = 4, 待结算 = 5, 已完成 = 6, 已取消 = 7*/
待付款 = 0,
等待采购 = 1,
部分采购 = 110,
待发货 = 2,
部分发货 = 120,
待收货 = 3,
部分收货 = 130,
已完成 = 4,
锁定 = 5,
已取消 = 6,
暂停 = 7,
已退款 = 8,
Unknow = 100,
打包中 = 140,
待完结 = 150
}
public enum PackState
{
待发布=0,打包中=1,已完成=2
待发布 = 0, 打包中 = 1, 已完成 = 2
}
public enum IsDeleted
@ -346,7 +373,7 @@
未结算 = 0,
已结清 = 1
}
public enum BillOrigin
{

Write Preview
Loading…
Cancel
Save