解决冲突

Mall.Module.Product/ProductModule.cs

@@ -2348,7 +2348,7 @@ namespace Mall.Module.Product
             else
             {
 
-                if (model.IsCustomSpecification == 1)
+                if (model.IsCustomSpecification == 1 && model.SpecificationPriceList!=null && model.SpecificationPriceList.Count>0)
                 {
                     price_member_min = price_min = model.SpecificationPriceList.Where(x => x.SellingPrice > 0).Min(x => x.SellingPrice ?? 0);
                     price_member_max = price_max = model.SpecificationPriceList.Where(x => x.SellingPrice > 0).Max(x => x.SellingPrice ?? 0);

Mall.Repository/Miai/RB_Miai_DatingRepository.cs

@@ -4,6 +4,7 @@ using System.Text;
 using Mall.Model.Entity.Miai;
 using Mall.Model.Extend.Miai;
 using System.Linq;
+using VT.FW.DB.Dapper;
 
 namespace Mall.Repository.Miai
 {
@@ -23,6 +24,7 @@ namespace Mall.Repository.Miai
         /// <returns></returns>
         public List<RB_Miai_Dating_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Miai_Dating_Extend dmodel)
         {
+            var parameters = new DynamicParameters();
             string where = $" 1=1 and d.{nameof(RB_Miai_Dating_Extend.Status)}=0";
             if (dmodel.TenantId > 0) {
                 where += $@" and d.{nameof(RB_Miai_Dating_Extend.TenantId)}={dmodel.TenantId}";
@@ -35,16 +37,17 @@ namespace Mall.Repository.Miai
             {
                 where += $@" and (d.{nameof(RB_Miai_Dating_Extend.ManId)} ={dmodel.UserId} or d.{nameof(RB_Miai_Dating_Extend.WoManId)} ={dmodel.UserId})";
             }
-            if (!string.IsNullOrEmpty(dmodel.UserName))
+            if (!string.IsNullOrEmpty(dmodel.UserName)&& dmodel.UserName.Trim()!="")
             {
-                where += $@" and (u1.`Name` like '%{dmodel.UserName}%' or u2..`Name` like '%{dmodel.UserName}%')";
+                where += $@" and (u1.`Name` like @UserName or u2..`Name` like @UserName )";
+                parameters.Add("UserName", "%" + dmodel.UserName.Trim() + "%");
             }
 
             string sql = $@"select d.*,u1.`Name` as ManName,u1.Photo as ManPhoto,u2.`Name` as WoManName,u2.Photo as WoManPhoto from RB_Miai_Dating d
 left join rb_member_user u1 on d.ManId = u1.Id
 left join rb_member_user u2 on d.WoManId = u2.Id
 where {where} order by d.Id desc";
-            return GetPage<RB_Miai_Dating_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+            return GetPage<RB_Miai_Dating_Extend>(pageIndex, pageSize, out rowCount, sql, parameters).ToList();
         }
     }
 }

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -838,7 +838,7 @@ WHERE {where} group by g.Id order by g.CreateDate desc";
             {
                 where += $@" and g.{nameof(RB_Goods_Extend.SupplierId)} in({dmodel.SupplierIds})";
             }
-            if (!string.IsNullOrEmpty(dmodel.Name))
+            if (!string.IsNullOrEmpty(dmodel.Name) && dmodel.Name.Trim() != "")
             {
                 where += $@" and g.{nameof(RB_Goods_Extend.Name)} like @Name ";
                 parameters.Add("Name", "%" + dmodel.Name.Trim() + "%");

Mall.ThirdCore/ConfigValue.json

@@ -15,5 +15,5 @@
     "masterSecret": "dda819c1de00c64ae0fad4c7"
   },
   //消息推送rabbit配置（ip,端口,账号,密码,推送队列名）
-  "WebPushRabbitConfig": "192.168.1.214,5672,rbAdmin,rbadmin123456,WebPushRabbitMQ"
+  "WebPushRabbitConfig": "192.168.20.214,5672,rbAdmin,rbadmin123456,WebPushRabbitMQ"
 }

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -161,7 +161,40 @@ namespace Mall.WebApi.Controllers.MallBase
                 return ApiResult.Failed("请上传身份证信息");
             }
 
-            RB_Miai_Activity_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Activity_Extend>(parms.msg.ToString());
+            JObject jobj = JObject.Parse(parms.msg.ToString());
+            RB_Miai_Activity_Extend demodel = new RB_Miai_Activity_Extend()
+            {
+                Id=jobj.GetInt("Id"),
+                ForumId=jobj.GetInt("ForumId"),
+                ActivityTitle=jobj.GetStringValue("ActivityTitle"),
+                Content=jobj.GetStringValue("Content"),
+                ImageList=new List<string> (),
+                Deadline=jobj.GetDateTime("Deadline"),
+                LabelList=new List<string> (),
+                IsOpenEnroll=jobj.GetInt("IsOpenEnroll"),
+                StartTime=jobj.GetDateTime("StartTime"),
+                EndTime=jobj.GetDateTime("EndTime"),
+                ManNum=jobj.GetInt("ManNum"),
+                WoManNum=jobj.GetInt("WoManNum"),
+                LonLat=jobj.GetStringValue("LonLat"),
+                LocationName=jobj.GetStringValue("LocationName"),
+            };
+            try
+            {
+                demodel.ImageList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(jobj.GetStringValue("ImageList"));
+            }
+            catch(Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "SetActivityInfo_ImageList");
+            }
+            try
+            {
+                demodel.LabelList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(jobj.GetStringValue("LabelList"));
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "SetActivityInfo_LabelList");
+            }
             if (demodel.ForumId <= 0)
             {
                 return ApiResult.ParamIsNull("请传递版块id");

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -432,7 +432,15 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             int UserId = req.UserId;
 
-            var Robj = productModule.GetAppletGoodsInfo_V2(GoodsId, UserId, req.SmallShopsId, req.TenantId, req.MallBaseId);
+            var Robj = new object();
+            try
+            {
+                Robj = productModule.GetAppletGoodsInfo_V2(GoodsId, UserId, req.SmallShopsId, req.TenantId, req.MallBaseId);
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, string.Format("GetAppletGoodsInfo:{0}",Common.Plugin.JsonHelper.Serialize(requestMsg)));
+            }
             return ApiResult.Success("", Robj);
         }
 

Mall.WebApi/Controllers/User/EmployeeController.cs

@@ -149,7 +149,15 @@ namespace Mall.WebApi.Controllers.User
         /// <returns></returns>
         public ApiResult SetEmployee()
         {
-            var extModel = JsonConvert.DeserializeObject<RB_Employee_Extend>(RequestParm.msg.ToString());
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var extModel = new RB_Employee_Extend()
+            {
+                EmpId = parms.GetInt("EmpId"),
+                EmpAccount = parms.GetStringValue("EmpAccount"),
+                EmpName = parms.GetStringValue("EmpName"),
+                EmpPwd = parms.GetStringValue("EmpPwd"),
+                RoleAuth=parms.GetStringValue("RoleAuth"),
+            };
             extModel.Status = 0;
             extModel.MallBaseId = RequestParm.MallBaseId;
             extModel.TenantId = RequestParm.TenantId;

Mall.WebApi/appsettings.json

 {
   "ConnectionStrings": {
-    "DefaultConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "DefaultConnectionPName": "MySql.Data.MySqlClient",
-    "FinanceConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "FinanceConnectionPName": "MySql.Data.MySqlClient",
-    "UserConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "UserConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_user;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "UserConnectionPName": "MySql.Data.MySqlClient",
-    "PropertyConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8mb4; Convert Zero Datetime=true; ",
+    "PropertyConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_property;CharSet=utf8mb4; Convert Zero Datetime=true; ",
     "PropertyConnectionPName": "MySql.Data.MySqlClient"
   },
   "Logging": {
@@ -26,7 +26,7 @@
   "ApiExpirTime": 2592000,
   "AllowedHosts": "*",
   "OpenValidation": "False",
-  "UploadSiteUrl": "http://192.168.1.214:8120",
+  "UploadSiteUrl": "http://192.168.20.214:8120",
   "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
   "AliFileSiteUrl": "https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com",
   "ImKey": "b612b31e837c79c68f141aeb719d2b20",

Mall.WebApi/appsettings2.json

@@ -15,7 +15,7 @@
   "ApiExpirTime": 2592000,
   "AllowedHosts": "*",
   "OpenValidation": "False",
-  "UploadSiteUrl": "http://192.168.1.214:8120",
+  "UploadSiteUrl": "http://192.168.20.214:8120",
   "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
   "ImKey": "b612b31e837c79c68f141aeb719d2b20",
   "ImSecret": "66000451fb72",

Mall.WindowsService/appsettings.json

 {
   "ConnectionStrings": {
-    "DefaultConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall_3;CharSet=utf8; Convert Zero Datetime=true; ",
+    "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_mall_3;CharSet=utf8; Convert Zero Datetime=true; ",
     "DefaultConnectionPName": "MySql.Data.MySqlClient",
-    "FinanceConnection": "server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; ",
+    "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_finance;CharSet=utf8; Convert Zero Datetime=true; ",
     "FinanceConnectionPName": "MySql.Data.MySqlClient"
   },
   "Logging": {

Test/App.config

@@ -4,7 +4,7 @@
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
     </startup>
   <connectionStrings>
-    <add name="DefaultConnection" providerName="MySql.Data.MySqlClient" connectionString="server=192.168.1.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8; Convert Zero Datetime=true; " />
+    <add name="DefaultConnection" providerName="MySql.Data.MySqlClient" connectionString="server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_mall;CharSet=utf8; Convert Zero Datetime=true; " />
   </connectionStrings>
 <system.data>
     <DbProviderFactories>