Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Module.Product/OrderModule.cs

@@ -7572,7 +7572,7 @@ namespace Mall.Module.Product
         /// <param name="transactionId">微信订单号</param>
         /// <param name="refundid">微信退款单号</param>
         /// <returns></returns>
-        public bool SetOrderApplyForCancelAudit(RB_Goods_Order_Extend omodel, int type, string remark, string RefundOrderNo, int tenantId, int mallBaseId, Common.Enum.Goods.OrderPayTypeEnum payType, string dPrice, string outTradeNo, string transactionId, string refundid)
+        public bool SetOrderApplyForCancelAudit(RB_Goods_Order_Extend omodel, int type, string remark, string RefundOrderNo, int tenantId, int mallBaseId, Common.Enum.Goods.OrderPayTypeEnum payType, string dPrice, string outTradeNo, string transactionId, string refundid,int empId)
         {
             var trans = goods_OrderRepository.DbTransaction;
             try
@@ -7767,7 +7767,7 @@ namespace Mall.Module.Product
                         new MiniProgramMsgModule().SendOrderCancelMsg(tenantId, mallBaseId, umodel.OpenId, omodel.OrderNo, "订单已取消", (omodel.Income ?? 0).ToString(), goodsName);
                     }
                     //记录日志
-                    string Content = $"客人申请取消订单，审核：{(type == 1 ? "同意" : "拒绝")}";
+                    string Content = $"empId：{empId} 客人申请取消订单，审核：{(type == 1 ? "同意" : "拒绝")}";
                     if (type == 2)
                     {
                         Content += "，拒绝理由：" + remark;

Mall.Module.Product/ProductModule.cs

@@ -455,6 +455,18 @@ namespace Mall.Module.Product
             return list;
         }
 
+        /// <summary>
+        /// 设置分类显示隐藏
+        /// </summary>
+        /// <param name="isShow"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public bool SetProductCategoryShow(int isShow, int tenantId, int mallBaseId)
+        {
+            return product_CategoryRepository.SetProductCategoryShow(isShow, tenantId, mallBaseId);
+        }
+
         /// <summary>
         /// 获取商品推荐列表
         /// </summary>

Mall.Repository/Product/RB_Product_CategoryRepository.cs

@@ -107,5 +107,25 @@ namespace Mall.Repository.Product
             string sql = $@"select * from RB_Product_Category where {where} order by Id asc";
             return Get<RB_Product_Category_Extend>(sql).ToList();
         }
+
+        /// <summary>
+        /// 设置分类显示/隐藏
+        /// </summary>
+        /// <param name="isShow"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public bool SetProductCategoryShow(int isShow, int tenantId, int mallBaseId)
+        {
+            string sql;
+            if (isShow == 1)
+            {
+                sql = $@"UPDATE rb_product_category  SET IsShow =2 WHERE TenantId ={tenantId} and MallBaseId={mallBaseId} and `Status`=0 AND Enabled =1 AND IsShow =1;";
+            }
+            else {
+                sql = $@"UPDATE rb_product_category  SET IsShow =1 WHERE TenantId ={tenantId} and MallBaseId={mallBaseId} and `Status`=0 AND Enabled =1 AND IsShow =2;";
+            }
+            return Execute(sql) > 0;
+        }
     }
 }

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -926,7 +926,7 @@ namespace Mall.WebApi.Controllers.MallBase
 
 
                     var dic = ((Dictionary<string, string>)Robj.Data);
-                    bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, RefundOrderNo, req.TenantId, req.MallBaseId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, dic["dPrice"], dic["sOrderNo"], dic["sTradeNo"], dic["refundid"]);
+                    bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, RefundOrderNo, req.TenantId, req.MallBaseId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, dic["dPrice"], dic["sOrderNo"], dic["sTradeNo"], dic["refundid"], req.EmpId);
                     if (flag)
                     {
                         return ApiResult.Success();
@@ -944,7 +944,7 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             else
             {
-                bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, "", req.TenantId, req.MallBaseId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, "", "", "", "");
+                bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, "", req.TenantId, req.MallBaseId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, "", "", "", "", req.EmpId);
                 if (flag)
                 {
                     return ApiResult.Success();

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -659,6 +659,26 @@ namespace Mall.WebApi.Controllers.MallBase
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 分类显示 + 影藏
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetProductCategoryShow() {
+            var req = RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int IsShow = parms.GetInt("IsShow", 2);//2 显示 1隐藏
+
+            bool flag = productModule.SetProductCategoryShow(IsShow, req.TenantId, req.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed();
+            }
+        }
+
         #endregion
 
         #region 商品规格