Commit 42c247df authored by liudong1993's avatar liudong1993

1

parent 29c176b5
......@@ -1275,7 +1275,7 @@ namespace Mall.Module.Product
decimal Express = 0;
if (defModel.Id > 0 && demodel.DeliveryMethod == OrderDeliveryMethodEnum.ExpressDistribution)
{
if (!((gmodel.FullNumPinkage > 0 && item.Number > gmodel.FullNumPinkage) || (gmodel.FullMoneyPinkage > 0 && item.Final_Price > gmodel.FullMoneyPinkage)))
if (!((gmodel.FullNumPinkage > 0 && item.Number >= gmodel.FullNumPinkage) || (gmodel.FullMoneyPinkage > 0 && item.Final_Price >= gmodel.FullMoneyPinkage)))
{
int FreightId2 = gmodel.FreightId ?? 0;
if (gmodel.FreightId == 0)
......@@ -2227,82 +2227,94 @@ namespace Mall.Module.Product
item.DiscountRate = gradeModel?.Discount ?? 10;
}
}
if (umodel.MemberGrade > 0)
{
item.Final_Price = gmodel.MemberPrice * (item.Number ?? 0);
}
else
{
item.Final_Price = (gmodel.SellingPrice ?? 0) * (item.Number ?? 0);
}
#endregion
#region 运费
decimal Express = 0;
if (demodel.DeliveryMethod == OrderDeliveryMethodEnum.ExpressDistribution)
{
int FreightId2 = gmodel.FreightId ?? 0;
if (gmodel.FreightId == 0)
if (!((gmodel.FullNumPinkage > 0 && item.Number >= gmodel.FullNumPinkage) || (gmodel.FullMoneyPinkage > 0 && item.Final_Price >= gmodel.FullMoneyPinkage)))
{
FreightId2 = DefFreightId;
}
if (FreightId2 > 0)
{
var rulesModel = rulesList.Where(x => x.ID == FreightId2).FirstOrDefault();
List<Model.Extend.BaseSetUp.RB_Logistics_RulesPrice_Extend> priceList2 = priceList.Where(x => x.RulesId == FreightId2).ToList();
if (priceList2.Any())
int FreightId2 = gmodel.FreightId ?? 0;
if (gmodel.FreightId == 0)
{
var priceIds = priceList2.Select(x => x.ID).ToList();
var regionList2 = regionList.Where(x => priceIds.Contains(x.RulesPriceId)).ToList();
var regionModel = regionList2.Where(x => disList.Contains(x.RegionId)).FirstOrDefault();
if (regionModel != null)
FreightId2 = DefFreightId;
}
if (FreightId2 > 0)
{
var rulesModel = rulesList.Where(x => x.ID == FreightId2).FirstOrDefault();
List<Model.Extend.BaseSetUp.RB_Logistics_RulesPrice_Extend> priceList2 = priceList.Where(x => x.RulesId == FreightId2).ToList();
if (priceList2.Any())
{
var pmodel = priceList2.Where(x => x.ID == regionModel.RulesPriceId).FirstOrDefault();
if (pmodel != null && rulesModel != null)
var priceIds = priceList2.Select(x => x.ID).ToList();
var regionList2 = regionList.Where(x => priceIds.Contains(x.RulesPriceId)).ToList();
var regionModel = regionList2.Where(x => disList.Contains(x.RegionId)).FirstOrDefault();
if (regionModel != null)
{
if (rulesModel.ChargeMode == Common.Enum.MallBase.ChargeModeEnum.Num)
var pmodel = priceList2.Where(x => x.ID == regionModel.RulesPriceId).FirstOrDefault();
if (pmodel != null && rulesModel != null)
{
//按件计费
if (item.Number <= pmodel.First)
{
Express = pmodel.FirstPrice;
}
else
if (rulesModel.ChargeMode == Common.Enum.MallBase.ChargeModeEnum.Num)
{
if (pmodel.Second > 0)
//按件计费
if (item.Number <= pmodel.First)
{
if (((item.Number ?? 0) - pmodel.First) % pmodel.Second == 0)
Express = pmodel.FirstPrice;
}
else
{
if (pmodel.Second > 0)
{
Express = pmodel.FirstPrice + (((item.Number ?? 0) - pmodel.First) / pmodel.Second) * pmodel.SecondPrice;
if (((item.Number ?? 0) - pmodel.First) % pmodel.Second == 0)
{
Express = pmodel.FirstPrice + (((item.Number ?? 0) - pmodel.First) / pmodel.Second) * pmodel.SecondPrice;
}
else
{
Express = pmodel.FirstPrice + (((item.Number ?? 0) - pmodel.First) / pmodel.Second + 1) * pmodel.SecondPrice;
}
}
else
{
Express = pmodel.FirstPrice + (((item.Number ?? 0) - pmodel.First) / pmodel.Second + 1) * pmodel.SecondPrice;
Express = pmodel.FirstPrice;
}
}
else
{
Express = pmodel.FirstPrice;
}
}
}
else
{
//重量计费
int TotalW = (item.Number ?? 0) * GoodsWeight;
if (TotalW <= pmodel.First)
{
Express = pmodel.FirstPrice;
}
else
{
if (pmodel.Second > 0)
//重量计费
int TotalW = (item.Number ?? 0) * GoodsWeight;
if (TotalW <= pmodel.First)
{
if ((TotalW - pmodel.First) % pmodel.Second == 0)
Express = pmodel.FirstPrice;
}
else
{
if (pmodel.Second > 0)
{
Express = pmodel.FirstPrice + ((TotalW - pmodel.First) / pmodel.Second) * pmodel.SecondPrice;
if ((TotalW - pmodel.First) % pmodel.Second == 0)
{
Express = pmodel.FirstPrice + ((TotalW - pmodel.First) / pmodel.Second) * pmodel.SecondPrice;
}
else
{
Express = pmodel.FirstPrice + ((TotalW - pmodel.First) / pmodel.Second + 1) * pmodel.SecondPrice;
}
}
else
{
Express = pmodel.FirstPrice + ((TotalW - pmodel.First) / pmodel.Second + 1) * pmodel.SecondPrice;
Express = pmodel.FirstPrice;
}
}
else
{
Express = pmodel.FirstPrice;
}
}
}
}
......@@ -2315,15 +2327,7 @@ namespace Mall.Module.Product
item.FreightMoney = Express;
item.Unit_Price = gmodel.SellingPrice ?? 0;
item.Original_Price = (item.Unit_Price) * (item.Number);
if (umodel.MemberGrade > 0)
{
item.Final_Price = gmodel.MemberPrice * (item.Number ?? 0);
}
else
{
item.Final_Price = (gmodel.SellingPrice ?? 0) * (item.Number ?? 0);
}
item.Original_Price = (item.Unit_Price) * (item.Number);
#region 积分
if (umodel.Integral > 0 && gmodel.PointsDeduction > 0 && integralModel.IntegralNum > 0)
......@@ -4178,7 +4182,7 @@ namespace Mall.Module.Product
}
var arealist = destinationRepository.GetDictvalueListForIds(areaIds);
//分销情况
var oclist = goods_OrderCommissionRepository.GetListGroupByUser(new RB_Goods_OrderCommission_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, OrderIds = string.Join(",", list.Select(x => x.OrderId)) });
; var oclist = goods_OrderCommissionRepository.GetList(new RB_Goods_OrderCommission_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, OrderIds = string.Join(",", list.Select(x => x.OrderId)) });
if (oclist.Any())
{
//获取用户
......@@ -4231,7 +4235,11 @@ namespace Mall.Module.Product
item.ShoppingAddress = areaName + " " + item.ShoppingAddress;
item.OrderCommissionList = oclist.Where(x => x.OrderId == item.OrderId).ToList();
item.IsOrderCommission = item.OrderCommissionList.FirstOrDefault()?.IsGoodsDistribution ?? 2;
item.IsOrderCommission = 2;
if (item.OrderCommissionList.Where(x => x.CommissionState == 2).Any())
{
item.IsOrderCommission = 1;
}
}
}
return list;
......@@ -4447,7 +4455,11 @@ namespace Mall.Module.Product
item.ShoppingAddress = areaName + " " + item.ShoppingAddress;
item.OrderCommissionList = oclist.Where(x => x.OrderId == item.OrderId).ToList();
item.IsOrderCommission = item.OrderCommissionList.FirstOrDefault()?.IsGoodsDistribution ?? 2;
item.IsOrderCommission = 2;
if (item.OrderCommissionList.Where(x => x.CommissionState == 2).Any())
{
item.IsOrderCommission = 1;
}
}
}
return list;
......@@ -5620,7 +5632,7 @@ namespace Mall.Module.Product
/// <summary>
/// 设置订单操作
/// </summary>
/// <param name="orderId"></param>
/// <param name="orderModel"></param>
/// <param name="type">类型 1修改备注 2修改金额 3强制取消 4放入回收站 5确认收货 6确认完成 7回收恢复 8回收删除</param>
/// <param name="remark"></param>
/// <param name="income"></param>
......@@ -5628,7 +5640,7 @@ namespace Mall.Module.Product
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns>
public bool SetOrderOperation(int orderId, int type, string remark, decimal income, string address, int tenantId, int mallBaseId)
public bool SetOrderOperation(RB_Goods_Order_Extend orderModel, int type, string remark, decimal income, string address, int tenantId, int mallBaseId)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() { };
switch (type)
......@@ -5658,7 +5670,7 @@ namespace Mall.Module.Product
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods_Order.OrderId),
FiledValue=orderId,
FiledValue=orderModel.OrderId,
OperatorEnum=OperatorEnum.Equal
},
new WhereHelper(){
......@@ -5702,54 +5714,98 @@ namespace Mall.Module.Product
CreateDate = DateTime.Now,
Id = 0,
MallBaseId = mallBaseId,
SourceId = orderId,
SourceId = orderModel.OrderId,
TenantId = tenantId,
Type = 1
});
//更新返佣为已返佣
var ocList = goods_OrderCommissionRepository.GetListGroupByUser(new RB_Goods_OrderCommission_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderId = orderId });
if (ocList.Any())
});
if (type == 6)
{
foreach (var item in ocList)
//更新返佣为已返佣
var ocList = goods_OrderCommissionRepository.GetList(new RB_Goods_OrderCommission_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderId = orderModel.OrderId });
if (ocList.Any())
{
//查询是否有申请退款
var afterSaleList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetialId = item.OrderDetailId, Type = 1, MallBaseId = mallBaseId, TenantId = tenantId });
if (!afterSaleList.Any())
foreach (var item in ocList)
{
//获取分销商信息
var disInfo = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = item.UserId, TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
if (disInfo != null && disInfo.AuditStatus == DistributorAuditStatusEnum.Audited)
//查询是否有申请退款
var afterSaleList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetialId = item.OrderDetailId, Type = 1, MallBaseId = mallBaseId, TenantId = tenantId });
if (!afterSaleList.Any())
{
//更新分销商佣金
Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
{ nameof(RB_Distributor_Info_Extend.TotalCommission),(disInfo.TotalCommission??0)+(item.Commission??0)},
{ nameof(RB_Distributor_Info_Extend.CommissionWithdrawal),(disInfo.CommissionWithdrawal??0)+(item.Commission??0)},
//获取分销商信息
var disInfo = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { UserId = item.UserId, TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
if (disInfo != null && disInfo.AuditStatus == DistributorAuditStatusEnum.Audited)
{
//更新分销商佣金
Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
{ nameof(RB_Distributor_Info_Extend.TotalCommission),(disInfo.TotalCommission??0)+(item.Commission??0)},
{ nameof(RB_Distributor_Info_Extend.CommissionWithdrawal),(disInfo.CommissionWithdrawal??0)+(item.Commission??0)},
};
List<WhereHelper> wheres2 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Distributor_Info_Extend.Id),
FiledValue=disInfo.Id,
OperatorEnum=OperatorEnum.Equal
}
};
bool flag1 = distributor_InfoRepository.Update(keyValues2, wheres2);
if (flag1)
{
//更新返佣状态
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Goods_OrderCommission_Extend.CommissionState),2},
{ nameof(RB_Goods_OrderCommission_Extend.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods_OrderCommission_Extend.Id),
FiledValue=item.Id,
OperatorEnum=OperatorEnum.Equal
}
};
goods_OrderCommissionRepository.Update(keyValues1, wheres1);
}
}
}
}
}
//积分赠送
var dlist = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { OrderId = orderModel.OrderId, TenantId = tenantId, MallBaseId = mallBaseId });
if (dlist.Any()) {
int IntegralGoodsPresent = 0;
foreach (var item in dlist) {
if (item.IntegralGoodsPresent > 0) {
IntegralGoodsPresent += (item.IntegralGoodsPresent ?? 0);
}
}
if (IntegralGoodsPresent > 0) {
//保存积分赠送
var umodel = member_UserRepository.GetEntity(orderModel.UserId);
//用户订单数增加
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Member_User_Extend.Integral), (umodel.Integral ?? 0)+IntegralGoodsPresent }
};
List<WhereHelper> wheres2 = new List<WhereHelper>() {
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Distributor_Info_Extend.Id),
FiledValue=disInfo.Id,
FiledName=nameof(RB_Member_User_Extend.Id),
FiledValue=umodel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
bool flag1 = goods_OrderCommissionRepository.Update(keyValues2, wheres2);
if (flag1)
{
//更新返佣状态
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Goods_OrderCommission_Extend.CommissionState),2},
{ nameof(RB_Goods_OrderCommission_Extend.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods_OrderCommission_Extend.Id),
FiledValue=item.Id,
OperatorEnum=OperatorEnum.Equal
}
};
goods_OrderCommissionRepository.Update(keyValues1, wheres1);
}
}
member_UserRepository.Update(keyValues1, wheres1);
member_IntegralRepository.Insert(new Model.Entity.User.RB_Member_Integral()
{
Id = 0,
CreateDate = DateTime.Now,
Description = "订单购买赠送积分,订单号:" + orderModel.OrderNo,
Image = 0,
Integral = IntegralGoodsPresent,
MallBaseId = orderModel.MallBaseId,
PlatformType = orderModel.OrderSource,
Remarks = "",
TenantId = orderModel.TenantId,
Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income,
UserId = orderModel.UserId,
OrderId = orderModel.OrderId
});
}
}
}
......@@ -6377,6 +6433,7 @@ namespace Mall.Module.Product
/// <returns></returns>
public bool SetGoodsCommentInfo(RB_Goods_Comment_Extend demodel)
{
var omodel = new RB_Goods_Order();
int OrderId = 0;
if (demodel.OrderDetailId > 0)
{
......@@ -6384,7 +6441,7 @@ namespace Mall.Module.Product
if (dmodel == null) { return false; }
OrderId = dmodel.OrderId ?? 0;
if (dmodel.IsComment == 1) { return false; }
var omodel = goods_OrderRepository.GetEntity(OrderId);
omodel = goods_OrderRepository.GetEntity(OrderId);
if (omodel == null) { return false; }
if (omodel.OrderStatus != OrderStatusEnum.Received) { return false; }
}
......@@ -6424,7 +6481,7 @@ namespace Mall.Module.Product
goods_OrderRepository.Update(keyValues1, wheres1);
//更新返佣为已返佣
var ocList = goods_OrderCommissionRepository.GetListGroupByUser(new RB_Goods_OrderCommission_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, OrderId = OrderId });
var ocList = goods_OrderCommissionRepository.GetList(new RB_Goods_OrderCommission_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, OrderId = OrderId });
if (ocList.Any())
{
foreach (var item in ocList)
......@@ -6449,7 +6506,7 @@ namespace Mall.Module.Product
OperatorEnum=OperatorEnum.Equal
}
};
bool flag1 = goods_OrderCommissionRepository.Update(keyValues2, wheres2);
bool flag1 = distributor_InfoRepository.Update(keyValues2, wheres2);
if (flag1)
{
//更新返佣状态
......@@ -6470,6 +6527,52 @@ namespace Mall.Module.Product
}
}
}
//积分赠送
var d2list = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { OrderId = omodel.OrderId, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
if (d2list.Any())
{
int IntegralGoodsPresent = 0;
foreach (var item in d2list)
{
if (item.IntegralGoodsPresent > 0)
{
IntegralGoodsPresent += (item.IntegralGoodsPresent ?? 0);
}
}
if (IntegralGoodsPresent > 0)
{
//保存积分赠送
var umodel = member_UserRepository.GetEntity(demodel.UserId);
//用户订单数增加
Dictionary<string, object> keyValues12 = new Dictionary<string, object>() {
{ nameof(RB_Member_User_Extend.Integral), (umodel.Integral ?? 0)+IntegralGoodsPresent }
};
List<WhereHelper> wheres12 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Member_User_Extend.Id),
FiledValue=umodel.Id,
OperatorEnum=OperatorEnum.Equal
}
};
member_UserRepository.Update(keyValues12, wheres12);
member_IntegralRepository.Insert(new Model.Entity.User.RB_Member_Integral()
{
Id = 0,
CreateDate = DateTime.Now,
Description = "订单购买赠送积分,订单号:" + omodel.OrderNo,
Image = 0,
Integral = IntegralGoodsPresent,
MallBaseId = demodel.MallBaseId,
PlatformType = omodel.OrderSource,
Remarks = "",
TenantId = demodel.TenantId,
Type = Common.Enum.MarketingCenter.RecordTypeEnum.Income,
UserId = demodel.UserId,
OrderId = omodel.OrderId
});
}
}
}
}
}
......
......@@ -1376,7 +1376,7 @@ namespace Mall.Module.User
{
//查询最小的代理等级
var glist = distributor_HPGradeInfoRepository.GetList(new RB_Distributor_HPGradeInfo_Extend() { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
int MinId = glist.Where(x => (x.IsGuest ?? 0) != 1).Min(x => x.Grade ?? 0);
int MinId = glist.Where(x => (x.IsGuest ?? 0) != 1).Max(x => x.Grade ?? 0);
int MinGradeId = glist.Where(x => x.Grade == MinId).FirstOrDefault()?.Id ?? 0;
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Distributor_Info.AuditStatus),DistributorAuditStatusEnum.Audited},
......@@ -2573,6 +2573,11 @@ namespace Mall.Module.User
if (CustomModel == null) {
return "";
}
var basicModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
if (basicModel == null) {
return "";
}
return new
{
CustomModel = new
......@@ -2584,7 +2589,8 @@ namespace Mall.Module.User
CustomModel.ButtonFilletPX,
CustomModel.ButtonText,
CustomModel.ButtonColor,
CustomModel.ButtonTextColor
CustomModel.ButtonTextColor,
basicModel.ApplicationProtocol
},
ApplyForInfo = new
{
......@@ -2651,6 +2657,8 @@ namespace Mall.Module.User
//分销订单
decimal OrderCommission = goods_OrderCommissionRepository.GetUserOrderCommissionStatistics(userInfo.UserId);
//未结算返佣
decimal WJSCommission = goods_OrderCommissionRepository.GetUserOrderCommissionNoSettlement(userInfo.UserId);
int SuperiorId = 0;
string SuperiorName = "";
......@@ -2706,7 +2714,7 @@ namespace Mall.Module.User
HpReferralsGradeAudit = HpEnabled == 1 ? (basicsModel?.HpReferralsGradeAudit ?? 2) : 2,
CommissionWithdrawal = model.CommissionWithdrawal ?? 0,
TXCommission = commModel?.TXCommission ?? 0,
WJSCommission = commModel?.WJSCommission ?? 0,
WJSCommission,
model.TotalCommission,
OrderCommission,
RemitMoney = remitMoney,
......@@ -3218,7 +3226,7 @@ namespace Mall.Module.User
if (SdisModel != null)
{
var glist = distributor_HPGradeInfoRepository.GetList(new RB_Distributor_HPGradeInfo_Extend() { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId });
int MinId = glist.Where(x => (x.IsGuest ?? 0) != 1).Min(x => x.Grade ?? 0);
int MinId = glist.Where(x => (x.IsGuest ?? 0) != 1).Max(x => x.Grade ?? 0);
var sdisgM = glist.Where(x => x.Id == SdisModel.HPGradeId).FirstOrDefault();
if (MinId == (sdisgM?.Grade ?? 0)) {
IsShowDistributionCenter = 2;//其上级为最后一级 和平下不能显示分销中心
......@@ -4089,7 +4097,7 @@ namespace Mall.Module.User
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 "";
}
......
......@@ -91,7 +91,7 @@ namespace Mall.Repository.Product
/// <returns></returns>
public List<RB_Goods_OrderCommission_Extend> GetListGroupByUser_V2(int pageIndex,int pageSize,out long count,RB_Goods_OrderCommission_Extend dmodel)
{
string where = $" 1=1 and o.Recycled=2";
string where = $" 1=1 and o.Recycled=2 and oa.ReOrderId is null";
if (dmodel.TenantId > 0)
{
where += $@" and oc.{nameof(RB_Goods_OrderCommission.TenantId)}={dmodel.TenantId}";
......@@ -112,7 +112,8 @@ namespace Mall.Repository.Product
{
where += $@" and oc.{nameof(RB_Goods_OrderCommission.OrderId)} in({dmodel.OrderIds})";
}
if (dmodel.DistrbutionOrderSelectStatus > 0) {
if (dmodel.DistrbutionOrderSelectStatus > 0)
{
switch (dmodel.DistrbutionOrderSelectStatus)
{
case 1: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)OrderStatusEnum.NonPayment}"; break;
......@@ -120,10 +121,14 @@ namespace Mall.Repository.Product
case 3: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)OrderStatusEnum.Completed}"; break;
}
}
else {
where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,5,6)";
}
string sql = $@"SELECT oc.OrderId,o.OrderNo,o.UserId,oc.Grade,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission
FROM RB_Goods_OrderCommission oc
inner join rb_goods_order o on oc.OrderId = o.OrderId
left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Grade order by oc.OrderId desc";
return GetPage<RB_Goods_OrderCommission_Extend>(pageIndex, pageSize, out count, sql).ToList();
}
......@@ -170,6 +175,9 @@ where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Grade order by oc.Order
case 1: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,6)"; break;
}
}
else{
where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,5,6)";
}
string sql = $@"SELECT oc.OrderId,o.OrderNo,o.UserId,oc.Grade,oc.Type,oc.CommissionState,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission
FROM RB_Goods_OrderCommission oc
......@@ -188,7 +196,8 @@ where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Grade order by oc.Order
{
string sql = $@"SELECT SUM(Commission) as Commission FROM rb_goods_ordercommission oc
INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId
WHERE oc.UserId={userId} and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2";
left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
WHERE oc.UserId={userId} and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2 and oa.ReOrderId is null";
var obj = ExecuteScalar(sql);
if (obj != null) {
......@@ -197,6 +206,26 @@ INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId
return 0;
}
/// <summary>
/// 用户未结算返佣
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
public decimal GetUserOrderCommissionNoSettlement(int userId)
{
string sql = $@"SELECT SUM(Commission) as Commission FROM rb_goods_ordercommission oc
INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId
left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
WHERE oc.UserId={userId} and oc.CommissionState=1 and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2 and oa.ReOrderId is null";
var obj = ExecuteScalar(sql);
if (obj != null)
{
return Convert.ToDecimal(obj);
}
return 0;
}
/// <summary>
/// 订单返佣
/// </summary>
......
......@@ -528,7 +528,7 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.ParamIsNull("参数有误");
}
bool flag= orderModule.SetOrderOperation(OrderId, Type, Remark, Income, Address, req.TenantId, req.MallBaseId);
bool flag= orderModule.SetOrderOperation(omodel, Type, Remark, Income, Address, req.TenantId, req.MallBaseId);
if (flag)
{
return ApiResult.Success();
......
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