提交代码

Mall.Module.Education/ActivityModule.cs

@@ -729,7 +729,7 @@ namespace Mall.Module.Education
                             Number = 1,//model.PeopleNum,
                             OriginalMoney = Convert.ToDecimal(model.Money) ,
                             UnitPrice = Convert.ToDecimal(model.Money) ,
-                            Remark = umodel.Name + model.ActivityId + model.MerchantsNo
+                            Remark = "微信昵称："+umodel.Name +"活动id："+ model.ActivityId + "订单号："+Out_Trade_No
                         }
                     };
 

Mall.WebApi/Startup.cs

@@ -59,8 +59,10 @@ namespace Mall.WebApi
             List<string> corsArray = new List<string>()
             {
                 "http://localhost:8081",
+                 "http://localhost:8181",
                 "http://localhost:8080",
                 "http://localhost:8082",
+                 "http://localhost:8083",
                 "http://127.0.0.1:50512",
                 "http://127.0.0.1:20224",
                 "http://127.0.0.1:28221",
@@ -70,9 +72,10 @@ namespace Mall.WebApi
                 "http://mall.oytour.com",
                 "http://testmall.oytour.com",
                 "http://yx.oytour.com",
+                "https://mallapi.oytour.com"
             };
             services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray())));
-         
+
             services.AddCap(x =>
             {
                 x.UseMongoDB(Common.Config.Mongo);
@@ -81,10 +84,10 @@ namespace Mall.WebApi
                     cfg.HostName = Common.Config.ReadConfigKey("RabbitMqConfig", "HostName");
                     cfg.VirtualHost = Common.Config.ReadConfigKey("RabbitMqConfig", "VirtualHost");
                     cfg.Port = Convert.ToInt32(Common.Config.ReadConfigKey("RabbitMqConfig", "Port"));
-                    cfg.UserName =  Common.Config.ReadConfigKey("RabbitMqConfig", "UserName");
+                    cfg.UserName = Common.Config.ReadConfigKey("RabbitMqConfig", "UserName");
                     cfg.Password = Common.Config.ReadConfigKey("RabbitMqConfig", "Password");
-                }); 
-                 //失败后的重试次数，默认50次；在FailedRetryInterval默认60秒的情况下，即默认重试50*60秒(50分钟)之后放弃失败重试
+                });
+                //失败后的重试次数，默认50次；在FailedRetryInterval默认60秒的情况下，即默认重试50*60秒(50分钟)之后放弃失败重试
                 x.FailedRetryCount = 10;
                 //失败后的重拾间隔，默认60秒
                 x.FailedRetryInterval = 10;
@@ -92,7 +95,7 @@ namespace Mall.WebApi
                 x.SucceedMessageExpiredAfter = 3600;
             });
         }
- 
+
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IHostApplicationLifetime appLifetime, IOptions<SenparcSetting> senparcSetting, IOptions<SenparcWeixinSetting> senparcWeixinSetting)