微店

Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs

@@ -47,6 +47,10 @@ namespace Mall.Model.Extend.Product
         /// </summary>
         public int? IsNotSelectCancel { get; set; }
         /// <summary>
+        /// 是否查询已付款的  1是  2否
+        /// </summary>
+        public int? IsSelectPayMoney { get; set; }
+        /// <summary>
         /// 商品id
         /// </summary>
         public int? GoodsId { get; set; }

Mall.Module.Product/OrderModule.cs

@@ -2846,7 +2846,13 @@ namespace Mall.Module.Product
                     {
                         return ApiResult.Failed("有商品不存在或者商品已失效");
                     }
-
+                    if (gmodel.PresentFXGrade > 0) {
+                        //是赠送VIP商品
+                        if (demodel.DetailList.Count() > 1) {
+                            //多商品
+                            return ApiResult.Failed("VIP商品不能与其他商品同时下单，请先购买VIP商品");
+                        }
+                    }
                     var categoryList = clist.Where(x => x.GoodsId == item.GoodsId).ToList();
                     if ((mallbaseModel?.IsFreeShipping ?? 0) == 1 && (gmodel.FullMoneyPinkage ?? 0) == 0 && (gmodel.FullNumPinkage ?? 0) == 0)
                     {

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -121,6 +121,9 @@ namespace Mall.Repository.Product
             {
                 where += $@" and o.{nameof(RB_Goods_Order.SmallShopsId)}={dmodel.SmallShopsId}";
             }
+            if (dmodel.IsSelectPayMoney == 1) {
+                where += $@" and o.{nameof(RB_Goods_Order.PaymentTime)} <> null";
+            }
 
             string sql = $@"SELECT o.*,u.Name as UserName,sshop.`Name` as SmallShopsName FROM rb_goods_order o
 INNER JOIN rb_goods_orderdetail od on o.OrderId=od.OrderId

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -73,6 +73,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 Consignee = newParms.GetStringValue("Consignee"),
                 Recycled = newParms.GetInt("Recycled"),
                 AnchorName = newParms.GetStringValue("AnchorName"),
+                IsSelectPayMoney = newParms.GetInt("IsSelectPayMoney", 0)
             };
 
             demodel.TenantId = parms.TenantId;