From e04ab1229d3d296b1a8d387441ae6c8788bc5b03 Mon Sep 17 00:00:00 2001 From: gpu Date: Thu, 22 Jan 2026 00:40:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E5=92=8C=E6=8A=BD=E5=A5=96=E7=BB=93=E6=9E=9C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98=EF=BC=9A1.=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8num=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BC=A0=E9=80=92=E7=AE=B1=E5=8F=B7=202.=E4=BF=AE=E5=A4=8DLINQ?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=97=A0=E6=B3=95=E7=BF=BB=E8=AF=91=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- honey_box/package/index/leitai.vue | 2 +- honey_box/pages/infinite/bonus_house_details.vue | 2 +- honey_box/pages/mall/index.vue | 4 ++-- honey_box/pages/shouye/detail.vue | 4 ++-- server/HoneyBox/src/HoneyBox.Core/Services/OrderService.cs | 4 ++-- .../HoneyBox/src/HoneyBox.Model/Models/Order/OrderModels.cs | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) 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; } ///