diff --git a/BBWYB.Server.API/Controllers/OrderController.cs b/BBWYB.Server.API/Controllers/OrderController.cs
index 958666a..e381a72 100644
--- a/BBWYB.Server.API/Controllers/OrderController.cs
+++ b/BBWYB.Server.API/Controllers/OrderController.cs
@@ -144,5 +144,15 @@ namespace BBWYB.Server.API.Controllers
{
return orderBusiness.StatisticsOrderCountByOrderState(shopId);
}
+
+ ///
+ /// 齐库推送sku配置状态
+ ///
+ ///
+ [HttpPost]
+ public void QikuPublishOrderSkuPackConfigState([FromBody] QikuPublishOrderSkuPackConfigStateRequest request)
+ {
+ orderBusiness.QikuPublishOrderSkuPackConfigState(request);
+ }
}
}
diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index a06e331..dd7aff5 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -21,10 +21,12 @@ namespace BBWYB.Server.Business
{
private OP_PlatformClientFactory opPlatformClientFactory;
private RestApiService restApiService;
+ private IList waitConfigStateList;
public OrderBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator, OP_PlatformClientFactory opPlatformClientFactory, RestApiService restApiService) : base(fsql, nLogManager, idGenerator)
{
this.opPlatformClientFactory = opPlatformClientFactory;
this.restApiService = restApiService;
+ waitConfigStateList = new List() { Enums.PackConfigState.待配置, Enums.PackConfigState.需修改 };
}
private ISelect GetOrderListQueryConditions(QueryOrderRequest request)
@@ -47,7 +49,7 @@ namespace BBWYB.Server.Business
.WhereIf(!string.IsNullOrEmpty(request.Sku), osku => osku.SkuId == request.Sku)
.WhereIf(!string.IsNullOrEmpty(request.SourceSku), osku => osku.BelongSkuId == request.SourceSku)
.WhereIf(!string.IsNullOrEmpty(request.ProductId), osku => osku.ProductId == request.ProductId)
- .WhereIf(request.IsWaitConfig, osku => osku.PackConfigState == Enums.PackConfigState.待配置 || osku.PackConfigState == null);
+ .WhereIf(request.IsWaitConfig, osku => waitConfigStateList.Contains(osku.PackConfigState) || osku.PackConfigState == null);
select = select.WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.OrderState != Enums.OrderState.已取消)
.WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.IntoStoreType == Enums.IntoStoreType.发回齐越)
.WhereIf(request.IsWaitConfig, (o, ocs, oct) => o.IsPurchased == true)
@@ -640,7 +642,7 @@ namespace BBWYB.Server.Business
OrderCount = g.Count()
});
- var childSelect = fsql.Select().As("osku").Where(osku => osku.PackConfigState == Enums.PackConfigState.待配置 || osku.PackConfigState == null);
+ var childSelect = fsql.Select().As("osku").Where(osku => waitConfigStateList.Contains(osku.PackConfigState) || osku.PackConfigState == null);
var waitConfigCount = fsql.Select().Where(o => o.ShopId == shopId)
.Where(o => !noOrderStateList.Contains(o.OrderState.Value))
.Where(o => o.IntoStoreType == Enums.IntoStoreType.发回齐越)
@@ -662,5 +664,14 @@ namespace BBWYB.Server.Business
WaitConfigCount = waitConfigCount,
};
}
+
+ ///
+ /// 齐库推送sku配置状态
+ ///
+ ///
+ public void QikuPublishOrderSkuPackConfigState(QikuPublishOrderSkuPackConfigStateRequest request)
+ {
+
+ }
}
}
diff --git a/BBWYB.Server.Model/Db/Order/OrderSku.cs b/BBWYB.Server.Model/Db/Order/OrderSku.cs
index cedf9ec..2d07800 100644
--- a/BBWYB.Server.Model/Db/Order/OrderSku.cs
+++ b/BBWYB.Server.Model/Db/Order/OrderSku.cs
@@ -70,10 +70,6 @@ namespace BBWYB.Server.Model.Db
public string Title { get; set; }
-
- ///
- /// 打包配置状态(0=待配置, 1=已配置)
- ///
[Column(DbType = "int(1)", MapType = typeof(int?))]
public Enums.PackConfigState? PackConfigState { get; set; }
diff --git a/BBWYB.Server.Model/Dto/Request/QiKu/QikuPublishOrderSkuPackConfigStateRequest.cs b/BBWYB.Server.Model/Dto/Request/QiKu/QikuPublishOrderSkuPackConfigStateRequest.cs
new file mode 100644
index 0000000..7767790
--- /dev/null
+++ b/BBWYB.Server.Model/Dto/Request/QiKu/QikuPublishOrderSkuPackConfigStateRequest.cs
@@ -0,0 +1,11 @@
+namespace BBWYB.Server.Model.Dto
+{
+ public class QikuPublishOrderSkuPackConfigStateRequest
+ {
+ public string OrderId { get; set; }
+
+ public string SkuId { get; set; }
+
+ public Enums.PackConfigState PackConfigState { get; set; }
+ }
+}
diff --git a/BBWYB.Server.Model/Enums.cs b/BBWYB.Server.Model/Enums.cs
index 46b516e..caf06b6 100644
--- a/BBWYB.Server.Model/Enums.cs
+++ b/BBWYB.Server.Model/Enums.cs
@@ -103,10 +103,10 @@
public enum PurchaseOrderState
{
待发货 = 0,
- 部分发货 = 1,
- 待收货 = 10,
- 部分收货 = 11,
- 已签收 = 20,
+ 部分发货 = 1,
+ 待收货 = 10,
+ 部分收货 = 11,
+ 已签收 = 20,
已取消 = 100
}
@@ -290,12 +290,13 @@
}
///
- /// 打包配置状态 待配置 = 0,已配置 = 1
+ /// 打包配置状态 待配置 = 0,已配置 = 1,需修改 = 2
///
public enum PackConfigState
{
待配置 = 0,
- 已配置 = 1
+ 已配置 = 1,
+ 需修改 = 2
}
///