net/emoticon_api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed 修改细节

Browse Source
This commit is contained in:
lwh 2023-09-22 22:08:32 +08:00
parent e35eb71e46
commit ece0023cdc
8 changed files with 61 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ARW.Model/Dto/Business/OrderManage/Orders/OrderDto.cs
View File

@ -133,6 +133,15 @@ namespace ARW.Model.Dto.Business.OrderManage.Orders
public int? OrderStatus { get; set; }
public string ids { get; set; }
public DateTime BeginTime { get; set; }
public DateTime EndTime { get; set; }
public string CustomerNickNme { get; set; }
public string CustomerPhome { get; set; }
}

5
ARW.Model/Vo/Api/Carts/CartApiVo.cs
View File

@ -84,6 +84,11 @@ namespace ARW.Model.Vo.Api.Carts
[JsonConverter(typeof(ValueToStringConverter))]
public long StoreId { get; set; }
/// <summary>
/// 店铺名称
/// </summary>
public string StoreName { get; set; }
/// <summary>
/// 商品Id
/// </summary>

5
ARW.Model/Vo/Api/Custom/CustomerAddresses/CustomerAddressApiVo.cs
View File

@ -51,6 +51,11 @@ namespace ARW.Model.Vo.Api.Custom.CustomerAddresses
/// </summary>
public bool IsDefault { get; set; }
public string ProvinceName { get; set; }
public string CityName { get; set; }
public string DistrictName { get; set; }
public string DetaiaddresslAddress { get; set; }
}

6
ARW.Model/Vo/Api/GoodsManager/Goodss/GoodsApiVo.cs
View File

@ -219,6 +219,12 @@ namespace ARW.Model.Vo.Api.GoodsManager.Goodss
public string Desc { get; set; }
/// <summary>
/// 卖点
/// </summary>
public string GoodsSellingPoint { get; set; }
/// <summary>
/// 商品规格列表
/// </summary>

46
ARW.Service/Api/BusinessService/Carts/CartServiceApi.cs
View File

@ -29,6 +29,7 @@ using Senparc.Weixin.MP.AdvancedAPIs.MerChant;
using Infrastructure;
using ARW.Model.Models.Business.Marketing.CouponManage.CustomerCoupons;
using ARW.Model.Models.Business.Marketing.CouponManage.Coupons;
using Senparc.Weixin.WxOpen.AdvancedAPIs.WxApp.WxAppJson;
namespace ARW.Service.Api.BusinessService.Carts
{
@ -242,6 +243,8 @@ namespace ARW.Service.Api.BusinessService.Carts
goodsPromotion.CartId = _item.CartId;
goodsPromotion.IsSelected = _item.IsSelected;
goodsPromotion.StoreId = goods.ShopGuid;
var shop = await _ShopRepository.GetFirstAsync(s => s.ShopGuid == goods.ShopGuid);
goodsPromotion.StoreName = shop.ShopName;
goodsPromotion.SpuId = goods.GoodsGuid;
goodsPromotion.SkuId = _item.GoodsSkuId;
goodsPromotion.Thumb = goods.GoodsPicture.Split(',').First();
@ -254,29 +257,34 @@ namespace ARW.Service.Api.BusinessService.Carts
if (_item.GoodsSkuId != 0)
{
var sku = await _GoodsSkuRepository.GetFirstAsync(s => s.GoodsSkuId == _item.GoodsSkuId);
if (sku == null) throw new CustomException("所选规格不存在，请重新挑选");
goodsPromotion.Price = sku.GoodsSkuPrice;
goodsPromotion.OriginPrice = sku.GoodsSkuLinePrice;
// 查找当前规格的详细信息
var specInfoList = new List<SpecInfo>();
if (sku.SpecValueId != 0)
if (sku != null)
{
var specInfo = await GetSpecInfo(sku.SpecValueId);
specInfoList.Add(specInfo);
if (sku.SpecSecondValueId != 0)
goodsPromotion.Price = sku.GoodsSkuPrice;
goodsPromotion.OriginPrice = sku.GoodsSkuLinePrice;
if (!string.IsNullOrEmpty(sku.GoodsSkuImg))
goodsPromotion.Thumb = sku.GoodsSkuImg;
// 查找当前规格的详细信息
var specInfoList = new List<SpecInfo>();
if (sku.SpecValueId != 0)
{
var specInfo2 = await GetSpecInfo(sku.SpecSecondValueId);
specInfoList.Add(specInfo2);
}
if (sku.SpecThirdValueId != 0)
{
var specInfo3 = await GetSpecInfo(sku.SpecThirdValueId);
specInfoList.Add(specInfo3);
var specInfo = await GetSpecInfo(sku.SpecValueId);
specInfoList.Add(specInfo);
if (sku.SpecSecondValueId != 0)
{
var specInfo2 = await GetSpecInfo(sku.SpecSecondValueId);
specInfoList.Add(specInfo2);
}
if (sku.SpecThirdValueId != 0)
{
var specInfo3 = await GetSpecInfo(sku.SpecThirdValueId);
specInfoList.Add(specInfo3);
}
}
goodsPromotion.SpecInfo = specInfoList;
}
goodsPromotion.SpecInfo = specInfoList;
//throw new CustomException("所选规格不存在，请重新挑选");
}
else
{

4
ARW.Service/Api/BusinessService/Custom/CustomerAddresses/CustomerAddressServiceApi.cs
View File

@ -66,7 +66,11 @@ namespace ARW.Service.Api.BusinessService.Custom.CustomerAddresses
CustomerAddressGuid = s.CustomerAddressGuid,
Name = s.CustomerAddressName,
PhoneNumber = s.CustomerAddressPhone,
ProvinceName = c.RegionName,
CityName = d.RegionName,
DistrictName = f.RegionName,
Address = c.RegionName + d.RegionName + f.RegionName + s.CustomerAddressDetailed,
DetaiaddresslAddress = s.CustomerAddressDetailed,
IsDefault = s.CustomerAddressGuid == g.CustomerDefaultAddressGuid
});

1
ARW.Service/Api/BusinessService/GoodsManager/Goodss/GoodsServiceApi.cs
View File

@ -203,6 +203,7 @@ namespace ARW.Service.Api.BusinessService.GoodsManager.Goodss
SoldNum = s.GoodsSalesInitial + s.GoodsSalesActual,
Desc = s.GoodsDetails,
IsPutOnSale = s.GoodsShelfStatus,
GoodsSellingPoint = s.GoodsSellingPoint
}).Take(1);

4
ARW.Service/Business/BusinessService/OrderManage/Orders/OrderService.cs
View File

@ -77,10 +77,14 @@ namespace ARW.Service.Business.BusinessService.OrderManage.Orders
predicate = predicate.AndIF(parm.DeliveryStatus != null, s => s.DeliveryStatus == parm.DeliveryStatus);
predicate = predicate.AndIF(parm.ReceiptStatus != null, s => s.ReceiptStatus == parm.ReceiptStatus);
predicate = predicate.AndIF(parm.OrderStatus != null, s => s.OrderStatus == parm.OrderStatus);
predicate = predicate.AndIF(parm.BeginTime != DateTime.MinValue, s => s.Create_time >= parm.BeginTime);
predicate = predicate.AndIF(parm.EndTime != DateTime.MinValue, s => s.Create_time <= parm.EndTime);
var query = _OrderRepository
.Queryable()
.LeftJoin<Customer>((s, c) => s.CustomerGuid == c.CustomerGuid)
.Where(predicate.ToExpression())
.WhereIF(!string.IsNullOrEmpty(parm.CustomerNickNme), (s, c) => c.CustomerNickname.Contains(parm.CustomerNickNme) )
.WhereIF(!string.IsNullOrEmpty(parm.CustomerPhome), (s, c) => c.CustomerMobilePhoneNumber.Contains(parm.CustomerPhome))
.OrderBy(s => s.Create_time, OrderByType.Desc)
.Select((s, c) => new OrderVo
{