Skip to content

M
mall.oytour.com
Commit daf62e7a authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parents e0ef81e6 d6a2add9
Show whitespace changes
Inline Side-by-side
Showing with 105 additions and 73 deletions
Mall.Common/Plugin/HttpHelper.cs
View file @ daf62e7a
...@@ -558,9 +558,6 @@ namespace Mall.Common.Plugin ...@@ -558,9 +558,6 @@ namespace Mall.Common.Plugin
{ {
Size = img.Height; Size = img.Height;
} }
if (Size > imgBack.Width) {
Size = imgBack.Width;
}
img = CutEllipse(img, new Rectangle(0, 0, Size, Size), new Size(Size, Size)); img = CutEllipse(img, new Rectangle(0, 0, Size, Size), new Size(Size, Size));
Graphics g = Graphics.FromImage(imgBack); Graphics g = Graphics.FromImage(imgBack);
g.DrawImage(imgBack, 0, 0, imgBack.Width, imgBack.Height); //g.DrawImage(imgBack, 0, 0, 相框宽, 相框高); g.DrawImage(imgBack, 0, 0, imgBack.Width, imgBack.Height); //g.DrawImage(imgBack, 0, 0, 相框宽, 相框高);
......
Mall.Module.Property/PropertyModule.cs
View file @ daf62e7a
...@@ -777,7 +777,7 @@ namespace Mall.Module.Property ...@@ -777,7 +777,7 @@ namespace Mall.Module.Property
UpdateDate = demodel.UpdateDate UpdateDate = demodel.UpdateDate
}, trans); }, trans);
if (false) if (demodel.StockInState == 1)
{ {
//新增库存表数据 //新增库存表数据
var ilist = supplies_InventoryRepository.GetList(new RB_Supplies_Inventory_Extend() { RB_Group_Id = demodel.RB_Group_Id, WarehouseId = demodel.WarehouseId, SuppliesId = item.SuppliesId }); var ilist = supplies_InventoryRepository.GetList(new RB_Supplies_Inventory_Extend() { RB_Group_Id = demodel.RB_Group_Id, WarehouseId = demodel.WarehouseId, SuppliesId = item.SuppliesId });
...@@ -849,12 +849,8 @@ namespace Mall.Module.Property ...@@ -849,12 +849,8 @@ namespace Mall.Module.Property
#region 新增耗材入库流程 #region 新增耗材入库流程
//判断是否需要流程审批 //判断是否需要流程审批
if (rmodel != null && rmodel.Enabled == 1) if (rmodel != null && rmodel.Enabled == 1 && tmodel != null)
{
if (tmodel == null)
{ {
return true;
}
var financeObj = new { StockInId = Id }; var financeObj = new { StockInId = Id };
string sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey); string sign = EncryptionHelper.AesEncrypt(JsonHelper.Serialize(financeObj), Config.FinanceKey);
var resultInfo = new var resultInfo = new
......
Mall.Module.User/UserModule.cs
View file @ daf62e7a
...@@ -263,7 +263,7 @@ namespace Mall.Module.User ...@@ -263,7 +263,7 @@ namespace Mall.Module.User
public int AddMemberUserInfo(RB_Member_User_Extend demodel) public int AddMemberUserInfo(RB_Member_User_Extend demodel)
{ {
int result = 0; int result = 0;
result= member_UserRepository.Insert(demodel); result = member_UserRepository.Insert(demodel);
//result = member_UserRepository.SetMemberUserRepository(demodel); //result = member_UserRepository.SetMemberUserRepository(demodel);
return result; return result;
} }
...@@ -3399,7 +3399,7 @@ namespace Mall.Module.User ...@@ -3399,7 +3399,7 @@ namespace Mall.Module.User
UserName = umodel.Name, UserName = umodel.Name,
umodel.Photo, umodel.Photo,
GradeName, GradeName,
GradeIcon=Icon, GradeIcon = Icon,
SuperiorId, SuperiorId,
SuperiorName, SuperiorName,
DistributorGradeEntrance = HpEnabled == 1 ? 2 : (basicsModel?.GradeEntrance ?? 2), DistributorGradeEntrance = HpEnabled == 1 ? 2 : (basicsModel?.GradeEntrance ?? 2),
...@@ -5606,7 +5606,7 @@ namespace Mall.Module.User ...@@ -5606,7 +5606,7 @@ namespace Mall.Module.User
int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value); int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
if (IsNormalServer != 1) if (IsNormalServer != 1)
{ {
token = "36_k9Yprh3EpK1OlRt5a23mjp-WXLUjDzV6Vn8qiyb3ppbsXqhIaAQo5ibLi9xh1fxxRTVPvdplYVawG-TIzxw1x32pB-fhfX7cFYs2LSpKgnn7Nk64a4bDvdKPofHCG7WzlDRTryJhtTufhquTWDEaAIACJK"; token = "36_isfBGeMx6esLrna2imlq-C4TY0TgMGECpaSqAvQb7nDl7BDshyR_7YEkT3eIcJJmJIDf2rGSeSOvpsM1TosaNelQ5q447QYgJ5TBot-jPQ5B1cxG_38yW2Kw_Pd44Cx0i1zMaII8AMbl8Q5-FFIeAJARRU";
} }
if (string.IsNullOrEmpty(token)) if (string.IsNullOrEmpty(token))
{ {
...@@ -6311,7 +6311,12 @@ namespace Mall.Module.User ...@@ -6311,7 +6311,12 @@ namespace Mall.Module.User
/// <returns></returns> /// <returns></returns>
public object GerSmallShopsMyTeamTitelListForFX(AppletUserInfo userInfo) public object GerSmallShopsMyTeamTitelListForFX(AppletUserInfo userInfo)
{ {
string UserIds = member_UserRepository.GetSmallShopChildIdStr(userInfo.SmallShopId); string UserIds = "-1";
if (userInfo.SmallShopId > 0)
{
UserIds = member_UserRepository.GetSmallShopChildIdStr(userInfo.SmallShopId);
}
//获取下级所有等级 //获取下级所有等级
var disList = distributor_InfoRepository.GetFXGreadeListForMyTeam(new RB_Distributor_Info_Extend() { UserIds = UserIds, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId }); var disList = distributor_InfoRepository.GetFXGreadeListForMyTeam(new RB_Distributor_Info_Extend() { UserIds = UserIds, TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
var fxList = new List<RB_Distributor_FXGrade_Extend>(); var fxList = new List<RB_Distributor_FXGrade_Extend>();
...@@ -6343,7 +6348,14 @@ namespace Mall.Module.User ...@@ -6343,7 +6348,14 @@ namespace Mall.Module.User
/// <returns></returns> /// <returns></returns>
public object GetSmallShopsMyTeamPageListForFX(int pageIndex, int pageSize, out long count, RB_Distributor_Info_Extend demodel) public object GetSmallShopsMyTeamPageListForFX(int pageIndex, int pageSize, out long count, RB_Distributor_Info_Extend demodel)
{ {
string UserIds = member_UserRepository.GetSmallShopChildIdStr(demodel.UserId ?? 0);
string UserIds = "-1";
if ((demodel.UserId ?? 0) > 0)
{
UserIds = member_UserRepository.GetSmallShopChildIdStr(demodel.UserId ?? 0);
}
// string UserIds = member_UserRepository.GetSmallShopChildIdStr(demodel.UserId ?? 0);
var list = member_UserRepository.GetPageListForFX(pageIndex, pageSize, out count, new RB_Member_User_Extend() { UserIds = UserIds, FXGradeId = demodel.FXGradeId, Name = demodel.Name, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }); var list = member_UserRepository.GetPageListForFX(pageIndex, pageSize, out count, new RB_Member_User_Extend() { UserIds = UserIds, FXGradeId = demodel.FXGradeId, Name = demodel.Name, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
List<object> RList = new List<object>(); List<object> RList = new List<object>();
...@@ -6412,7 +6424,13 @@ namespace Mall.Module.User ...@@ -6412,7 +6424,13 @@ namespace Mall.Module.User
int smallShopsNum = 0; int smallShopsNum = 0;
//求其所有下线的数量 //求其所有下线的数量
var UserIds = member_UserRepository.GetSmallShopChildIdStr(model.Id);
string UserIds = "";
if (model.Id > 0)
{
UserIds = member_UserRepository.GetSmallShopChildIdStr(model.Id);
}
// UserIds = member_UserRepository.GetSmallShopChildIdStr(model.Id);
if (!string.IsNullOrEmpty(UserIds)) if (!string.IsNullOrEmpty(UserIds))
{ {
string[] arr = UserIds.Split(','); string[] arr = UserIds.Split(',');
......
Mall.Repository/User/RB_Member_UserRepository.cs
View file @ daf62e7a
...@@ -939,8 +939,14 @@ LEFT JOIN (SELECT SuperiorId,COUNT(SuperiorId) as ChildrenNum from rb_member_use ...@@ -939,8 +939,14 @@ LEFT JOIN (SELECT SuperiorId,COUNT(SuperiorId) as ChildrenNum from rb_member_use
/// <returns></returns> /// <returns></returns>
public string GetSmallShopChildIdStr(int id) public string GetSmallShopChildIdStr(int id)
{ {
string sql = $@" select GetSmallShopChildrenList_AllUser({id})"; string sql = $@" select GetSmallShopChildrenList_AllUser({id})";
return ExecuteScalar(sql).ToString(); object result= ExecuteScalar(sql);
if (result!=null)
{
return result.ToString();
}
else return "-1";
} }
#endregion #endregion
...@@ -968,68 +974,82 @@ LEFT JOIN (SELECT SuperiorId,COUNT(SuperiorId) as ChildrenNum from rb_member_use ...@@ -968,68 +974,82 @@ LEFT JOIN (SELECT SuperiorId,COUNT(SuperiorId) as ChildrenNum from rb_member_use
#endregion #endregion
/// <summary> /// <summary>
/// 获取用户佣金 /// 新增用户
/// </summary> /// </summary>
/// <param name="query"></param> /// <param name="extModel"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_Member_User_Extend> GetUserCommissionRepository(RB_Member_User_Extend query, bool IsGetCurrentMonth = false) public int SetMemberUserRepository(RB_Member_User_Extend extModel)
{
string where = "";
if (query != null)
{
if (query.TenantId > 0)
{
where += string.Format(" AND TenantId={0} ", query.TenantId);
}
if (query.MallBaseId > 0)
{
where += string.Format(" AND MallBaseId={0} ", query.MallBaseId);
}
if (!string.IsNullOrWhiteSpace(query.UserIds))
{
where += string.Format(" AND UserId IN({0}) ", query.UserIds);
}
if (query.Id > 0)
{ {
where += string.Format(" AND UserId IN({0}) ", query.Id); int result = 0;
} DynamicParameters dynamicParameters = new DynamicParameters();
}
if (IsGetCurrentMonth)
{
where += string.Format(" AND DATE_FORMAT(CreateDate, '%Y/%m')=DATE_FORMAT('{0}','%Y/%m') ", DateTime.Now.ToString("yyyy-MM-dd"));
}
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.Append(" SET NAMES utf8mb4; ");
SELECT UserId,IsRemit,SUM(A.Commission) AS Commission
FROM
(
SELECT UserId,SUM(Commission) AS Commission,IsRemit
FROM rb_goods_ordercommission
WHERE UserId>0 {0}
GROUP BY UserId
UNION ALL
SELECT UserId,SUM(Commission) AS Commission,RemitStatus AS IsRemit builder.Append(@"
FROM rb_goods_orderintroduction INSERT INTO rb_member_user(Name,AliasName,Photo,Source,OpenId,Moblie,MemberGrade,OrderNum,CouponsNum,CardVolumeNum,Balance,Integral,SuperiorId,Blacklist,ContactWay,Remark,TenantId,MallBaseId,CreateDate,UpdateDate,TotalConsumption,IsDistributor,SecretKey,DownlineCondition,IsBeDownline,WaitSuperiorId,BeDownlineDate,SmallShopId,CompanyProfitRate,PostId)
WHERE UserId>0 {0} VALUES(@Name,@AliasName,@Photo,@Source,@OpenId,@Moblie,@MemberGrade,@OrderNum,@CouponsNum,@CardVolumeNum,@Balance,@Integral,@SuperiorId,@Blacklist,@ContactWay,@Remark
GROUP BY UserId,RemitStatus ,@TenantId,@MallBaseId,@CreateDate,@UpdateDate,@TotalConsumption,@IsDistributor,@SecretKey,@DownlineCondition,@IsBeDownline,@WaitSuperiorId,@BeDownlineDate,@SmallShopId,@CompanyProfitRate,@PostId);
UNION ALL SELECT LAST_INSERT_ID();
");
SELECT UserId,SUM(Commission) AS Commission,IsRemit dynamicParameters.Add("Name", extModel.Name);
FROM rb_vipbuy_commission dynamicParameters.Add("AliasName", extModel.AliasName);
WHERE UserId>0 {0} dynamicParameters.Add("Photo", extModel.Photo);
GROUP BY UserId,IsRemit dynamicParameters.Add("Source", extModel.Source);
UNION ALL dynamicParameters.Add("OpenId", extModel.OpenId);
dynamicParameters.Add("Moblie", extModel.Moblie);
dynamicParameters.Add("MemberGrade", extModel.MemberGrade);
dynamicParameters.Add("OrderNum", extModel.OrderNum);
dynamicParameters.Add("CouponsNum", extModel.CouponsNum);
dynamicParameters.Add("CardVolumeNum", extModel.CardVolumeNum);
dynamicParameters.Add("Balance", extModel.Balance);
dynamicParameters.Add("Integral", extModel.Integral);
dynamicParameters.Add("SuperiorId", extModel.SuperiorId);
dynamicParameters.Add("Blacklist", extModel.Blacklist);
dynamicParameters.Add("ContactWay", extModel.ContactWay);
dynamicParameters.Add("Remark", extModel.Remark);
dynamicParameters.Add("TenantId", extModel.TenantId);
dynamicParameters.Add("MallBaseId", extModel.MallBaseId);
dynamicParameters.Add("CreateDate", extModel.CreateDate);
dynamicParameters.Add("UpdateDate", extModel.UpdateDate);
dynamicParameters.Add("TotalConsumption", extModel.TotalConsumption);
dynamicParameters.Add("IsDistributor", extModel.IsDistributor);
dynamicParameters.Add("SecretKey", extModel.SecretKey);
dynamicParameters.Add("IsBeDownline", extModel.IsBeDownline);
dynamicParameters.Add("WaitSuperiorId", extModel.WaitSuperiorId);
dynamicParameters.Add("BeDownlineDate", extModel.BeDownlineDate);
dynamicParameters.Add("SmallShopId", extModel.SmallShopId);
dynamicParameters.Add("CompanyProfitRate", extModel.CompanyProfitRate);
dynamicParameters.Add("PostId", extModel.PostId);
var obj = base.ExecuteScalar(builder.ToString(), dynamicParameters);
if (obj != null && Convert.ToInt32(obj) > 0)
{
result = Convert.ToInt32(obj.ToString());
}
return result;
}
SELECT UserId,SUM(Commission) AS Commission,IsRemit
FROM rb_smallshops_commission
WHERE UserId>0 {0}
GROUP BY UserId,IsRemit
) AS A GROUP BY UserId,IsRemit /// <summary>
", where); /// 修改用户微信昵称和头像
/// </summary>
/// <param name="extModel"></param>
/// <returns></returns>
public bool UpdateMemberUserRepository(RB_Member_User_Extend extModel)
{
DynamicParameters dynamicParameters = new DynamicParameters();
StringBuilder builder = new StringBuilder();
builder.Append(" SET NAMES utf8mb4; ");
builder.Append(@"
UPDATE rb_member_user SET
Name=@Name,Photo=@Photo
WHERE Id=@Id
");
dynamicParameters.Add("Name", extModel.Name);
return Get<RB_Member_User_Extend>(builder.ToString()).ToList(); dynamicParameters.Add("Photo", extModel.Photo);
dynamicParameters.Add("Id", extModel.Id);
var result = base.Execute(builder.ToString(), dynamicParameters);
return result > 0;
} }
} }
} }
Mall.WebApi/appsettings.json
View file @ daf62e7a
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
"PropertyDB": "test_property", "PropertyDB": "test_property",
"IncomeFinanceApi": "http://testapi.oytour.com/api/Mall/InsertFinanceBatchForMallIn", "IncomeFinanceApi": "http://testapi.oytour.com/api/Mall/InsertFinanceBatchForMallIn",
"PaymentFinanceApi": "http://testapi.oytour.com/api/Mall/InsertFinanceBatchForMallOut", "PaymentFinanceApi": "http://testapi.oytour.com/api/Mall/InsertFinanceBatchForMallOut",
"PropertyApi": "http://192.168.2.16:8087/api/ECWorkFlow/SetECSuppliesStockInFlow",
"FinanceKey": "FinanceMallInsertToERPViitto2020", "FinanceKey": "FinanceMallInsertToERPViitto2020",
"SettlementRate": "0.60", "SettlementRate": "0.60",
"RabbitMqConfig": { "RabbitMqConfig": {
......
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