1

Mall.Module.Product/OrderModule.cs

@@ -972,7 +972,7 @@ namespace Mall.Module.Product
             }
             //积分
             Model.Entity.MarketingCenter.RB_Integral_Settings integralModel = new Model.Entity.MarketingCenter.RB_Integral_Settings();
-            if (demodel.Use_Integral == 1 && umodel.Integral > 0)
+            if (umodel.Integral > 0)
             {
                 integralModel = integral_SettingsRepository.GetIntegralSettingsList(new Model.Entity.MarketingCenter.RB_Integral_Settings() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
             }
@@ -5922,6 +5922,7 @@ namespace Mall.Module.Product
                 FinishTime = model.FinishTime.HasValue ? model.FinishTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                 CancelTime = model.CancelTime.HasValue ? model.CancelTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                 model.Remark,
+                model.BuyerMessage,
                 model.PreferPrice,
                 model.Income,
                 model.CouponMoney,

Mall.Module.Product/ProductModule.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using Mall.Common;
 using Mall.Common.Plugin;
 using Mall.Model.Entity.Product;
 using Mall.Model.Entity.User;
@@ -990,7 +991,7 @@ namespace Mall.Module.Product
                 string path_server = basepath + "\\upfile\\temporary\\" + pathName;
                 var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
                 //var Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), "");
-                return Robj;
+                return "/upfile/temporary/" + pathName;
             }
             return "";
         }

Mall.Repository/User/RB_Member_IntegralRepository.cs

@@ -126,6 +126,9 @@ namespace Mall.Repository.User
                 {
                     builder.Append($" AND a.{nameof(RB_Member_Integral_Extend.MallBaseId)}={query.MallBaseId}");
                 }
+                if (query.UserId > 0) {
+                    builder.Append($" AND a.{nameof(RB_Member_Integral_Extend.UserId)}={query.UserId}");
+                }
                 if (!string.IsNullOrWhiteSpace(query.MemberName))
                 {
                     builder.Append($" AND b.{nameof(RB_Member_User.Name)} like '%{query.MemberName}%'");

Mall.WebApi/Startup.cs

 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text.Encodings.Web;
 using System.Text.Unicode;
@@ -97,12 +98,12 @@ namespace Mall.WebApi
             //    quartz.Stop();  //网站停止完成执行
 
             //});
-            //app.UseStaticFiles(new StaticFileOptions
-            //{
-            //    FileProvider = new Microsoft.Extensions.FileProviders.PhysicalFileProvider(
-            //    Path.Combine(Directory.GetCurrentDirectory(), "ExportFile")),
-            //    RequestPath = "/ExportFile"
-            //});
+            app.UseStaticFiles(new StaticFileOptions
+            {
+                FileProvider = new Microsoft.Extensions.FileProviders.PhysicalFileProvider(
+                Path.Combine(Directory.GetCurrentDirectory(), "upfile")),
+                RequestPath = "/upfile"
+            });
         }
     }
 }