Commit b22dc6fe authored by liudong1993's avatar liudong1993

1

parent 3a352165
...@@ -972,7 +972,7 @@ namespace Mall.Module.Product ...@@ -972,7 +972,7 @@ namespace Mall.Module.Product
} }
//积分 //积分
Model.Entity.MarketingCenter.RB_Integral_Settings integralModel = new Model.Entity.MarketingCenter.RB_Integral_Settings(); 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(); 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 ...@@ -5922,6 +5922,7 @@ namespace Mall.Module.Product
FinishTime = model.FinishTime.HasValue ? model.FinishTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", 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") : "", CancelTime = model.CancelTime.HasValue ? model.CancelTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
model.Remark, model.Remark,
model.BuyerMessage,
model.PreferPrice, model.PreferPrice,
model.Income, model.Income,
model.CouponMoney, model.CouponMoney,
......
...@@ -3,6 +3,7 @@ using System.Collections.Generic; ...@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Mall.Common;
using Mall.Common.Plugin; using Mall.Common.Plugin;
using Mall.Model.Entity.Product; using Mall.Model.Entity.Product;
using Mall.Model.Entity.User; using Mall.Model.Entity.User;
...@@ -990,7 +991,7 @@ namespace Mall.Module.Product ...@@ -990,7 +991,7 @@ namespace Mall.Module.Product
string path_server = basepath + "\\upfile\\temporary\\" + pathName; string path_server = basepath + "\\upfile\\temporary\\" + pathName;
var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server); var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
//var Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), ""); //var Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), "");
return Robj; return "/upfile/temporary/" + pathName;
} }
return ""; return "";
} }
......
...@@ -126,6 +126,9 @@ namespace Mall.Repository.User ...@@ -126,6 +126,9 @@ namespace Mall.Repository.User
{ {
builder.Append($" AND a.{nameof(RB_Member_Integral_Extend.MallBaseId)}={query.MallBaseId}"); 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)) if (!string.IsNullOrWhiteSpace(query.MemberName))
{ {
builder.Append($" AND b.{nameof(RB_Member_User.Name)} like '%{query.MemberName}%'"); builder.Append($" AND b.{nameof(RB_Member_User.Name)} like '%{query.MemberName}%'");
......
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using System.Text.Unicode; using System.Text.Unicode;
...@@ -97,12 +98,12 @@ namespace Mall.WebApi ...@@ -97,12 +98,12 @@ namespace Mall.WebApi
// quartz.Stop(); //网站停止完成执行 // quartz.Stop(); //网站停止完成执行
//}); //});
//app.UseStaticFiles(new StaticFileOptions app.UseStaticFiles(new StaticFileOptions
//{ {
// FileProvider = new Microsoft.Extensions.FileProviders.PhysicalFileProvider( FileProvider = new Microsoft.Extensions.FileProviders.PhysicalFileProvider(
// Path.Combine(Directory.GetCurrentDirectory(), "ExportFile")), Path.Combine(Directory.GetCurrentDirectory(), "upfile")),
// RequestPath = "/ExportFile" RequestPath = "/upfile"
//}); });
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment