Commit 90e7ff83 authored by liudong1993's avatar liudong1993
parents 818850ce 16690a20
......@@ -192,5 +192,10 @@ namespace Mall.Model.Extend.Product
/// </summary>
public RB_FreeShipping_Extend FreeShippingModel { get; set; }
/// <summary>
/// 供应商-我的产品
/// </summary>
public List<object> SupplierSpecificationList { get; set; }
}
}
......@@ -331,15 +331,18 @@ namespace Mall.Module.Product
if (freeShippingList != null && freeShippingList.Any())
{
var nowcategory = categoryList.Where(x => x.GoodsId == item.GoodsId).Select(x=>x.CategoryId);
var nowcategory = categoryList.Where(x => x.GoodsId == item.GoodsId).Select(x => x.CategoryId);
var fullNumPinkageModel = freeShippingList.Where(x =>nowcategory.Contains(x.CategoryId)&& x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullNumPinkage > 0).OrderBy(x => x.FullNumPinkage).FirstOrDefault();
var fullNumPinkageModel = freeShippingList.Where(x => nowcategory.Contains(x.CategoryId) && x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullNumPinkage > 0).OrderBy(x => x.FullNumPinkage).FirstOrDefault();
if (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0)
{
fullNumPinkageModel = freeShippingList.Where(x => x.IsFreeShipping == 1 && x.IsEnable == 1 && x.FullMoneyPinkage > 0).OrderBy(x => x.FullMoneyPinkage).FirstOrDefault();
}
item.FreeShippingModel = (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0) ? new RB_FreeShipping_Extend() : fullNumPinkageModel;
}
else {
item.FreeShippingModel = new RB_FreeShipping_Extend();
}
}
......
......@@ -1066,6 +1066,10 @@ namespace Mall.Module.Product
}
model.FreeShippingModel = (fullNumPinkageModel == null || fullNumPinkageModel.ID <= 0) ? new RB_FreeShipping_Extend() : fullNumPinkageModel;
}
else
{
model.FreeShippingModel = new RB_FreeShipping_Extend();
}
}
......@@ -1936,8 +1940,8 @@ namespace Mall.Module.Product
is_sell_well = model.IsSellWell,
is_negotiable = model.IsGoodsNegotiable,
freeShippingName = model.FreeShippingModel.Name,
fullMoneyPinkage = model.FreeShippingModel.FullMoneyPinkage,
fullNumPinkage = model.FreeShippingModel.FullNumPinkage,
fullMoneyPinkage = model.FreeShippingModel.FullMoneyPinkage ?? 0,
fullNumPinkage = model.FreeShippingModel.FullNumPinkage ?? 0,
cats = model.CategoryList.Select(x => new
{
x.CategoryId,
......
......@@ -64,9 +64,9 @@ namespace Mall.WebApi.Controllers.MallBase
x.TenantId,
x.MallBaseId,
CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
FreeShippingName = x.FreeShippingModel.Name,
FreeShippingFullMoneyPinkage = x.FreeShippingModel.FullMoneyPinkage,
FreeShippingFullNumPinkage = x.FreeShippingModel.FullNumPinkage,
FreeShippingName = x.FreeShippingModel.Name,
FreeShippingFullMoneyPinkage = x.FreeShippingModel.FullMoneyPinkage ?? 0,
FreeShippingFullNumPinkage = x.FreeShippingModel.FullNumPinkage ?? 0,
});
List<object> robj = new List<object>() {
new {
......@@ -489,10 +489,11 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetAppletOrderCommissionInitialize() {
public ApiResult SetAppletOrderCommissionInitialize()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
int OrderId = parms.GetInt("OrderId", 0);
bool flag = orderModule.SetAppletOrderCommissionInitialize(OrderId);
return ApiResult.Success("", flag);
......@@ -635,10 +636,12 @@ namespace Mall.WebApi.Controllers.MallBase
var detailModel = orderModule.GetOrderDetailInfo(demodel.OrderDetialId ?? 0);
var omodel = orderModule.GetOrderInfo(detailModel?.OrderId ?? 0);
if (omodel == null) {
if (omodel == null)
{
return ApiResult.ParamIsNull("订单不存在");
}
if (omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.WaitReceiving && omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.Received && omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.Completed) {
if (omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.WaitReceiving && omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.Received && omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.Completed)
{
return ApiResult.ParamIsNull("订单状态不正确");
}
......@@ -665,8 +668,10 @@ namespace Mall.WebApi.Controllers.MallBase
}
}
}
else {
if (omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.WaitReceiving) {
else
{
if (omodel.OrderStatus != Common.Enum.Goods.OrderStatusEnum.WaitReceiving)
{
return ApiResult.ParamIsNull("订单状态不正确");
}
}
......@@ -1011,7 +1016,8 @@ namespace Mall.WebApi.Controllers.MallBase
if (Rparms.GetStringValue("Success").ToLower() == "true")
{
List<Model.Query.ExpressTraces> list = JsonConvert.DeserializeObject<List<Model.Query.ExpressTraces>>(Rparms.GetStringValue("Traces"));
if (list.Any()) {
if (list.Any())
{
list = list.OrderByDescending(x => x.AcceptTime).ToList();
}
return ApiResult.Success("", list);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment