321321

server/HoneyBox/src/HoneyBox.Admin.Business/Models/Goods/GoodsModels.cs

@@ -184,6 +184,11 @@ public class GoodsCreateRequest
     /// 下架金额
     /// </summary>
     public decimal XiajiaJine { get; set; }
+
+    /// <summary>
+    /// 解锁金额（用户需消费满此金额才能看到此盒子，0表示无需解锁）
+    /// </summary>
+    public decimal UnlockAmount { get; set; }
 }
 
 /// <summary>
@@ -288,6 +293,11 @@ public class GoodsListResponse
     /// </summary>
     public int ChoujiangXianzhi { get; set; }
 
+    /// <summary>
+    /// 解锁金额
+    /// </summary>
+    public decimal UnlockAmount { get; set; }
+
     /// <summary>
     /// 创建时间
     /// </summary>

server/HoneyBox/src/HoneyBox.Admin.Business/Services/GoodsService.cs

@@ -129,6 +129,7 @@ public class GoodsService : IGoodsService
             XiajiaLirun = (int)request.XiajiaLirun,
             XiajiaAutoCoushu = (int)request.XiajiaAutoCoushu,
             XiajiaJine = (int)request.XiajiaJine,
+            UnlockAmount = request.UnlockAmount,
             Status = 0, // 默认下架
             PrizeNum = 0,
             IsFlw = (byte)(request.Type == 15 ? 1 : 0),
@@ -207,6 +208,7 @@ public class GoodsService : IGoodsService
         goods.XiajiaLirun = (int)request.XiajiaLirun;
         goods.XiajiaAutoCoushu = (int)request.XiajiaAutoCoushu;
         goods.XiajiaJine = (int)request.XiajiaJine;
+        goods.UnlockAmount = request.UnlockAmount;
         goods.IsFlw = (byte)(request.Type == 15 ? 1 : 0);
         goods.UpdatedAt = DateTime.Now;
 
@@ -677,6 +679,7 @@ public class GoodsService : IGoodsService
             FlwEndTime = goods.FlwEndTime,
             OpenTime = goods.OpenTime,
             ChoujiangXianzhi = goods.ChoujiangXianzhi,
+            UnlockAmount = goods.UnlockAmount,
             CreatedAt = goods.CreatedAt,
             UpdatedAt = goods.UpdatedAt
         };
@@ -712,6 +715,7 @@ public class GoodsService : IGoodsService
             FlwEndTime = goods.FlwEndTime,
             OpenTime = goods.OpenTime,
             ChoujiangXianzhi = goods.ChoujiangXianzhi,
+            UnlockAmount = goods.UnlockAmount,
             GoodsDescribe = goods.GoodsDescribe,
             NewIs = goods.NewIs,
             IsShouZhe = goods.IsShouZhe,

server/HoneyBox/src/HoneyBox.Admin.Business/Services/UserBusinessService.cs

@@ -1099,8 +1099,7 @@ public class UserBusinessService : IUserBusinessService
 
         if (request.UserId.HasValue)
         {
-            query = query.Where(u => u.Id == request.UserId.Value);
-            query = query.Where(u => u.Uid == request.UserId.ToString());
+            query = query.Where(u => u.Id == request.UserId.Value || u.Uid == request.UserId.ToString());
         }
 
         if (!string.IsNullOrWhiteSpace(request.Mobile))

server/HoneyBox/src/HoneyBox.Admin/admin-web/src/api/business/goods.ts

@@ -62,6 +62,7 @@ export interface GoodsListItem {
   flwEndTime: string | null
   openTime: string | null
   choujiangXianzhi: number
+  unlockAmount: number
   createdAt: string
   updatedAt: string
 }
@@ -81,6 +82,7 @@ export interface GoodsDetail extends GoodsListItem {
   flwEndTime: string | null
   openTime: string | null
   choujiangXianzhi: number
+  unlockAmount: number
   goodsDescribe: string | null
   newIs: number
   isShouZhe: number
@@ -124,6 +126,7 @@ export interface GoodsCreateRequest {
   xiajiaLirun?: number
   xiajiaAutoCoushu?: number
   xiajiaJine?: number
+  unlockAmount?: number
 }
 
 /** 更新盒子请求 */

server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsEditDialog.vue

@@ -497,6 +497,7 @@ const loadGoodsDetail = async () => {
     formData.imgUrlDetail = detail.imgUrlDetail
     formData.categoryId = detail.categoryId
     formData.couponPro = detail.couponPro
+    formData.unlockAmount = (detail as any).unlockAmount || 0
     
     // 福利屋时间
     formData.flwStartTime = detail.flwStartTime ? formatDateTime(detail.flwStartTime) : ''
@@ -598,6 +599,7 @@ const handleSubmit = async () => {
       xiajiaLirun: formData.xiajiaLirun,
       xiajiaAutoCoushu: formData.xiajiaAutoCoushu,
       xiajiaJine: formData.xiajiaJine,
+      unlockAmount: formData.unlockAmount,
     }
 
     await updateGoods(props.goodsId, requestData)

server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsTable.vue

@@ -62,6 +62,14 @@
         </template>
       </el-table-column>
 
+      <!-- 解锁金额 -->
+      <el-table-column label="解锁金额" width="100" align="center">
+        <template #default="{ row }">
+          <span v-if="row.unlockAmount > 0" class="unlock-value">¥{{ row.unlockAmount }}</span>
+          <span v-else class="text-muted">-</span>
+        </template>
+      </el-table-column>
+
       <!-- 福利屋时间信息 -->
       <el-table-column label="时间配置" width="180" v-if="hasFuLiWuType">
         <template #default="{ row }">
@@ -268,6 +276,11 @@ const formatTime = (time: string | null) => {
   font-weight: 500;
 }
 
+.unlock-value {
+  color: #409eff;
+  font-weight: 500;
+}
+
 .image-error {
   display: flex;
   justify-content: center;