Skip to content

M
mall.oytour.com
Commit d70204ea authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent 6bbfe3e6
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
Mall.Module.Product/ProductModule.cs
View file @ d70204ea
......@@ -7823,7 +7823,7 @@ namespace Mall.Module.Product
#region 验证咖啡劵
if (demodel.GoodsEduType == 1) {
//咖啡劵商品需唯一
var kfList = goodsRepository.GetList(new RB_Goods_Extend() { MallBaseId = demodel.MallBaseId, GoodsEduType = 1 });
var kfList = goodsRepository.GetSingleList(new RB_Goods_Extend() { MallBaseId = demodel.MallBaseId, GoodsEduType = 1 });
if (kfList.Any()) {
return false;
}
......@@ -7965,21 +7965,21 @@ namespace Mall.Module.Product
}
if (demodel.GoodsEduType == 1) {
//咖啡劵商品
eduGoodsRepository.Insert(new Model.Entity.Coffee.RB_Goods()
{
CoverImage = demodel.CarouselImageList.Where(x => x.Type == 0).FirstOrDefault()?.Path ?? "",
CreateDate = DateTime.Now,
GoodsName = demodel.Name,
GoodsType = demodel.GoodsEduType,
Group_Id = 100000,
Id = 0,
MallBaseId = demodel.MallBaseId,
MallGoodsId = Id,
SellingPrice = demodel.SellingPrice ??0,
Status = 0,
UpdateDate = DateTime.Now
});
//咖啡劵商品 （分布式事务 无法跨服保存）
//eduGoodsRepository.Insert(new Model.Entity.Coffee.RB_Goods()
//{
// CoverImage = demodel.CarouselImageList.Where(x => x.Type == 0).FirstOrDefault()?.Path ?? "",
// CreateDate = DateTime.Now,
// GoodsName = demodel.Name,
// GoodsType = demodel.GoodsEduType,
// Group_Id = 100000,
// Id = 0,
// MallBaseId = demodel.MallBaseId,
// MallGoodsId = Id,
// SellingPrice = demodel.SellingPrice ??0,
// Status = 0,
// UpdateDate = DateTime.Now
//});
}
}
}
......
Mall.Module.User/UserCommonModule.cs
View file @ d70204ea
......@@ -421,7 +421,7 @@ namespace Mall.Module.User
keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitReceiving);
keyValues.Add(nameof(RB_Goods_Order_Extend.DeliveryTime), DateTime.Now);
}
else if (oldOrder.OrderClassify == 2 || oldOrder.VersionSource == 1)
else if (oldOrder.OrderClassify == 2 || oldOrder.VersionSource == 1 || oldOrder.OrderEduType == 1)
{
//if (oldOrder.OrderEduType == 2)
//教育订单 下单后 直接完成 无法取消订单 无法申请售后
......@@ -651,17 +651,17 @@ namespace Mall.Module.User
else
{
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(Model.Extend.Coffee.RB_Member_CoffeeCoupons_Extend.TotalBuyNum), ccmodel.TotalBuyNum + BuyNum },
{ nameof(Model.Extend.Coffee.RB_Member_CoffeeCoupons_Extend.SurplusBugNum), ccmodel.SurplusBugNum + BuyNum },
{ nameof(Model.Extend.Coffee.RB_Member_CoffeeCoupons_Extend.UpdateDate), DateTime.Now},
};
{ nameof(Model.Extend.Coffee.RB_Member_CoffeeCoupons_Extend.TotalBuyNum), ccmodel.TotalBuyNum + BuyNum },
{ nameof(Model.Extend.Coffee.RB_Member_CoffeeCoupons_Extend.SurplusBugNum), ccmodel.SurplusBugNum + BuyNum },
{ nameof(Model.Extend.Coffee.RB_Member_CoffeeCoupons_Extend.UpdateDate), DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName = nameof(Model.Extend.Coffee.RB_Member_CoffeeCoupons_Extend.Id),
FiledValue = ccmodel.Id,
OperatorEnum =OperatorEnum.Equal
}
};
new WhereHelper(){
FiledName = nameof(Model.Extend.Coffee.RB_Member_CoffeeCoupons_Extend.Id),
FiledValue = ccmodel.Id,
OperatorEnum =OperatorEnum.Equal
}
};
member_CoffeeCouponsRepository.Update(keyValues1, wheres1);
}
foreach (var qitem in orderGoodsList)
......@@ -840,7 +840,7 @@ namespace Mall.Module.User
Income = oldOrder.Income ?? 0,
Fee = oldOrder.Fee ?? 0,
Refund = 0,
Remark = "",
Remark = detailModel.PresentCoffeeNum > 0 ? "购买" + detailModel.Number + "杯，赠送" + detailModel.PresentCoffeeNum + "杯" : "",
OrderStatus = 2,
PaymentTime = DateTime.Now,
CancelTime = null,
......
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