Commit e552afaf authored by liudong1993's avatar liudong1993
parents c1e8e3bc 901927ef
...@@ -245,6 +245,9 @@ namespace Mall.Common.Plugin ...@@ -245,6 +245,9 @@ namespace Mall.Common.Plugin
HSSFPalette palette = workbook.GetCustomPalette(); HSSFPalette palette = workbook.GetCustomPalette();
int rowIndex = 0; int rowIndex = 0;
HSSFFont ffont = (HSSFFont)workbook.CreateFont(); HSSFFont ffont = (HSSFFont)workbook.CreateFont();
//单元格样式
HSSFCellStyle fCellStyle = (HSSFCellStyle)workbook.CreateCellStyle();
//循环添加行 //循环添加行
foreach (var item in list) foreach (var item in list)
{ {
...@@ -258,8 +261,7 @@ namespace Mall.Common.Plugin ...@@ -258,8 +261,7 @@ namespace Mall.Common.Plugin
dataRow.Height = 50 * 10;//行高 dataRow.Height = 50 * 10;//行高
} }
int columnsIndex = 0; int columnsIndex = 0;
//单元格样式
HSSFCellStyle fCellStyle = (HSSFCellStyle)workbook.CreateCellStyle();
//循环添加列 //循环添加列
foreach (var subItem in item.ExcelRows) foreach (var subItem in item.ExcelRows)
{ {
......
...@@ -54,6 +54,13 @@ namespace Mall.Model.Entity.AppletWeChat ...@@ -54,6 +54,13 @@ namespace Mall.Model.Entity.AppletWeChat
/// </summary> /// </summary>
public string start_time { get; set; } public string start_time { get; set; }
/// <summary>
/// 直播计划开始时间
/// </summary>
public DateTime? LiveTime { get; set; }
/// <summary> /// <summary>
/// 直播计划结束时间 /// 直播计划结束时间
/// </summary> /// </summary>
......
...@@ -266,5 +266,16 @@ namespace Mall.Model.Entity.Product ...@@ -266,5 +266,16 @@ namespace Mall.Model.Entity.Product
/// 其他实付金额 /// 其他实付金额
/// </summary> /// </summary>
public decimal? PayMoney { get; set; } public decimal? PayMoney { get; set; }
/// <summary>
/// 公司id
/// </summary>
public int CompanyId { get; set; }
/// <summary>
/// 公司毛利比例
/// </summary>
public decimal CompanyProfitRate { get; set; }
} }
} }
...@@ -208,5 +208,11 @@ namespace Mall.Model.Entity.User ...@@ -208,5 +208,11 @@ namespace Mall.Model.Entity.User
public DateTime? BeDownlineDate { get; set; } public DateTime? BeDownlineDate { get; set; }
public int SmallShopId { get; set; } public int SmallShopId { get; set; }
/// <summary>
/// 公司毛利利润比例
/// </summary>
public decimal CompanyProfitRate { get; set; }
} }
} }
...@@ -83,5 +83,11 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -83,5 +83,11 @@ namespace Mall.Model.Extend.MarketingCenter
/// 领劵中心领取 /// 领劵中心领取
/// </summary> /// </summary>
public new int GetType { get; set; } public new int GetType { get; set; }
/// <summary>
/// 微店名称
/// </summary>
public string SmallShopName { get; set; }
} }
} }
...@@ -47,5 +47,21 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -47,5 +47,21 @@ namespace Mall.Model.Extend.MarketingCenter
/// 分类列表 /// 分类列表
/// </summary> /// </summary>
public List<RB_Share_Category_Extend> CateList { get; set; } public List<RB_Share_Category_Extend> CateList { get; set; }
/// <summary>
/// 图片数组
/// </summary>
public List<string> ImgList
{
get
{
List<string> imgList = new List<string>();
if (!string.IsNullOrWhiteSpace(this.MaterialImg))
{
imgList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(this.MaterialImg);
}
return imgList;
}
}
} }
} }
\ No newline at end of file
...@@ -270,5 +270,51 @@ namespace Mall.Model.Query ...@@ -270,5 +270,51 @@ namespace Mall.Model.Query
/// </summary> /// </summary>
public int LivePeopleNum { get; set; } public int LivePeopleNum { get; set; }
/// <summary>
/// 其他应收金额
/// </summary>
public decimal YSMoney { get; set; }
/// <summary>
/// 其他实收金额
/// </summary>
public decimal RealMoney { get; set; }
/// <summary>
/// 其他应付金额
/// </summary>
public decimal YFMoney { get; set; }
/// <summary>
/// 其他实付金额
/// </summary>
public decimal PayMoney { get; set; }
/// <summary>
/// 订单优惠金额
/// </summary>
public decimal CouponMoney { get; set; }
/// <summary>
/// 实际退款金额
/// </summary>
public decimal RefundActual { get; set; }
/// <summary>
/// 公司毛利返利
/// </summary>
public decimal CompanyProfitRate { get; set; }
/// <summary>
/// 订单所属公司
/// </summary>
public int CompanyId { get; set; }
/// <summary>
/// 订单所属公司
/// </summary>
public string CompanyName { get; set; }
} }
} }
...@@ -1782,6 +1782,7 @@ namespace Mall.Module.User ...@@ -1782,6 +1782,7 @@ namespace Mall.Module.User
newLiveHouse.room_info.ForEach(x => x.TenantId = model.TenantId ?? 0); newLiveHouse.room_info.ForEach(x => x.TenantId = model.TenantId ?? 0);
newLiveHouse.room_info.ForEach(x => x.MallBaseId = model.MallBaseId); newLiveHouse.room_info.ForEach(x => x.MallBaseId = model.MallBaseId);
newLiveHouse.room_info.ForEach(x => x.CreateDate = System.DateTime.Now); newLiveHouse.room_info.ForEach(x => x.CreateDate = System.DateTime.Now);
AddLiveHouse(newLiveHouse.room_info, new Model.Entity.AppletWeChat.RB_Live_House { TenantId = model.TenantId ?? 0, MallBaseId = model.MallBaseId }); AddLiveHouse(newLiveHouse.room_info, new Model.Entity.AppletWeChat.RB_Live_House { TenantId = model.TenantId ?? 0, MallBaseId = model.MallBaseId });
return true; return true;
} }
...@@ -1793,6 +1794,25 @@ namespace Mall.Module.User ...@@ -1793,6 +1794,25 @@ namespace Mall.Module.User
return false; return false;
} }
/// <summary>
/// 时间戳转为C#格式时间
/// </summary>
/// <param name="timeStamp">Unix时间戳格式</param>
/// <returns>C#格式时间</returns>
public static string GetTime(string timeStamp)
{
try
{
var start = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
var longTimeSpan = long.Parse(timeStamp + "0000000");
return start.AddMilliseconds(longTimeSpan).AddHours(8).ToString("yyyy-MM-dd HH:mm:ss");
}
catch (Exception)
{
return "";
}
}
public Model.Extend.AppletWeChat.PlayBack GetLiveReplayInfo(RB_MiniProgram_Extend model, int room_id) public Model.Extend.AppletWeChat.PlayBack GetLiveReplayInfo(RB_MiniProgram_Extend model, int room_id)
{ {
...@@ -1888,6 +1908,7 @@ namespace Mall.Module.User ...@@ -1888,6 +1908,7 @@ namespace Mall.Module.User
if (list != null && list.Any()) if (list != null && list.Any())
{ {
list.ForEach(x => x.LiveTime = Convert.ToDateTime(GetTime(x.start_time)));
liveHouseRepository.InsertBatch(list); liveHouseRepository.InsertBatch(list);
} }
return true; return true;
...@@ -2016,7 +2037,7 @@ namespace Mall.Module.User ...@@ -2016,7 +2037,7 @@ namespace Mall.Module.User
subList.Add(new MallSalesStatistics() subList.Add(new MallSalesStatistics()
{ {
TimeStr = i.ToString(), TimeStr = i.ToString(),
GoodCount = tempSubList?.Sum(qitem=>qitem.GoodCount) ?? 0, GoodCount = tempSubList?.Sum(qitem => qitem.GoodCount) ?? 0,
Income = tempSubList?.Sum(qitem => qitem.Income) ?? 0, Income = tempSubList?.Sum(qitem => qitem.Income) ?? 0,
OrderCount = tempSubList?.Sum(qitem => qitem.OrderCount) ?? 0, OrderCount = tempSubList?.Sum(qitem => qitem.OrderCount) ?? 0,
UserCount = tempSubList?.GroupBy(qitem => new { qitem.UserId }).Count() ?? 0, UserCount = tempSubList?.GroupBy(qitem => new { qitem.UserId }).Count() ?? 0,
...@@ -2035,7 +2056,7 @@ namespace Mall.Module.User ...@@ -2035,7 +2056,7 @@ namespace Mall.Module.User
GoodCount = tempSubList?.Sum(qitem => qitem.GoodCount) ?? 0, GoodCount = tempSubList?.Sum(qitem => qitem.GoodCount) ?? 0,
Income = tempSubList?.Sum(qitem => qitem.Income) ?? 0, Income = tempSubList?.Sum(qitem => qitem.Income) ?? 0,
OrderCount = tempSubList?.Sum(qitem => qitem.OrderCount) ?? 0, OrderCount = tempSubList?.Sum(qitem => qitem.OrderCount) ?? 0,
UserCount = tempSubList?.GroupBy(qitem=>new { qitem.UserId}).Count() ?? 0, UserCount = tempSubList?.GroupBy(qitem => new { qitem.UserId }).Count() ?? 0,
}); });
} }
} }
...@@ -2047,7 +2068,7 @@ namespace Mall.Module.User ...@@ -2047,7 +2068,7 @@ namespace Mall.Module.User
Income = list?.Sum(qitem => qitem.Income) ?? 0, Income = list?.Sum(qitem => qitem.Income) ?? 0,
//支付人数 //支付人数
UserCount = list?.GroupBy(qitem=>new { qitem.UserId}).Count() ?? 0, UserCount = list?.GroupBy(qitem => new { qitem.UserId }).Count() ?? 0,
//支付件数 //支付件数
GoodCount = list?.Sum(qitem => qitem.GoodCount) ?? 0, GoodCount = list?.Sum(qitem => qitem.GoodCount) ?? 0,
subList, subList,
......
...@@ -95,7 +95,7 @@ namespace Mall.Module.User ...@@ -95,7 +95,7 @@ namespace Mall.Module.User
/// <summary> /// <summary>
/// 可简化 /// 可简化
/// </summary> /// </summary>
private readonly RB_SmallShops_RemitRepository smallShopsRemitRepository = new RB_SmallShops_RemitRepository(); private readonly RB_SmallShops_RemitRepository smallShopsRemitRepository = new RB_SmallShops_RemitRepository();
...@@ -151,6 +151,21 @@ namespace Mall.Module.User ...@@ -151,6 +151,21 @@ namespace Mall.Module.User
return model; return model;
} }
/// <summary>
/// 根据用户id 获取微店信息
/// </summary>
/// <param name="UserId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public List<RB_SmallShops_Info_Extend> GetSmallShopsInfoList_V2(RB_SmallShops_Info_Extend model)
{
return smallShops_InfoRepository.GetListForSingle(model);
}
/// <summary> /// <summary>
/// 微店审核 /// 微店审核
/// </summary> /// </summary>
...@@ -175,7 +190,8 @@ namespace Mall.Module.User ...@@ -175,7 +190,8 @@ namespace Mall.Module.User
{ {
keyValues.Add(nameof(RB_SmallShops_Info.Remark), ssmodel.Remark); keyValues.Add(nameof(RB_SmallShops_Info.Remark), ssmodel.Remark);
} }
else if (type == 4) { else if (type == 4)
{
keyValues.Add(nameof(RB_SmallShops_Info.Status), 1); keyValues.Add(nameof(RB_SmallShops_Info.Status), 1);
} }
else else
...@@ -470,7 +486,8 @@ namespace Mall.Module.User ...@@ -470,7 +486,8 @@ namespace Mall.Module.User
/// </summary> /// </summary>
/// <param name="RemitId"></param> /// <param name="RemitId"></param>
/// <returns></returns> /// <returns></returns>
public RB_SmallShops_Remit_Extend GetSmallShopsRemitInfo(int RemitId) { public RB_SmallShops_Remit_Extend GetSmallShopsRemitInfo(int RemitId)
{
return smallShops_RemitRepository.GetEntity<RB_SmallShops_Remit_Extend>(RemitId); return smallShops_RemitRepository.GetEntity<RB_SmallShops_Remit_Extend>(RemitId);
} }
...@@ -734,7 +751,7 @@ namespace Mall.Module.User ...@@ -734,7 +751,7 @@ namespace Mall.Module.User
}; };
string apiResult = Mall.Common.Plugin.HttpHelper.HttpPost(Config.PaymentFinanceApi, JsonHelper.Serialize(resultInfo), ""); string apiResult = Mall.Common.Plugin.HttpHelper.HttpPost(Config.PaymentFinanceApi, JsonHelper.Serialize(resultInfo), "");
var apir = JsonConvert.DeserializeObject<ApiResult>(apiResult); var apir = JsonConvert.DeserializeObject<ApiResult>(apiResult);
if (apir.resultCode == 1) if (apir.resultCode == 1)
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
...@@ -796,6 +813,19 @@ namespace Mall.Module.User ...@@ -796,6 +813,19 @@ namespace Mall.Module.User
}; };
return smallShops_RemitRepository.Update(keyValues, wheres); return smallShops_RemitRepository.Update(keyValues, wheres);
} }
/// <summary>
/// 分销提现列表
/// </summary>
/// <param name="demodel"></param>
/// <returns></returns>
public List<RB_SmallShops_Remit_Extend> GetSmallShopsRemitList(RB_SmallShops_Remit_Extend demodel)
{
return smallShops_RemitRepository.GetSmallShopsRemitList(demodel);
}
#endregion #endregion
#region 微店小程序 #region 微店小程序
...@@ -1211,7 +1241,7 @@ namespace Mall.Module.User ...@@ -1211,7 +1241,7 @@ namespace Mall.Module.User
var OModel = smallShopsCustomRepository.GetSmallShopsCustomList(new RB_SmallShops_Custom() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault(); var OModel = smallShopsCustomRepository.GetSmallShopsCustomList(new RB_SmallShops_Custom() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
if (OModel != null) if (OModel != null)
{ {
Dictionary<string, object> keyValuePairs = new Dictionary<string, object>() { Dictionary<string, object> keyValuePairs = new Dictionary<string, object>() {
{ nameof(RB_SmallShops_Custom.HeadBackImage),demodel.HeadBackImage}, { nameof(RB_SmallShops_Custom.HeadBackImage),demodel.HeadBackImage},
{ nameof(RB_SmallShops_Custom.WithdrawalFilletPX),demodel.WithdrawalFilletPX}, { nameof(RB_SmallShops_Custom.WithdrawalFilletPX),demodel.WithdrawalFilletPX},
......
...@@ -87,7 +87,7 @@ namespace Mall.Repository.AppletWeChat ...@@ -87,7 +87,7 @@ namespace Mall.Repository.AppletWeChat
builder.Append($" AND a.{nameof(RB_Live_HouseExtension_Extend.MallBaseId)}={query.MallBaseId}"); builder.Append($" AND a.{nameof(RB_Live_HouseExtension_Extend.MallBaseId)}={query.MallBaseId}");
} }
} }
builder.Append($" order by a.{nameof(RB_Live_HouseExtension_Extend.ID)} asc"); builder.Append($" order by a.{nameof(RB_Live_HouseExtension_Extend.LiveTime)} desc");
return GetPage<RB_Live_HouseExtension_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList(); return GetPage<RB_Live_HouseExtension_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
} }
} }
......
...@@ -72,7 +72,7 @@ namespace Mall.Repository.BaseSetUp ...@@ -72,7 +72,7 @@ namespace Mall.Repository.BaseSetUp
var index = 0; var index = 0;
foreach (var item in where) foreach (var item in where)
{ {
if (!string.IsNullOrEmpty(item.Trim())) if (item!=null && !string.IsNullOrEmpty(item.Trim()))
{ {
if (index == 0) if (index == 0)
{ {
......
...@@ -32,23 +32,23 @@ namespace Mall.Repository.MarketingCenter ...@@ -32,23 +32,23 @@ namespace Mall.Repository.MarketingCenter
public List<RB_DiscountCoupon_Extend> GetDiscountCouponPageList(int pageIndex, int pageSize, out long rowCount, RB_DiscountCoupon_Extend query) public List<RB_DiscountCoupon_Extend> GetDiscountCouponPageList(int pageIndex, int pageSize, out long rowCount, RB_DiscountCoupon_Extend query)
{ {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_DiscountCoupon_Extend.Status)}=0"); builder.Append($" SELECT a.*,b.`Name` as SmallShopName FROM {TableName} as A LEFT JOIN rb_smallshops_info as b on a.SmallShopId=b.Id WHERE a.{nameof(RB_DiscountCoupon_Extend.Status)}=0");
if (query != null) if (query != null)
{ {
if (query.TenantId > 0) if (query.TenantId > 0)
{ {
builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.TenantId)}={query.TenantId}"); builder.Append($" AND a.{nameof(RB_DiscountCoupon_Extend.TenantId)}={query.TenantId}");
} }
if (query.TenantId > 0) if (query.TenantId > 0)
{ {
builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.MallBaseId)}={query.MallBaseId}"); builder.Append($" AND a.{nameof(RB_DiscountCoupon_Extend.MallBaseId)}={query.MallBaseId}");
} }
if (!string.IsNullOrWhiteSpace(query.Name)) if (!string.IsNullOrWhiteSpace(query.Name))
{ {
builder.Append($" AND {nameof(RB_DiscountCoupon_Extend.Name)} like '%{query.Name}%'"); builder.Append($" AND a.{nameof(RB_DiscountCoupon_Extend.Name)} like '%{query.Name}%'");
} }
} }
builder.Append($" order by {nameof(RB_DiscountCoupon_Extend.ID)} desc"); builder.Append($" order by a.{nameof(RB_DiscountCoupon_Extend.ID)} desc");
return GetPage<RB_DiscountCoupon_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList(); return GetPage<RB_DiscountCoupon_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
} }
......
...@@ -7,6 +7,7 @@ using System.Linq; ...@@ -7,6 +7,7 @@ using System.Linq;
using Mall.Model.Entity.User; using Mall.Model.Entity.User;
using Mall.Common.Enum.Goods; using Mall.Common.Enum.Goods;
using Mall.Model.Query; using Mall.Model.Query;
using VT.FW.DB.Dapper;
namespace Mall.Repository.Product namespace Mall.Repository.Product
{ {
...@@ -26,6 +27,7 @@ namespace Mall.Repository.Product ...@@ -26,6 +27,7 @@ namespace Mall.Repository.Product
/// <returns></returns> /// <returns></returns>
public List<RB_Goods_Order_Extend> GetOrderPageList(int pageIndex, int pageSize, out long count, RB_Goods_Order_Extend dmodel) public List<RB_Goods_Order_Extend> GetOrderPageList(int pageIndex, int pageSize, out long count, RB_Goods_Order_Extend dmodel)
{ {
var parameters = new DynamicParameters();
string where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0"; string where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0";
if (dmodel.TenantId > 0) if (dmodel.TenantId > 0)
{ {
...@@ -74,15 +76,18 @@ namespace Mall.Repository.Product ...@@ -74,15 +76,18 @@ namespace Mall.Repository.Product
} }
if (!string.IsNullOrEmpty(dmodel.OrderNo)) if (!string.IsNullOrEmpty(dmodel.OrderNo))
{ {
where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} like '%{dmodel.OrderNo}%'"; where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} like @OrderNo ";
parameters.Add("OrderNo", "%" + dmodel.OrderNo.Trim() + "%");
} }
if (!string.IsNullOrEmpty(dmodel.MerchantsNo)) if (!string.IsNullOrEmpty(dmodel.MerchantsNo))
{ {
where += $@" and o.{nameof(RB_Goods_Order.MerchantsNo)} like '%{dmodel.MerchantsNo}%'"; where += $@" and o.{nameof(RB_Goods_Order.MerchantsNo)} like @MerchantsNo ";
parameters.Add("MerchantsNo", "%" + dmodel.MerchantsNo.Trim() + "%");
} }
if (!string.IsNullOrEmpty(dmodel.UserName)) if (!string.IsNullOrEmpty(dmodel.UserName))
{ {
where += $@" and u.{nameof(RB_Member_User.Name)} like '%{dmodel.UserName}%'"; where += $@" and u.{nameof(RB_Member_User.Name)} like @UserName ";
parameters.Add("UserName", "%" + dmodel.UserName.Trim() + "%");
} }
if (dmodel.UserId > 0) if (dmodel.UserId > 0)
{ {
...@@ -122,7 +127,7 @@ INNER JOIN rb_goods_orderdetail od on o.OrderId=od.OrderId ...@@ -122,7 +127,7 @@ INNER JOIN rb_goods_orderdetail od on o.OrderId=od.OrderId
INNER JOIN rb_member_user u on o.UserId=u.Id INNER JOIN rb_member_user u on o.UserId=u.Id
LEFT JOIN rb_smallshops_info as sshop on o.SmallShopsId=sshop.Id LEFT JOIN rb_smallshops_info as sshop on o.SmallShopsId=sshop.Id
where {where} group by o.OrderId order by o.CreateDate desc"; where {where} group by o.OrderId order by o.CreateDate desc";
return GetPage<RB_Goods_Order_Extend>(pageIndex, pageSize, out count, sql).ToList(); return GetPage<RB_Goods_Order_Extend>(pageIndex, pageSize, out count, sql, parameters).ToList();
} }
/// <summary> /// <summary>
...@@ -970,10 +975,15 @@ as t GROUP BY t.CreateDate desc"; ...@@ -970,10 +975,15 @@ as t GROUP BY t.CreateDate desc";
} }
else else
{ {
sql = $@"SELECT t.CreateDate,SUM(t.ReNumber)as GoodsNum ,COUNT(t.ReOrderId)as OrderNum ,SUM(t.Income)as PayMoney,MAX(t.PayMemerNum) as PayMemerNum sql = $@"
from (SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,a.ReNumber,a.Refund as Income,c.PayMemerNum,a.ReOrderId from RB_Goods_OrderAfterSale as a SELECT t.CreateDate,SUM(t.ReNumber)as GoodsNum ,COUNT(t.ReOrderId)as OrderNum ,SUM(t.Income)as PayMoney,MAX(t.PayMemerNum) as PayMemerNum
LEFT JOIN (SELECT COUNT(DISTINCT UserId) as PayMemerNum, DATE_FORMAT(CreateDate,'%Y-%m-%d' ) as CreateDate from RB_Goods_OrderAfterSale where {payMemerNumWhere} GROUP BY DATE_FORMAT(CreateDate,'%Y-%m-%d' )) from
as c on c.CreateDate=DATE_FORMAT(a.CreateDate,'%Y-%m-%d' ) {where} ) (
SELECT DATE_FORMAT(a.CreateDate,'%Y-%m-%d' )as CreateDate,a.ReNumber,a.Refund as Income,c.PayMemerNum,a.ReOrderId from RB_Goods_OrderAfterSale as a
LEFT JOIN
(SELECT COUNT(DISTINCT UserId) as PayMemerNum, DATE_FORMAT(CreateDate,'%Y-%m-%d' ) as CreateDate from RB_Goods_OrderAfterSale where 1=1 {payMemerNumWhere} GROUP BY DATE_FORMAT(CreateDate,'%Y-%m-%d' ))
as c on c.CreateDate=DATE_FORMAT(a.CreateDate,'%Y-%m-%d' ) {where}
)
as t GROUP BY t.CreateDate desc"; as t GROUP BY t.CreateDate desc";
} }
// else if (dmodel.OrderStatus == 4) // else if (dmodel.OrderStatus == 4)
...@@ -1276,6 +1286,10 @@ GROUP BY od.GoodsId,o.OrderId ...@@ -1276,6 +1286,10 @@ GROUP BY od.GoodsId,o.OrderId
{ {
where += $" and b.GoodsId={dmodel.GoodsID} "; where += $" and b.GoodsId={dmodel.GoodsID} ";
} }
if (dmodel.CompanyId > 0)
{
where += $" and b.CompanyId={dmodel.CompanyId} ";
}
if (!string.IsNullOrWhiteSpace(dmodel.StartDate)) if (!string.IsNullOrWhiteSpace(dmodel.StartDate))
{ {
...@@ -1304,10 +1318,11 @@ GROUP BY od.GoodsId,o.OrderId ...@@ -1304,10 +1318,11 @@ GROUP BY od.GoodsId,o.OrderId
string sql = $@" SELECT B.Id,SUM(b.PaidCostMoney) as PaidCostMoney,MAX(b.OrderId) as OrderId,MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName, string sql = $@" SELECT B.Id,SUM(b.PaidCostMoney) as PaidCostMoney,MAX(b.OrderId) as OrderId,MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName,
SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney) as AllPrice , SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney) as AllPrice ,
SUM(IFNULL(b.CostMoney,0)*b.Number) as CostMoney,0 as PackingMoney, 0 as CostFreight,0 as GoodsFreight, SUM(IFNULL(b.CostMoney,0)*b.Number) as CostMoney,0 as PackingMoney, 0 as CostFreight,0 as GoodsFreight,
0 as OtherPrice,b.LiveCommission,b.LiveFinanceIds,b.LivePeopleNum,0 as Paid 0 as OtherPrice,b.LiveCommission,b.LiveFinanceIds,b.LivePeopleNum,0 as Paid,oa.RefundActual,b.CouponMoney,b.CompanyProfitRate,b.CompanyId,muser.`Name` as CompanyName,b.YSMoney,b.RealMoney,b.YFMoney,b.PayMoney
from rb_goods_orderdetail as b from rb_goods_orderdetail as b
LEFT JOIN rb_goods_order as A on a.OrderId=b.OrderId LEFT JOIN rb_goods_order as A on a.OrderId=b.OrderId
LEFT JOIN rb_supplier as f on f.ID=b.SupplierId LEFT JOIN rb_supplier as f on f.ID=b.SupplierId
LEFT JOIN rb_member_user as muser on muser.id=b.CompanyId
left join rb_goods_orderaftersale oa on b.ID= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5) {where} left join rb_goods_orderaftersale oa on b.ID= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5) {where}
GROUP BY b.Id order by b.Id desc"; GROUP BY b.Id order by b.Id desc";
...@@ -1375,10 +1390,11 @@ GROUP BY b.Id order by b.Id desc"; ...@@ -1375,10 +1390,11 @@ GROUP BY b.Id order by b.Id desc";
string sql = $@" SELECT B.Id,SUM(b.PaidCostMoney) as PaidCostMoney,MAX(b.OrderId) as OrderId,MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName, string sql = $@" SELECT B.Id,SUM(b.PaidCostMoney) as PaidCostMoney,MAX(b.OrderId) as OrderId,MAX( a.OrderNo) as OrderNo,MAX(b.GoodsName) as GoodsName,b.Specification,MAX(b.Unit_Price) as Unit_Price,SUM(b.Number) as Number,f.`Name` as SupplierName,
SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney) as AllPrice , SUM(b.Final_Price) as Final_Price,SUM(b.FreightMoney) as FreightMoney,SUM(b.Final_Price+b.FreightMoney) as AllPrice ,
SUM(IFNULL(b.CostMoney,0)*b.Number) as CostMoney,0 as PackingMoney, 0 as CostFreight,0 as GoodsFreight, SUM(IFNULL(b.CostMoney,0)*b.Number) as CostMoney,0 as PackingMoney, 0 as CostFreight,0 as GoodsFreight,
0 as OtherPrice,b.LiveCommission,b.LiveFinanceIds,b.LivePeopleNum,0 as Paid 0 as OtherPrice,b.LiveCommission,b.LiveFinanceIds,b.LivePeopleNum,0 as Paid,oa.RefundActual,b.CouponMoney,b.CompanyProfitRate,b.CompanyId,muser.`Name` as CompanyName,b.YSMoney,b.RealMoney,b.YFMoney,b.PayMoney
from rb_goods_orderdetail as b from rb_goods_orderdetail as b
LEFT JOIN rb_goods_order as A on a.OrderId=b.OrderId LEFT JOIN rb_goods_order as A on a.OrderId=b.OrderId
LEFT JOIN rb_supplier as f on f.ID=b.SupplierId LEFT JOIN rb_supplier as f on f.ID=b.SupplierId
LEFT JOIN rb_member_user as muser on muser.id=b.CompanyId
left join rb_goods_orderaftersale oa on b.ID= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5) {where} left join rb_goods_orderaftersale oa on b.ID= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5) {where}
GROUP BY b.Id "; GROUP BY b.Id ";
......
...@@ -30,7 +30,7 @@ namespace Mall.Repository.User ...@@ -30,7 +30,7 @@ namespace Mall.Repository.User
MallIndexStatistics model = new MallIndexStatistics(); MallIndexStatistics model = new MallIndexStatistics();
//总订单数 //总订单数
StringBuilder orderNum = new StringBuilder(); StringBuilder orderNum = new StringBuilder();
orderNum.AppendFormat("SELECT COUNT(1) AS OrderCount FROM rb_goods_order WHERE OrderStatus <> 7 "); orderNum.AppendFormat("SELECT COUNT(1) AS OrderCount FROM rb_goods_order WHERE OrderStatus IN(2,3,4,5,6) ");
orderNum.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId); orderNum.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId);
orderNum.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId); orderNum.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId);
var orderTotal = ExecuteScalar(orderNum.ToString()); var orderTotal = ExecuteScalar(orderNum.ToString());
...@@ -101,7 +101,7 @@ namespace Mall.Repository.User ...@@ -101,7 +101,7 @@ namespace Mall.Repository.User
#region 订单数量统计 #region 订单数量统计
StringBuilder orderNum = new StringBuilder(); StringBuilder orderNum = new StringBuilder();
orderNum.AppendFormat("SELECT OrderStatus,COUNT(1) AS OrderCount FROM rb_goods_order WHERE OrderStatus <> 7 "); orderNum.AppendFormat("SELECT OrderStatus,COUNT(1) AS OrderCount FROM rb_goods_order WHERE OrderStatus IN(2,3,4,5,6) ");
orderNum.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId); orderNum.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId);
orderNum.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId); orderNum.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId);
//订单来源 //订单来源
...@@ -184,7 +184,7 @@ WHERE 1=1 AND A.ReOrderStatus IN(2,3,4) "); ...@@ -184,7 +184,7 @@ WHERE 1=1 AND A.ReOrderStatus IN(2,3,4) ");
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT {0} COUNT(1) AS OrderCount,SUM(A.Income) AS Income,A.UserId,SUM(B.GoodCount) AS GoodCount SELECT {0} COUNT(1) AS OrderCount,SUM(A.Income) AS Income,A.UserId,SUM(B.GoodCount) AS GoodCount
FROM rb_goods_order A LEFT JOIN (SELECT OrderId,SUM(Number) AS GoodCount FROM rb_goods_orderdetail GROUP BY OrderId) AS B ON A.OrderId=B.OrderId FROM rb_goods_order A LEFT JOIN (SELECT OrderId,SUM(Number) AS GoodCount FROM rb_goods_orderdetail GROUP BY OrderId) AS B ON A.OrderId=B.OrderId
WHERE 1=1 AND OrderStatus>=2 AND OrderStatus<=5 WHERE 1=1 AND OrderStatus IN(2,3,4,5,6)
", selectFileds); ", selectFileds);
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId); builder.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId);
builder.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId); builder.AppendFormat(" AND {0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId);
...@@ -220,7 +220,7 @@ WHERE 1=1 AND OrderStatus>=2 AND OrderStatus<=5 ...@@ -220,7 +220,7 @@ WHERE 1=1 AND OrderStatus>=2 AND OrderStatus<=5
public List<MallSalesGoodsTop> MallIndesSalesIncomeStatisticsRepository(StatisticsQuery query) public List<MallSalesGoodsTop> MallIndesSalesIncomeStatisticsRepository(StatisticsQuery query)
{ {
string where = ""; string where = "";
where += string.Format(" AND B.{0}<>7 ", nameof(RB_Goods_Order_Extend.OrderStatus)); where += string.Format(" AND B.{0} IN (2,3,4,5,6) ", nameof(RB_Goods_Order_Extend.OrderStatus));
where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId); where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId);
where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId); where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId);
//开始时间 //开始时间
...@@ -273,7 +273,7 @@ GROUP BY A.GoodsId,A.GoodsName) as a ORDER BY a.{query.OrderBy} LIMIT 100 "); ...@@ -273,7 +273,7 @@ GROUP BY A.GoodsId,A.GoodsName) as a ORDER BY a.{query.OrderBy} LIMIT 100 ");
public List<MallSalesUserTop> MallIndesSalesUserStatisticsRepository(StatisticsQuery query) public List<MallSalesUserTop> MallIndesSalesUserStatisticsRepository(StatisticsQuery query)
{ {
string where = ""; string where = "";
where += string.Format(" AND B.{0}<>7 ", nameof(RB_Goods_Order_Extend.OrderStatus)); where += string.Format(" AND B.{0} IN (2,3,4,5,6) ", nameof(RB_Goods_Order_Extend.OrderStatus));
where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId); where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.TenantId), query.TenantId);
where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId); where += string.Format(" AND B.{0}={1} ", nameof(RB_Goods_Order_Extend.MallBaseId), query.MallBaseId);
//开始时间 //开始时间
......
...@@ -80,7 +80,7 @@ where {where} order by r.Id desc"; ...@@ -80,7 +80,7 @@ where {where} order by r.Id desc";
/// </summary> /// </summary>
/// <param name="dmodel"></param> /// <param name="dmodel"></param>
/// <returns></returns> /// <returns></returns>
public List<RB_SmallShops_Remit_Extend> GetDistributorRemitList(RB_SmallShops_Remit_Extend dmodel) public List<RB_SmallShops_Remit_Extend> GetSmallShopsRemitList(RB_SmallShops_Remit_Extend dmodel)
{ {
string where = $@" 1=1 "; string where = $@" 1=1 ";
if (dmodel.TenantId > 0) if (dmodel.TenantId > 0)
......
...@@ -148,7 +148,6 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -148,7 +148,6 @@ namespace Mall.WebApi.Controllers.AppletWeChat
{ {
// item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.OneCommission + item.TwoCommission + item.OtherPrice; // item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.OneCommission + item.TwoCommission + item.OtherPrice;
item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.OtherPrice; item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.OtherPrice;
// item.NoPaid = item.ALLCommission - item.Paid;
item.NoPaid = item.ALLCommission; item.NoPaid = item.ALLCommission;
item.Paid = item.PaidCostMoney + item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0); item.Paid = item.PaidCostMoney + item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
item.GrossProfit = item.AllPrice - item.ALLCommission; item.GrossProfit = item.AllPrice - item.ALLCommission;
...@@ -326,7 +325,12 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -326,7 +325,12 @@ namespace Mall.WebApi.Controllers.AppletWeChat
new ExcelColumn(value: "其他") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }, new ExcelColumn(value: "其他") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "已付") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }, new ExcelColumn(value: "已付") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "应付") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }, new ExcelColumn(value: "应付") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "退款金额") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "实际收入") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "实际支出") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "毛利") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }, new ExcelColumn(value: "毛利") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "分公司名称") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "分公司结算") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "毛利率") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER } new ExcelColumn(value: "毛利率") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }
}, },
}; };
...@@ -405,7 +409,12 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -405,7 +409,12 @@ namespace Mall.WebApi.Controllers.AppletWeChat
// datarow.ExcelRows.Add(new ExcelColumn(value: item.ALLCommission.ToString("#0.00")) { }); // datarow.ExcelRows.Add(new ExcelColumn(value: item.ALLCommission.ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.Paid.ToString("#0.00")) { }); datarow.ExcelRows.Add(new ExcelColumn(value: item.Paid.ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.NoPaid.ToString("#0.00")) { }); datarow.ExcelRows.Add(new ExcelColumn(value: item.NoPaid.ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.RefundActual.ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.RealMoney.ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.PayMoney.ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.GrossProfit.ToString("#0.00")) { }); datarow.ExcelRows.Add(new ExcelColumn(value: item.GrossProfit.ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.CompanyName) { });
datarow.ExcelRows.Add(new ExcelColumn(value: Math.Round((item.GrossProfit*item.CompanyProfitRate), 2, MidpointRounding.AwayFromZero).ToString("#0.00")) { });
datarow.ExcelRows.Add(new ExcelColumn(value: item.GrossProfitRate.ToString("#0.00")) { }); datarow.ExcelRows.Add(new ExcelColumn(value: item.GrossProfitRate.ToString("#0.00")) { });
slist.Add(datarow); slist.Add(datarow);
} }
...@@ -485,7 +494,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -485,7 +494,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
} }
foreach (var item in list) foreach (var item in list)
{ {
item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.FXCommission+item.LiveCommission + item.OtherPrice; item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.OtherPrice;
// item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.OneCommission + item.TwoCommission + item.OtherPrice; // item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.OneCommission + item.TwoCommission + item.OtherPrice;
item.NoPaid = item.ALLCommission; item.NoPaid = item.ALLCommission;
item.Paid = item.PaidCostMoney + item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0); item.Paid = item.PaidCostMoney + item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
......
...@@ -204,7 +204,9 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -204,7 +204,9 @@ namespace Mall.WebApi.Controllers.MarketingCenter
EndDate = x.EndDate.HasValue ? x.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", EndDate = x.EndDate.HasValue ? x.EndDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
x.TotalNum, x.TotalNum,
ResidueNum = x.ReceiveNum, ResidueNum = x.ReceiveNum,
x.PickupCenter x.PickupCenter,
x.SmallShopName,
x.SmallShopId
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
......
...@@ -143,12 +143,18 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -143,12 +143,18 @@ namespace Mall.WebApi.Controllers.MarketingCenter
/// <returns></returns> /// <returns></returns>
public ApiResult SetShareFriend() public ApiResult SetShareFriend()
{ {
JObject parm = JObject.Parse(RequestParm.msg.ToString());
var extModel = JsonConvert.DeserializeObject<RB_Share_Friend_Extend>(RequestParm.msg.ToString()); var extModel = JsonConvert.DeserializeObject<RB_Share_Friend_Extend>(RequestParm.msg.ToString());
extModel.TenantId = UserInfo.TenantId; extModel.TenantId = UserInfo.TenantId;
extModel.MallBaseId = RequestParm.MallBaseId; extModel.MallBaseId = RequestParm.MallBaseId;
extModel.CreateDate = DateTime.Now; extModel.CreateDate = DateTime.Now;
extModel.UpdateDate = DateTime.Now; extModel.UpdateDate = DateTime.Now;
extModel.IsUse = 1; extModel.IsUse = 1;
var imgStr = parm.GetStringValue("ImgList");
if (!string.IsNullOrWhiteSpace(imgStr))
{
extModel.MaterialImg = imgStr;
}
bool flag = shareModule.SetShareFriendModule(extModel); bool flag = shareModule.SetShareFriendModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
......
...@@ -54,8 +54,26 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -54,8 +54,26 @@ namespace Mall.WebApi.Controllers.MallBase
public ApiResult GetGoodsOrderPageList() public ApiResult GetGoodsOrderPageList()
{ {
var parms = RequestParm; var parms = RequestParm;
JObject newParms = JObject.Parse(RequestParm.msg.ToString());
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString()); ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(parms.msg.ToString()); RB_Goods_Order_Extend demodel = new RB_Goods_Order_Extend()
{
UserName = newParms.GetStringValue("UserName"),
OrderSource = (UserSourceEnum)newParms.GetInt("OrderSource"),
OrderType = newParms.GetInt("OrderType"),
DeliveryMethod = (OrderDeliveryMethodEnum)newParms.GetInt("DeliveryMethod"),
OrderId = newParms.GetInt("OrderId"),
StartTime = newParms.GetStringValue("StartTime"),
EndTime = newParms.GetStringValue("EndTime"),
OrderStatus = (OrderStatusEnum)newParms.GetInt("OrderStatus"),
OrderNo = newParms.GetStringValue("OrderNo"),
MerchantsNo = newParms.GetStringValue("MerchantsNo"),
UserId = newParms.GetInt("UserId"),
GoodsName = newParms.GetStringValue("GoodsName"),
Consignee = newParms.GetStringValue("Consignee"),
Recycled = newParms.GetInt("Recycled"),
AnchorName = newParms.GetStringValue("AnchorName"),
};
demodel.TenantId = parms.TenantId; demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId; demodel.MallBaseId = parms.MallBaseId;
......
...@@ -1424,64 +1424,64 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1424,64 +1424,64 @@ namespace Mall.WebApi.Controllers.MallBase
var model = productModule.GetProductGoodsInfo(GoodsId, req.TenantId, req.MallBaseId); var model = productModule.GetProductGoodsInfo(GoodsId, req.TenantId, req.MallBaseId);
return ApiResult.Success("", new return ApiResult.Success("", new
{ {
model.Id, model?.Id,
model.Name, model?.Name,
model.CarouselImage, model?.CarouselImage,
model.VideoAddress, model?.VideoAddress,
model.CustomShareTitles, model?.CustomShareTitles,
model.CustomShareImage, model?.CustomShareImage,
model.CustomShareImagePath, model?.CustomShareImagePath,
model.GoodsStatus, model?.GoodsStatus,
model.InventoryNum, model?.InventoryNum,
model.DefaultSpecificationName, model?.DefaultSpecificationName,
model.IsCustomSpecification, model?.IsCustomSpecification,
model.Sort, model?.Sort,
model.SellingPrice, model?.SellingPrice,
model.OriginalPrice, model?.OriginalPrice,
model.Unit, model?.Unit,
model.CostPrice, model?.CostPrice,
model.IsGoodsNegotiable, model?.IsGoodsNegotiable,
model.SalesNum, model?.SalesNum,
model.GoodsNumbers, model?.GoodsNumbers,
model.GoodsWeight, model?.GoodsWeight,
model.IsDefaultService, model?.IsDefaultService,
model.GoodsService, model?.GoodsService,
model.FreightId, model?.FreightId,
model.FreightName, model?.FreightName,
model.FormsId, model?.FormsId,
model.FormsName, model?.FormsName,
model.LimitBuyGoodsNum, model?.LimitBuyGoodsNum,
model.LimitBuyOrderNum, model?.LimitBuyOrderNum,
model.FullNumPinkage, model?.FullNumPinkage,
model.FullMoneyPinkage, model?.FullMoneyPinkage,
model.IsAreaBuy, model?.IsAreaBuy,
model.IntegralPresent, model?.IntegralPresent,
model.IntegralPresentType, model?.IntegralPresentType,
model.PointsDeduction, model?.PointsDeduction,
model.PointsDeductionType, model?.PointsDeductionType,
model.IsMultipleDeduction, model?.IsMultipleDeduction,
model.GoodsDetails, model?.GoodsDetails,
model.SeparateDistribution, model?.SeparateDistribution,
model.SeparateDistributionType, model?.SeparateDistributionType,
model.SeparateDistributionMoneyType, model?.SeparateDistributionMoneyType,
model.EnjoyMember, model?.EnjoyMember,
model.SeparateSetMember, model?.SeparateSetMember,
model.IsQuickBuy, model?.IsQuickBuy,
model.SupplierId, model?.SupplierId,
model.IsProxy, model?.IsProxy,
model.ProxyType, model?.ProxyType,
model.ProxyRises, model?.ProxyRises,
model.ProxyMoney, model?.ProxyMoney,
model.IsProcurement, model?.IsProcurement,
model.Commission, model?.Commission,
model.IsLiveGoods, model?.IsLiveGoods,
CategoryList = model.CategoryList.Select(x => new CategoryList = model?.CategoryList.Select(x => new
{ {
x.Id, x.Id,
x.CategoryId, x.CategoryId,
x.CategoryName x.CategoryName
}), }),
SpecificationList = model.SpecificationList.Select(x => new SpecificationList = model?.SpecificationList.Select(x => new
{ {
x.Id, x.Id,
x.EnabledImage, x.EnabledImage,
...@@ -1496,7 +1496,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1496,7 +1496,7 @@ namespace Mall.WebApi.Controllers.MallBase
y.Sort y.Sort
}) })
}), }),
SpecificationPriceList = model.SpecificationPriceList.Select(x => new SpecificationPriceList = model?.SpecificationPriceList.Select(x => new
{ {
x.Id, x.Id,
x.GoodsNumbers, x.GoodsNumbers,
...@@ -1508,14 +1508,14 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1508,14 +1508,14 @@ namespace Mall.WebApi.Controllers.MallBase
x.Commission, x.Commission,
x.CostMoney x.CostMoney
}), }),
AreaList = model.AreaList.Select(x => new AreaList = model?.AreaList.Select(x => new
{ {
x.Id, x.Id,
x.AreaId, x.AreaId,
x.AreaName, x.AreaName,
x.AreaType x.AreaType
}), }),
DistributionCommissionList = model.DistributionCommissionList.Select(x => new DistributionCommissionList = model?.DistributionCommissionList.Select(x => new
{ {
x.Id, x.Id,
x.DistributorGrade, x.DistributorGrade,
...@@ -1524,7 +1524,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1524,7 +1524,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.ThreeCommission, x.ThreeCommission,
x.TwoCommission x.TwoCommission
}), }),
DistributionCommissionTreeList = model.DistributionCommissionTreeList.Select(x => new DistributionCommissionTreeList = model?.DistributionCommissionTreeList.Select(x => new
{ {
x.Id, x.Id,
x.SpecificationSort, x.SpecificationSort,
...@@ -1537,14 +1537,14 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1537,14 +1537,14 @@ namespace Mall.WebApi.Controllers.MallBase
y.TwoCommission y.TwoCommission
}) })
}), }),
MemberPriceList = model.MemberPriceList.Select(x => new MemberPriceList = model?.MemberPriceList.Select(x => new
{ {
x.Id, x.Id,
x.MemberGrade, x.MemberGrade,
x.MemberPrice, x.MemberPrice,
x.SpecificationSort x.SpecificationSort
}), }),
MemberPriceTreeList = model.MemberPriceTreeList.Select(x => new MemberPriceTreeList = model?.MemberPriceTreeList.Select(x => new
{ {
x.Id, x.Id,
x.SpecificationSort, x.SpecificationSort,
...@@ -1555,13 +1555,13 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1555,13 +1555,13 @@ namespace Mall.WebApi.Controllers.MallBase
y.MemberPrice y.MemberPrice
}) })
}), }),
model.CarouselImageList, model?.CarouselImageList,
model.ServiceList, model?.ServiceList,
model.PresentFXGrade, model?.PresentFXGrade,
model.PresentFXMonth, model?.PresentFXMonth,
model.Advertising, model?.Advertising,
model.SubName, model?.SubName,
model.MarketingLogo model?.MarketingLogo
}); });
} }
......
...@@ -1004,7 +1004,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -1004,7 +1004,7 @@ namespace Mall.WebApi.Controllers.User
return ApiResult.Failed("优惠券信息不存在,请核实后再操作"); return ApiResult.Failed("优惠券信息不存在,请核实后再操作");
} }
if (oldLogisticsModel.SmallShopId > 0 && oldLogisticsModel.SmallShopId != userInfo.SmallShopId) if (oldLogisticsModel.SmallShopId > 0 && oldLogisticsModel.SmallShopId != userInfo.UserSmallShopId)
{ {
return ApiResult.Failed("领取优惠券不属于当前店铺"); return ApiResult.Failed("领取优惠券不属于当前店铺");
} }
...@@ -1181,8 +1181,21 @@ namespace Mall.WebApi.Controllers.User ...@@ -1181,8 +1181,21 @@ namespace Mall.WebApi.Controllers.User
{ {
var req = RequestParm; var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
JObject prams = JObject.Parse(req.msg.ToString());
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString()); ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
RB_Member_Balance_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Balance_Extend>(req.msg.ToString()); var createDateStr = prams.GetStringValue("CreateDate")+"-01";
RB_Member_Balance_Extend demodel = new RB_Member_Balance_Extend();
if (!string.IsNullOrWhiteSpace(createDateStr))
{
try
{
demodel.CreateDate = Convert.ToDateTime(createDateStr);
}
catch
{
demodel.CreateDate = DateTime.Now;
}
}
demodel.UserId = userInfo.UserId; demodel.UserId = userInfo.UserId;
demodel.TenantId = userInfo.TenantId; demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId; demodel.MallBaseId = userInfo.MallBaseId;
......
...@@ -101,6 +101,33 @@ namespace Mall.WebApi.Controllers.User ...@@ -101,6 +101,33 @@ namespace Mall.WebApi.Controllers.User
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
/// <summary>
/// 获取店铺下拉列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetAllSmallShopsList()
{
var parms = RequestParm;
RB_SmallShops_Info_Extend demodel = JsonConvert.DeserializeObject<RB_SmallShops_Info_Extend>(parms.msg.ToString());
demodel.TenantId = Convert.ToInt32(parms.uid);
demodel.MallBaseId = parms.MallBaseId;
demodel.AuditStatus = DistributorAuditStatusEnum.Audited;
var list = smallShopsModule.GetSmallShopsInfoList_V2(demodel);
var result = list.Select(x => new
{
x.Id,
x.Name
});
return ApiResult.Success("", result);
}
/// <summary> /// <summary>
/// 获取店铺信息 /// 获取店铺信息
/// </summary> /// </summary>
...@@ -581,6 +608,100 @@ namespace Mall.WebApi.Controllers.User ...@@ -581,6 +608,100 @@ namespace Mall.WebApi.Controllers.User
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
/// <summary>
/// 分销提现信息下载
/// </summary>
[HttpPost]
public FileContentResult GetSmallShopsRemitListToExcel()
{
var parms = RequestParm;
RB_SmallShops_Remit_Extend demodel = JsonConvert.DeserializeObject<RB_SmallShops_Remit_Extend>(parms.msg.ToString());
string ExcelName = "提现列表" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
List<ExcelDataSource> slist = new List<ExcelDataSource>();
if (demodel.ExcelEnumIds == null || !demodel.ExcelEnumIds.Any())
{
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", ExcelName);
}
var Enumlist = EnumHelper.GetEnumList(typeof(DistributorRemitExportEnum));
ExcelDataSource header = new ExcelDataSource()
{
ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value: "序号") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }
}
};
foreach (var item in demodel.ExcelEnumIds)
{
var Name = Enumlist.Where(x => x.Value == item.ToString()).FirstOrDefault().Key ?? "";
header.ExcelRows.Add(new ExcelColumn(value: Name) { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER });
}
slist.Add(header);
try
{
demodel.TenantId = Convert.ToInt32(parms.uid);
demodel.MallBaseId = parms.MallBaseId;
var list = smallShopsModule.GetSmallShopsRemitList(demodel);
#region 组装数据
int Num = 0;
foreach (var item in list)
{
Num++;
ExcelDataSource datarow = new ExcelDataSource()
{
ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value:Num.ToString()){ },
}
};
foreach (var qitem in demodel.ExcelEnumIds)
{
switch (qitem)
{
case 1:
datarow.ExcelRows.Add(new ExcelColumn(value: item.Source.GetEnumName()) { }); break;
case 2:
datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderNum ?? "") { }); break;
case 3:
datarow.ExcelRows.Add(new ExcelColumn(value: item.UserName ?? "") { }); break;
case 4:
datarow.ExcelRows.Add(new ExcelColumn(value: (item.AppliedMoney ?? 0).ToString()) { }); break;
case 5:
datarow.ExcelRows.Add(new ExcelColumn(value: item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")) { }); break;
case 6:
datarow.ExcelRows.Add(new ExcelColumn(value: item.BankName ?? "") { }); break;
case 7:
datarow.ExcelRows.Add(new ExcelColumn(value: item.AccountNumber ?? "") { }); break;
case 8:
datarow.ExcelRows.Add(new ExcelColumn(value: item.AccountName ?? "") { }); break;
case 9:
datarow.ExcelRows.Add(new ExcelColumn(value: item.AuditStatus.GetEnumName()) { }); break;
case 10:
datarow.ExcelRows.Add(new ExcelColumn(value: item.WithdrawalWay.GetEnumName()) { }); break;
case 11:
datarow.ExcelRows.Add(new ExcelColumn(value: item.RemitDate.HasValue ? item.RemitDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "") { }); break;
}
}
slist.Add(datarow);
}
#endregion
var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData, "application/octet-stream", ExcelName);
}
catch (Exception ex)
{
LogHelper.Write(ex, string.Format("GetFileFromWebApi_requestData: {0}", JsonHelper.Serialize(RequestParm)));
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", ExcelName);
}
}
#endregion #endregion
} }
} }
\ No newline at end of file
...@@ -50,9 +50,18 @@ namespace Mall.WebApi.Controllers.User ...@@ -50,9 +50,18 @@ namespace Mall.WebApi.Controllers.User
public ApiResult GetMemberUserPageList() public ApiResult GetMemberUserPageList()
{ {
var parms = RequestParm; var parms = RequestParm;
JObject param = JObject.Parse(parms.msg.ToString());
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString()); ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Member_User_Extend demodel = JsonConvert.DeserializeObject<RB_Member_User_Extend>(parms.msg.ToString()); RB_Member_User_Extend demodel = new RB_Member_User_Extend()
{
Name = param.GetStringValue("param"),
Source = (UserSourceEnum)param.GetInt("Source"),
MemberGrade = param.GetInt("MemberGrade"),
Id = param.GetInt("Id"),
Moblie = param.GetStringValue("Moblie"),
StartTime = param.GetStringValue("StartTime"),
EndTime = param.GetStringValue("EndTime"),
};
demodel.TenantId = Convert.ToInt32(parms.uid); demodel.TenantId = Convert.ToInt32(parms.uid);
demodel.MallBaseId = parms.MallBaseId; demodel.MallBaseId = parms.MallBaseId;
var list = userModule.GetMemberUserPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel); var list = userModule.GetMemberUserPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
...@@ -214,7 +223,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -214,7 +223,8 @@ namespace Mall.WebApi.Controllers.User
var Enumlist = EnumHelper.GetEnumList(typeof(UserExportEnum)); var Enumlist = EnumHelper.GetEnumList(typeof(UserExportEnum));
ExcelDataSource header = new ExcelDataSource() ExcelDataSource header = new ExcelDataSource()
{ {
ExcelRows = new List<ExcelColumn>(30) { ExcelRows = new List<ExcelColumn>(30)
{
new ExcelColumn(value: "序号") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER } new ExcelColumn(value: "序号") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER }
} }
}; };
...@@ -281,9 +291,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -281,9 +291,7 @@ namespace Mall.WebApi.Controllers.User
slist.Add(datarow); slist.Add(datarow);
} }
#endregion #endregion
var byteData = ExcelTempLateHelper.ToExcelExtend(slist); var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData, "application/octet-stream", ExcelName); return File(byteData, "application/octet-stream", ExcelName);
} }
catch (Exception ex) catch (Exception ex)
...@@ -292,7 +300,6 @@ namespace Mall.WebApi.Controllers.User ...@@ -292,7 +300,6 @@ namespace Mall.WebApi.Controllers.User
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist); var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", ExcelName); return File(byteData1, "application/octet-stream", ExcelName);
} }
} }
/// <summary> /// <summary>
...@@ -944,7 +951,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -944,7 +951,7 @@ namespace Mall.WebApi.Controllers.User
{ {
return ApiResult.ParamIsNull("请传递分销申请下文本颜色"); return ApiResult.ParamIsNull("请传递分销申请下文本颜色");
} }
if (string.IsNullOrEmpty(demodel.DistributionCommissionName)) if (string.IsNullOrEmpty(demodel.DistributionCommissionName))
{ {
return ApiResult.ParamIsNull("请传递分销中心下分销佣金"); return ApiResult.ParamIsNull("请传递分销中心下分销佣金");
...@@ -1724,16 +1731,18 @@ namespace Mall.WebApi.Controllers.User ...@@ -1724,16 +1731,18 @@ namespace Mall.WebApi.Controllers.User
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SetDistributorCommission() public ApiResult SetDistributorCommission()
{ {
var re = RequestParm; var re = RequestParm;
var parms = JObject.Parse(re.msg.ToString()); var parms = JObject.Parse(re.msg.ToString());
int DistributorId = parms.GetInt("DistributorId", 0); int DistributorId = parms.GetInt("DistributorId", 0);
decimal Money = parms.GetDecimal("Money"); decimal Money = parms.GetDecimal("Money");
if (DistributorId <= 0) { if (DistributorId <= 0)
{
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
if (Money < 0) { if (Money < 0)
{
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
...@@ -1873,7 +1882,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -1873,7 +1882,8 @@ namespace Mall.WebApi.Controllers.User
var parms = JObject.Parse(re.msg.ToString()); var parms = JObject.Parse(re.msg.ToString());
int RemitId = parms.GetInt("RemitId", 0); int RemitId = parms.GetInt("RemitId", 0);
int ErpEmpId = parms.GetInt("ErpEmpId", 0);//erp用户id int ErpEmpId = parms.GetInt("ErpEmpId", 0);//erp用户id
if (ErpEmpId <= 0) { if (ErpEmpId <= 0)
{
ErpEmpId = re.ERPEmpId; ErpEmpId = re.ERPEmpId;
} }
int Type = parms.GetInt("Type", 0);//1审核通过 2打款 3驳回 int Type = parms.GetInt("Type", 0);//1审核通过 2打款 3驳回
...@@ -1944,8 +1954,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -1944,8 +1954,8 @@ namespace Mall.WebApi.Controllers.User
return ApiResult.Success(); return ApiResult.Success();
} }
} }
else if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.YETX) else if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.YETX)
{ {
//把钱充值到余额里 在更新完提现表状态后 发放到余额 //把钱充值到余额里 在更新完提现表状态后 发放到余额
} }
...@@ -2642,7 +2652,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -2642,7 +2652,7 @@ namespace Mall.WebApi.Controllers.User
if (UserId <= 0) if (UserId <= 0)
{ {
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
var obj = userModule.GetHpUserDistributorInfo(UserId, req.TenantId, req.MallBaseId); var obj = userModule.GetHpUserDistributorInfo(UserId, req.TenantId, req.MallBaseId);
return ApiResult.Success("", obj); return ApiResult.Success("", obj);
...@@ -2777,15 +2787,19 @@ namespace Mall.WebApi.Controllers.User ...@@ -2777,15 +2787,19 @@ namespace Mall.WebApi.Controllers.User
return ApiResult.ParamIsNull("请传递同级返佣比例"); return ApiResult.ParamIsNull("请传递同级返佣比例");
} }
//验证等级是否重复 //验证等级是否重复
if (userModule.ValidateFXGrade(demodel.Id, demodel.Grade, req.TenantId, req.MallBaseId)) { if (userModule.ValidateFXGrade(demodel.Id, demodel.Grade, req.TenantId, req.MallBaseId))
{
return ApiResult.ParamIsNull("等级已存在,请核实后再试"); return ApiResult.ParamIsNull("等级已存在,请核实后再试");
} }
if ((demodel.IsUpgrade ?? 2) == 1) { if ((demodel.IsUpgrade ?? 2) == 1)
if ((demodel.UpgradeNum ?? 0) <= 0) { {
if ((demodel.UpgradeNum ?? 0) <= 0)
{
return ApiResult.ParamIsNull("请输入所需下线数量"); return ApiResult.ParamIsNull("请输入所需下线数量");
} }
if ((demodel.UpgradeId ?? 0) <= 0) { if ((demodel.UpgradeId ?? 0) <= 0)
{
return ApiResult.ParamIsNull("请选择所需下线等级"); return ApiResult.ParamIsNull("请选择所需下线等级");
} }
} }
...@@ -2859,7 +2873,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -2859,7 +2873,8 @@ namespace Mall.WebApi.Controllers.User
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetIsEnableFXDistributorGrade() { public ApiResult GetIsEnableFXDistributorGrade()
{
var requestParm = RequestParm; var requestParm = RequestParm;
var model = userModule.GetDistributorBasicsInfo(requestParm.uid, requestParm.MallBaseId); var model = userModule.GetDistributorBasicsInfo(requestParm.uid, requestParm.MallBaseId);
...@@ -2966,11 +2981,13 @@ namespace Mall.WebApi.Controllers.User ...@@ -2966,11 +2981,13 @@ namespace Mall.WebApi.Controllers.User
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult CancalRecommendOrdersBill() { public ApiResult CancalRecommendOrdersBill()
{
var req = RequestParm; var req = RequestParm;
var parms = JObject.Parse(req.msg.ToString()); var parms = JObject.Parse(req.msg.ToString());
int BillId = parms.GetInt("BillId", 0); int BillId = parms.GetInt("BillId", 0);
if (BillId <= 0) { if (BillId <= 0)
{
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
bool flag = userModule.CancalRecommendOrdersBill(BillId, req.TenantId, req.MallBaseId, req.EmpId); bool flag = userModule.CancalRecommendOrdersBill(BillId, req.TenantId, req.MallBaseId, req.EmpId);
...@@ -2978,7 +2995,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -2978,7 +2995,8 @@ namespace Mall.WebApi.Controllers.User
{ {
return ApiResult.Success(); return ApiResult.Success();
} }
else { else
{
return ApiResult.Failed(); return ApiResult.Failed();
} }
} }
...@@ -2988,7 +3006,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -2988,7 +3006,8 @@ namespace Mall.WebApi.Controllers.User
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult SetRecommendOrdersBillRemark() { public ApiResult SetRecommendOrdersBillRemark()
{
var req = RequestParm; var req = RequestParm;
var parms = JObject.Parse(req.msg.ToString()); var parms = JObject.Parse(req.msg.ToString());
int BillId = parms.GetInt("BillId", 0); int BillId = parms.GetInt("BillId", 0);
...@@ -3032,7 +3051,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -3032,7 +3051,7 @@ namespace Mall.WebApi.Controllers.User
{ {
var mallModel = userModule.GetMiniProgramExtend(req.MallBaseId); var mallModel = userModule.GetMiniProgramExtend(req.MallBaseId);
var umodel = userModule.GetMemberUserInfo(bmodel.UserId ?? 0); var umodel = userModule.GetMemberUserInfo(bmodel.UserId ?? 0);
var flag = App_Code.PayUtil.GetTransfersOrder((bmodel.Periods ?? "") + bmodel.Id, bmodel.Money ?? 0, (bmodel.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor,"赞羊供应商佣金打款"); var flag = App_Code.PayUtil.GetTransfersOrder((bmodel.Periods ?? "") + bmodel.Id, bmodel.Money ?? 0, (bmodel.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor, "赞羊供应商佣金打款");
if (flag) if (flag)
{ {
string msg = userModule.SetRecommendOrdersBillRemit(BillId, req.TenantId, req.MallBaseId, req.EmpId); string msg = userModule.SetRecommendOrdersBillRemit(BillId, req.TenantId, req.MallBaseId, req.EmpId);
...@@ -3069,13 +3088,15 @@ namespace Mall.WebApi.Controllers.User ...@@ -3069,13 +3088,15 @@ namespace Mall.WebApi.Controllers.User
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult GetRecommendOrdersBillDetailList() { public ApiResult GetRecommendOrdersBillDetailList()
{
var parms = RequestParm; var parms = RequestParm;
RB_Distributor_BillDetail_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_BillDetail_Extend>(parms.msg.ToString()); RB_Distributor_BillDetail_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_BillDetail_Extend>(parms.msg.ToString());
demodel.TenantId = parms.TenantId; demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId; demodel.MallBaseId = parms.MallBaseId;
if ((demodel.BillId ?? 0) <= 0) { if ((demodel.BillId ?? 0) <= 0)
{
return ApiResult.ParamIsNull("请传递账单id"); return ApiResult.ParamIsNull("请传递账单id");
} }
var Robj = userModule.GetRecommendOrdersBillDetailList(demodel); var Robj = userModule.GetRecommendOrdersBillDetailList(demodel);
...@@ -3090,11 +3111,12 @@ namespace Mall.WebApi.Controllers.User ...@@ -3090,11 +3111,12 @@ namespace Mall.WebApi.Controllers.User
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult InitializeFXVIPCommission() { public ApiResult InitializeFXVIPCommission()
{
var req = RequestParm; var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString()); JObject parms = JObject.Parse(req.msg.ToString());
int OrderId = parms.GetInt("OrderId", 0); int OrderId = parms.GetInt("OrderId", 0);
if (OrderId<=0) if (OrderId <= 0)
{ {
return ApiResult.ParamIsNull("请传递参数"); return ApiResult.ParamIsNull("请传递参数");
} }
...@@ -3306,7 +3328,8 @@ namespace Mall.WebApi.Controllers.User ...@@ -3306,7 +3328,8 @@ namespace Mall.WebApi.Controllers.User
x.Grade x.Grade
})); }));
} }
else { else
{
List<RB_Distributor_Grade_Extend> list = new List<RB_Distributor_Grade_Extend>(); List<RB_Distributor_Grade_Extend> list = new List<RB_Distributor_Grade_Extend>();
return ApiResult.Success("", list.Select(x => new return ApiResult.Success("", list.Select(x => new
{ {
......
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