提交代码

Mall.Model/Entity/MarketingCenter/RB_DiscountCoupon.cs

@@ -106,7 +106,7 @@ namespace Mall.Model.Entity.MarketingCenter
 
 
         /// <summary>
-        /// 领取方式设置2-领劵中心
+        /// 领取方式设置1-领劵中心
         /// </summary>
         public int PickupCenter { get; set; }
 

Mall.Model/Entity/User/RB_MiniProgram.cs

@@ -371,5 +371,11 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public int LivePlayerPlugin { get; set; }
 
+
+        /// <summary>
+        /// 发布时填写的版本号
+        /// </summary>
+        public string Version { get; set; }
+
     }
 }

Mall.Model/Extend/User/RB_MiniProgram_Extend.cs

@@ -12,6 +12,7 @@ namespace Mall.Model.Extend.User
     [DB(ConnectionName = "DefaultConnection")]
     public class RB_MiniProgram_Extend : Model.Entity.User.RB_MiniProgram
     {
+
         /// <summary>
         /// 账号
         /// </summary>
@@ -91,5 +92,7 @@ namespace Mall.Model.Extend.User
         /// 获取可跳转小程序
         /// </summary>
         public string[] JumpAppIdList { get; set; }
+
+     
     }
 }

Mall.Module.User/MiniProgramModule.cs

@@ -528,6 +528,48 @@ namespace Mall.Module.User
                         };
             return programRepository.Update(fileds, whereHelpers);
         }
+
+
+
+
+        /// <summary>
+        /// 修改微信小程序是否开启直播
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateLivePlayerPlugin(RB_MiniProgram_Extend model)
+        {
+            IDictionary<string, object> fileds = new Dictionary<string, object>()
+                         {
+                            { nameof(RB_MiniProgram_Extend.LivePlayerPlugin),model.LivePlayerPlugin},
+                          };
+            IList<WhereHelper> whereHelpers = new List<WhereHelper>()
+                        {
+                            new WhereHelper (){ FiledName=nameof(RB_MiniProgram.MallBaseId),FiledValue=model.MallBaseId,OperatorEnum=OperatorEnum.Equal}
+                        };
+            return programRepository.Update(fileds, whereHelpers);
+        }
+
+
+        /// <summary>
+        /// 修改当前小程序发布的版本号
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateVersion(RB_MiniProgram_Extend model)
+        {
+            IDictionary<string, object> fileds = new Dictionary<string, object>()
+                         {
+                            { nameof(RB_MiniProgram_Extend.Version),model.Version},
+                          };
+            IList<WhereHelper> whereHelpers = new List<WhereHelper>()
+                        {
+                            new WhereHelper (){ FiledName=nameof(RB_MiniProgram.MallBaseId),FiledValue=model.MallBaseId,OperatorEnum=OperatorEnum.Equal}
+                        };
+            return programRepository.Update(fileds, whereHelpers);
+        }
+
+
         #endregion
 
 

Mall.Repository/Product/RB_Goods_OrderRepository.cs

@@ -557,8 +557,8 @@ LEFT JOIN rb_member_user as c on b.UserId=c.Id
             {
                 if (dmodel.OrderStatus == 1)
                 {
-                    where += $@" and a.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,4,3)";
-                    payMemerNumWhere += $@" and {nameof(RB_Goods_Order.OrderStatus)}in(1,2,4,3)";
+                    where += $@" and a.{nameof(RB_Goods_Order.OrderStatus)}  in (1,2,4,3)";
+                    payMemerNumWhere += $@" and {nameof(RB_Goods_Order.OrderStatus)} in (1,2,4,3)";
                 }
                 else if (dmodel.OrderStatus == 2)
                 {

Mall.WebApi/Controllers/AppletWeChat/PublishController.cs

@@ -97,7 +97,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
 
 
         /// <summary>
-        /// 获取项目预览二维码
+        /// 发布小程序
         /// </summary>
         /// <returns></returns>
         [HttpPost]
@@ -115,13 +115,25 @@ namespace Mall.WebApi.Controllers.AppletWeChat
 
             try
             {
-                string URL = $"http://127.0.0.1:{developerKitsPort}/v2/upload?project={Mall.Common.Plugin.StringHelper.UrlEncode(projectUrl)}&version=v1.0.0&desc=微信开发者工具HTTP上传&appid={model.MiniAppId}";
+                if (string.IsNullOrWhiteSpace(query.Version))
+                {
+                    query.Version = "1.0.0";
+                }
+
+                int version = Convert.ToInt32(query.Version.Replace(".", ""));
+                version += 1;
+                query.Version = version.ToString().Substring(0, version.ToString().Length - 2) +"."+ version.ToString().Substring(version.ToString().Length - 2, 1) + "." + version.ToString().Substring(version.ToString().Length - 1, 1);
+
+                string URL = $"http://127.0.0.1:{developerKitsPort}/v2/upload?project={Mall.Common.Plugin.StringHelper.UrlEncode(projectUrl)}&version=V{query.Version}&desc=微信开发者工具HTTP上传&appid={model.MiniAppId}";
                 string result = Mall.Common.Plugin.HttpHelper.HttpGet(URL, Encoding.UTF8, "");
                 JObject parmsJob = JObject.Parse(result);
                 if (parmsJob.ContainsKey("code"))
                 {
                     return ApiResult.Failed(parmsJob.GetValue("message").ToString());
                 }
+                //更新版本
+                appletWeChatModule.UpdateVersion(query);
+
                 return ApiResult.Success("上传成功", result);
             }
             catch (Exception ex)

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -568,6 +568,23 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
 
+
+
+        /// <summary>
+        /// 获取订单类型枚举下拉
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetOrderTypeEnumEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(OrderTypeEnum));
+            return ApiResult.Success("", list.Select(x => new
+            {
+                Name = x.Key,
+                Id = Convert.ToInt32(x.Value)
+            }));
+        }
+
         #endregion
 
         #region 会员购买

Mall.WebApi/Controllers/User/TenantController.cs

@@ -403,7 +403,7 @@ namespace Mall.WebApi.Controllers.User
         }
 
 
-        #region 设置可跳转小程序
+        #region 设置可跳转小程序 OR  是否开启直播
         /// <summary>
         /// 设置可跳转小程序
         /// </summary>
@@ -434,7 +434,28 @@ namespace Mall.WebApi.Controllers.User
             }
         }
 
-
+        /// <summary>
+        /// 设置可跳转小程序
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult UpdateLivePlayerPlugin()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_MiniProgram_Extend>(RequestParm.msg.ToString());
+            query.MallBaseId = parms.MallBaseId;
+            query.TenantId = UserInfo.TenantId;
+           
+            bool result = programModule.UpdateLivePlayerPlugin(query);
+            if (result)
+            {
+                return ApiResult.Success("小程序直播组件设置成功");
+            }
+            else
+            {
+                return ApiResult.Failed("小程序直播组件设置失败");
+            }
+        }
 
         /// <summary>
         /// 根据小程序编号获取小程序信息