diff --git a/honey_box/package/index/leitai.vue b/honey_box/package/index/leitai.vue index 0cb4da84..74695f7c 100644 --- a/honey_box/package/index/leitai.vue +++ b/honey_box/package/index/leitai.vue @@ -633,7 +633,7 @@ export default { let data = { goods_id: this.pageData.goods.id, prize_num: this.buyNum, - goods_num: this.pageData.goods.num, + num: this.pageData.goods.num, use_money_is: this.useMoney ? 1 : 2, use_integral_is: this.useIntegral ? 1 : 2, coupon_id: (this.couponData && this.couponData.id) || "", diff --git a/honey_box/pages/infinite/bonus_house_details.vue b/honey_box/pages/infinite/bonus_house_details.vue index c80370bd..4ba36554 100644 --- a/honey_box/pages/infinite/bonus_house_details.vue +++ b/honey_box/pages/infinite/bonus_house_details.vue @@ -344,7 +344,7 @@ export default { let data = { goods_id: this.goods_id, prize_num: 1, - goods_num: 1, + num: 1, use_money_is: this.useMoney ? 1 : 2, use_integral_is: this.useIntegral ? 1 : 2, coupon_id: "", diff --git a/honey_box/pages/mall/index.vue b/honey_box/pages/mall/index.vue index e0f1e02b..f75847a4 100644 --- a/honey_box/pages/mall/index.vue +++ b/honey_box/pages/mall/index.vue @@ -251,7 +251,7 @@ export default { const res = await calcMallOrderMoney({ prize_num: 1, goods_id: data.id, - goods_num: 1, + num: 1, }); if (res.status == 1) { @@ -295,7 +295,7 @@ export default { let data = { goods_id: this.goodsId, prize_num: 1, - goods_num: 1, + num: 1, use_money_is: 2, use_integral_is: 2, coupon_id: "", diff --git a/honey_box/pages/shouye/detail.vue b/honey_box/pages/shouye/detail.vue index cbc98818..608ac1a8 100644 --- a/honey_box/pages/shouye/detail.vue +++ b/honey_box/pages/shouye/detail.vue @@ -470,7 +470,7 @@ let data = { goods_id: this.pageData.goods.id, prize_num: this.buyNum, - goods_num: this.pageData.goods.num, + num: this.pageData.goods.num, use_money_is: this.useMoney ? 1 : 2, use_integral_is: this.useIntegral ? 1 : 2, coupon_id: coupon_id, @@ -520,7 +520,7 @@ let data = { goods_id: this.pageData.goods.id, prize_num: this.buyNum, - goods_num: this.pageData.goods.num, + num: this.pageData.goods.num, use_money_is: this.useMoney ? 1 : 2, use_integral_is: this.useIntegral ? 1 : 2, coupon_id: coupon_id, diff --git a/server/HoneyBox/src/HoneyBox.Core/Services/OrderService.cs b/server/HoneyBox/src/HoneyBox.Core/Services/OrderService.cs index dbcf2791..506736cd 100644 --- a/server/HoneyBox/src/HoneyBox.Core/Services/OrderService.cs +++ b/server/HoneyBox/src/HoneyBox.Core/Services/OrderService.cs @@ -1752,6 +1752,8 @@ public class OrderService : IOrderService // 3. 获取奖品列表(按goodslist_money降序,id升序排序) var prizeList = await _dbContext.OrderItems .Where(oi => oi.UserId == userId && oi.OrderId == orderInfo.Id && oi.OrderType == orderInfo.OrderType) + .OrderByDescending(oi => oi.GoodslistMoney) + .ThenBy(oi => oi.Id) .Select(oi => new PrizeOrderLogDto { Id = oi.Id, @@ -1771,8 +1773,6 @@ public class OrderService : IOrderService LuckNo = oi.LuckNo, AddTime = oi.Addtime }) - .OrderByDescending(p => p.GoodsListMoney) - .ThenBy(p => p.Id) .ToListAsync(); // 4. 获取赏品等级信息 diff --git a/server/HoneyBox/src/HoneyBox.Model/Models/Order/OrderModels.cs b/server/HoneyBox/src/HoneyBox.Model/Models/Order/OrderModels.cs index 0b6027a8..2348f045 100644 --- a/server/HoneyBox/src/HoneyBox.Model/Models/Order/OrderModels.cs +++ b/server/HoneyBox/src/HoneyBox.Model/Models/Order/OrderModels.cs @@ -66,9 +66,9 @@ public class OrderBuyRequest public int GoodsId { get; set; } /// - /// 箱号 + /// 箱号(兼容前端 goods_num 字段) /// - [JsonPropertyName("num")] + [JsonPropertyName("goods_num")] public int Num { get; set; } ///