outsource/HaniBlindBox
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复订单创建和抽奖结果查询问题：1.前端统一使用num字段传递箱号 2.修复LINQ排序无法翻译的问题

Browse Source
This commit is contained in:
gpu 2026-01-22 00:40:32 +08:00
parent 2136c81e14
commit e04ab1229d
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
honey_box/package/index/leitai.vue
View File

@ -633,7 +633,7 @@ export default {
let data = { let data = {
goods_id: this.pageData.goods.id, goods_id: this.pageData.goods.id,
prize_num: this.buyNum, prize_num: this.buyNum,
goods_num: this.pageData.goods.num, num: this.pageData.goods.num,
use_money_is: this.useMoney ? 1 : 2, use_money_is: this.useMoney ? 1 : 2,
use_integral_is: this.useIntegral ? 1 : 2, use_integral_is: this.useIntegral ? 1 : 2,
coupon_id: (this.couponData && this.couponData.id) || "", coupon_id: (this.couponData && this.couponData.id) || "",

2
honey_box/pages/infinite/bonus_house_details.vue
View File

@ -344,7 +344,7 @@ export default {
let data = { let data = {
goods_id: this.goods_id, goods_id: this.goods_id,
prize_num: 1, prize_num: 1,
goods_num: 1, num: 1,
use_money_is: this.useMoney ? 1 : 2, use_money_is: this.useMoney ? 1 : 2,
use_integral_is: this.useIntegral ? 1 : 2, use_integral_is: this.useIntegral ? 1 : 2,
coupon_id: "", coupon_id: "",

4
honey_box/pages/mall/index.vue
View File

@ -251,7 +251,7 @@ export default {
const res = await calcMallOrderMoney({ const res = await calcMallOrderMoney({
prize_num: 1, prize_num: 1,
goods_id: data.id, goods_id: data.id,
goods_num: 1, num: 1,
}); });
if (res.status == 1) { if (res.status == 1) {
@ -295,7 +295,7 @@ export default {
let data = { let data = {
goods_id: this.goodsId, goods_id: this.goodsId,
prize_num: 1, prize_num: 1,
goods_num: 1, num: 1,
use_money_is: 2, use_money_is: 2,
use_integral_is: 2, use_integral_is: 2,
coupon_id: "", coupon_id: "",

4
honey_box/pages/shouye/detail.vue
View File

@ -470,7 +470,7 @@
let data = { let data = {
goods_id: this.pageData.goods.id, goods_id: this.pageData.goods.id,
prize_num: this.buyNum, prize_num: this.buyNum,
goods_num: this.pageData.goods.num, num: this.pageData.goods.num,
use_money_is: this.useMoney ? 1 : 2, use_money_is: this.useMoney ? 1 : 2,
use_integral_is: this.useIntegral ? 1 : 2, use_integral_is: this.useIntegral ? 1 : 2,
coupon_id: coupon_id, coupon_id: coupon_id,
@ -520,7 +520,7 @@
let data = { let data = {
goods_id: this.pageData.goods.id, goods_id: this.pageData.goods.id,
prize_num: this.buyNum, prize_num: this.buyNum,
goods_num: this.pageData.goods.num, num: this.pageData.goods.num,
use_money_is: this.useMoney ? 1 : 2, use_money_is: this.useMoney ? 1 : 2,
use_integral_is: this.useIntegral ? 1 : 2, use_integral_is: this.useIntegral ? 1 : 2,
coupon_id: coupon_id, coupon_id: coupon_id,

4
server/HoneyBox/src/HoneyBox.Core/Services/OrderService.cs
View File

@ -1752,6 +1752,8 @@ public class OrderService : IOrderService
// 3. 获取奖品列表（按goodslist_money降序，id升序排序） // 3. 获取奖品列表（按goodslist_money降序，id升序排序）
var prizeList = await _dbContext.OrderItems var prizeList = await _dbContext.OrderItems
.Where(oi => oi.UserId == userId && oi.OrderId == orderInfo.Id && oi.OrderType == orderInfo.OrderType) .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 .Select(oi => new PrizeOrderLogDto
{ {
Id = oi.Id, Id = oi.Id,
@ -1771,8 +1773,6 @@ public class OrderService : IOrderService
LuckNo = oi.LuckNo, LuckNo = oi.LuckNo,
AddTime = oi.Addtime AddTime = oi.Addtime
}) })
.OrderByDescending(p => p.GoodsListMoney)
.ThenBy(p => p.Id)
.ToListAsync(); .ToListAsync();
// 4. 获取赏品等级信息 // 4. 获取赏品等级信息

4
server/HoneyBox/src/HoneyBox.Model/Models/Order/OrderModels.cs
View File

@ -66,9 +66,9 @@ public class OrderBuyRequest
public int GoodsId { get; set; } public int GoodsId { get; set; }
/// <summary> /// <summary>
/// 箱号 /// 箱号（兼容前端 goods_num 字段）
/// </summary> /// </summary>
[JsonPropertyName("num")] [JsonPropertyName("goods_num")]
public int Num { get; set; } public int Num { get; set; }
/// <summary> /// <summary>