Skip to content

M
mall.oytour.com
Commit 9d3d507a authored by liudong1993's avatar liudong1993
Browse files
Options

小程序订单+售后订单基础

parent 7409b012
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1673 additions and 286 deletions
Mall.Model/Entity/Product/RB_Goods_Order.cs
View file @ 9d3d507a
......@@ -178,7 +178,7 @@ namespace Mall.Model.Entity.Product
/// <summary>
/// 收货地址
/// </summary>
public string ShippingAddress
public string ShoppingAddress
{
get;
set;
......
Mall.Model/Entity/Product/RB_Goods_OrderAfterSale.cs 0 → 100644
View file @ 9d3d507a
using Mall.Common.AOP;
using Mall.Common.Enum.User;
using System;
using System.Collections.Generic;
using System.Text;
namespace Mall.Model.Entity.Product
{
/// <summary>
/// 商品订单售后表实体
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Goods_OrderAfterSale
{
/// <summary>
/// ReOrderId
/// </summary>
public int ReOrderId
{
get;
set;
}
/// <summary>
/// 用户id
/// </summary>
public int? UserId
{
get;
set;
}
/// <summary>
/// 订单id
/// </summary>
public int? OrderId
{
get;
set;
}
/// <summary>
/// 订单明细id
/// </summary>
public int? OrderDetialId
{
get;
set;
}
/// <summary>
/// 售后订单号
/// </summary>
public string ReOrderNo
{
get;
set;
}
/// <summary>
/// 类型 1退货退款 2换货
/// </summary>
public int? Type
{
get;
set;
}
/// <summary>
/// 原因
/// </summary>
public string Remark
{
get;
set;
}
/// <summary>
/// 退货数量
/// </summary>
public int? ReNumber { get; set; }
/// <summary>
/// 客人付款金额
/// </summary>
public decimal? Income { get; set; }
/// <summary>
/// 退款金额
/// </summary>
public decimal? Refund
{
get;
set;
}
/// <summary>
/// 实际退款金额
/// </summary>
public decimal? RefundActual { get; set; }
/// <summary>
/// 凭证图片 json格式
/// </summary>
public string Voucher
{
get;
set;
}
/// <summary>
/// 售后状态 1待审核 2待买家发货 3已发货待商家处理（待卖家收货） 4待卖家退款 5已完成 6已拒绝
/// </summary>
public int? ReOrderStatus
{
get;
set;
}
/// <summary>
/// 商家收货地址id
/// </summary>
public int? DeliveryId
{
get;
set;
}
/// <summary>
/// 客人退货物流id
/// </summary>
public int? ReExpressId
{
get;
set;
}
/// <summary>
/// 客人退货快递单号
/// </summary>
public string ReExpressNumber
{
get;
set;
}
/// <summary>
/// 同意/拒绝时间
/// </summary>
public DateTime? AuditTime
{
get;
set;
}
/// <summary>
/// 完成时间
/// </summary>
public DateTime? FinishTime
{
get;
set;
}
/// <summary>
/// 删除状态
/// </summary>
public int? Status
{
get;
set;
}
/// <summary>
/// 商户号
/// </summary>
public int TenantId
{
get;
set;
}
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId
{
get;
set;
}
/// <summary>
/// CreateDate
/// </summary>
public DateTime? CreateDate
{
get;
set;
}
}
}
Mall.Model/Entity/Product/RB_Goods_OrderAfterSaleLog.cs 0 → 100644
View file @ 9d3d507a
using Mall.Common.AOP;
using Mall.Common.Enum.User;
using System;
using System.Collections.Generic;
using System.Text;
namespace Mall.Model.Entity.Product
{
/// <summary>
/// 商品订单售后操作流程表实体
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Goods_OrderAfterSaleLog
{
/// <summary>
/// Id
/// </summary>
public int Id
{
get;
set;
}
/// <summary>
/// 售后订单id
/// </summary>
public int? ReOrderId
{
get;
set;
}
/// <summary>
/// 类型 1买家 2卖家
/// </summary>
public int? Type
{
get;
set;
}
/// <summary>
/// 内容
/// </summary>
public string Content
{
get;
set;
}
/// <summary>
/// 商户号
/// </summary>
public int TenantId
{
get;
set;
}
/// <summary>
/// 小程序id
/// </summary>
public int MallBaseId
{
get;
set;
}
/// <summary>
/// CreateDate
/// </summary>
public DateTime? CreateDate
{
get;
set;
}
}
}
Mall.Model/Entity/Product/RB_Goods_OrderExpress.cs
View file @ 9d3d507a
......@@ -94,5 +94,9 @@ namespace Mall.Model.Entity.Product
get;
set;
}
/// <summary>
/// 换货时 售后订单id
/// </summary>
public int? AfterSaleOrderId { get; set; }
}
}
Mall.Model/Extend/Product/RB_Goods_OrderAfterSaleLog_Extend.cs 0 → 100644
View file @ 9d3d507a
using Mall.Common.AOP;
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.Product;
namespace Mall.Model.Extend.Product
{
/// <summary>
/// 商品订单售后流程表扩展实体
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Goods_OrderAfterSaleLog_Extend : RB_Goods_OrderAfterSaleLog
{
}
}
Mall.Model/Extend/Product/RB_Goods_OrderAfterSale_Extend.cs 0 → 100644
View file @ 9d3d507a
using Mall.Common.AOP;
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.Product;
namespace Mall.Model.Extend.Product
{
/// <summary>
/// 商品订单售后表扩展实体
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_Goods_OrderAfterSale_Extend : RB_Goods_OrderAfterSale
{
/// <summary>
/// 订单号
/// </summary>
public string OrderNo { get; set; }
/// <summary>
/// 用户名
/// </summary>
public string UserName { get; set; }
/// <summary>
/// 商品名称
/// </summary>
public string GoodsName { get; set; }
/// <summary>
/// 收件人
/// </summary>
public string Consignee { get; set; }
/// <summary>
/// 收件人电话
/// </summary>
public string Mobile { get; set; }
/// <summary>
/// 用户平台
/// </summary>
public int OrderSource { get; set; }
/// <summary>
/// 开始时间
/// </summary>
public string StartTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
public string EndTime { get; set; }
}
}
Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs
View file @ 9d3d507a
......@@ -13,8 +13,15 @@ namespace Mall.Model.Extend.Product
[DB(ConnectionName = "DefaultConnection")]
public class RB_Goods_Order_Extend : RB_Goods_Order
{
/// <summary>
/// 是否来自购物车 1是 2否
/// </summary>
public int? IsFormShoppingCart { get; set; }
/// <summary>
/// 购物车ids
/// </summary>
public List<int> ShoppingCartIdList { get; set; }
/// <summary>
/// 收货地址id
/// </summary>
public int? ShoppingAddressId { get; set; }
......@@ -57,6 +64,10 @@ namespace Mall.Model.Extend.Product
/// </summary>
public int? OrderType { get; set; }
/// <summary>
/// 多个状态查询
/// </summary>
public string OrderStatusIds { get; set; }
/// <summary>
/// 明细列表
/// </summary>
public List<RB_Goods_OrderDetail_Extend> DetailList { get; set; }
......
Mall.Module.Product/OrderModule.cs
View file @ 9d3d507a
This diff is collapsed.
Mall.Repository/Product/RB_Goods_OrderAfterSaleLogRepository.cs 0 → 100644
View file @ 9d3d507a
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.Product;
using Mall.Model.Extend.Product;
using System.Linq;
using Mall.Model.Entity.User;
namespace Mall.Repository.Product
{
/// <summary>
/// 商品订单售后流程仓储层
/// </summary>
public class RB_Goods_OrderAfterSaleLogRepository : RepositoryBase<RB_Goods_OrderAfterSaleLog>
{
/// <summary>
/// 获取列表
/// </summary>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Goods_OrderAfterSaleLog_Extend> GetList(RB_Goods_OrderAfterSaleLog_Extend dmodel)
{
string where = $" 1=1 ";
if (dmodel.TenantId > 0)
{
where += $@" and {nameof(RB_Goods_OrderAfterSaleLog.TenantId)}={dmodel.TenantId}";
}
if (dmodel.MallBaseId > 0)
{
where += $@" and {nameof(RB_Goods_OrderAfterSaleLog.MallBaseId)}={dmodel.MallBaseId}";
}
if (dmodel.Type > 0)
{
where += $@" and {nameof(RB_Goods_OrderAfterSaleLog.Type)}={dmodel.Type}";
}
if (dmodel.ReOrderId > 0)
{
where += $@" and {nameof(RB_Goods_OrderAfterSaleLog.ReOrderId)}={dmodel.ReOrderId}";
}
string sql = $@"SELECT * FROM RB_Goods_OrderAfterSaleLog where {where} order by Id desc";
return Get<RB_Goods_OrderAfterSaleLog_Extend>(sql).ToList();
}
}
}
Mall.Repository/Product/RB_Goods_OrderAfterSaleRepository.cs 0 → 100644
View file @ 9d3d507a
using System;
using System.Collections.Generic;
using System.Text;
using Mall.Model.Entity.Product;
using Mall.Model.Extend.Product;
using System.Linq;
using Mall.Model.Entity.User;
namespace Mall.Repository.Product
{
/// <summary>
/// 商品订单售后仓储层
/// </summary>
public class RB_Goods_OrderAfterSaleRepository : RepositoryBase<RB_Goods_OrderAfterSale>
{
/// <summary>
/// 获取售后订单分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Goods_OrderAfterSale_Extend> GetERPPageList(int pageIndex, int pageSize, out long count, RB_Goods_OrderAfterSale_Extend dmodel) {
string where = $" 1=1 and oas.{nameof(RB_Goods_OrderAfterSale.Status)}=0";
if (dmodel.TenantId > 0) {
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.TenantId)}={dmodel.TenantId}";
}
if (dmodel.MallBaseId > 0)
{
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.MallBaseId)}={dmodel.MallBaseId}";
}
if (dmodel.UserId > 0)
{
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.UserId)}={dmodel.UserId}";
}
if (!string.IsNullOrEmpty(dmodel.UserName)) {
where += $" and mu.{nameof(RB_Member_User.Name)} like '%{dmodel.UserName}%'";
}
if (dmodel.OrderId > 0) {
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.OrderId)}={dmodel.OrderId}";
}
if (!string.IsNullOrEmpty(dmodel.ReOrderNo)) {
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.ReOrderNo)} like '%{dmodel.ReOrderNo}%'";
}
if (!string.IsNullOrEmpty(dmodel.OrderNo)) {
where += $" and o.{nameof(RB_Goods_Order.OrderNo)} like '%{dmodel.OrderNo}%'";
}
if (!string.IsNullOrEmpty(dmodel.Consignee))
{
where += $" and o.{nameof(RB_Goods_Order.Consignee)} like '%{dmodel.Consignee}%'";
}
if (!string.IsNullOrEmpty(dmodel.Mobile))
{
where += $" and o.{nameof(RB_Goods_Order.Mobile)} like '%{dmodel.Mobile}%'";
}
if (!string.IsNullOrEmpty(dmodel.GoodsName)) {
where += $" and od.{nameof(RB_Goods_OrderDetail.GoodsName)} like '%{dmodel.GoodsName}%'";
}
if (!string.IsNullOrEmpty(dmodel.StartTime)) {
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.CreateDate)} >='{dmodel.StartTime}'";
}
if (!string.IsNullOrEmpty(dmodel.EndTime)) {
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.CreateDate)} <='{dmodel.EndTime} 23:59:59'";
}
string sql = $@"SELECT oas.*,mu.Name as UserName FROM rb_goods_orderaftersale oas
INNER JOIN rb_goods_order o on oas.OrderId=o.OrderId
INNER JOIN rb_goods_orderdetail od on od.Id=oas.OrderDetialId
INNER JOIN rb_member_user mu on mu.Id=oas.UserId
{where} order by Id desc";
return GetPage<RB_Goods_OrderAfterSale_Extend>(pageIndex, pageSize, out count, sql).ToList();
}
/// <summary>
/// 获取售后订单分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="count"></param>
/// <param name="dmodel"></param>
/// <returns></returns>
public List<RB_Goods_OrderAfterSale_Extend> GetAppletPageList(int pageIndex, int pageSize, out long count, RB_Goods_OrderAfterSale_Extend dmodel)
{
string where = $" 1=1 and oas.{nameof(RB_Goods_OrderAfterSale.Status)}=0";
if (dmodel.TenantId > 0)
{
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.TenantId)}={dmodel.TenantId}";
}
if (dmodel.MallBaseId > 0)
{
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.MallBaseId)}={dmodel.MallBaseId}";
}
if (dmodel.UserId > 0)
{
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.UserId)}={dmodel.UserId}";
}
if (dmodel.OrderId > 0)
{
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.OrderId)}={dmodel.OrderId}";
}
if (!string.IsNullOrEmpty(dmodel.ReOrderNo))
{
where += $" and oas.{nameof(RB_Goods_OrderAfterSale.ReOrderNo)} like '%{dmodel.ReOrderNo}%'";
}
string sql = $@"SELECT oas.* FROM rb_goods_orderaftersale oas {where} order by Id desc";
return GetPage<RB_Goods_OrderAfterSale_Extend>(pageIndex, pageSize, out count, sql).ToList();
}
}
}
Mall.Repository/Product/RB_Goods_OrderRepository.cs
View file @ 9d3d507a
......@@ -63,6 +63,10 @@ namespace Mall.Repository.Product
{
where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)dmodel.OrderStatus}";
}
if (!string.IsNullOrEmpty(dmodel.OrderStatusIds))
{
where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in({dmodel.OrderStatusIds})";
}
if (!string.IsNullOrEmpty(dmodel.OrderNo))
{
where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} like '%{dmodel.OrderNo}%'";
......
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @ 9d3d507a
......@@ -135,7 +135,7 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.ParamIsNull("");
}
bool flag = orderModule.DelGoodsShoppingCartInfo(ShoppingCartIds, userInfo.TenantId, userInfo.MallBaseId);
bool flag = orderModule.DelGoodsShoppingCartInfo(ShoppingCartIds, userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
if (flag)
{
return ApiResult.Success();
......@@ -150,6 +150,133 @@ namespace Mall.WebApi.Controllers.MallBase
#region 订单管理
/// <summary>
/// 我的订单分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetAppletGoodsMyOrderPageList()
{
var parms = RequestParm;
var userInfo = AppletUserInfo;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(parms.msg.ToString());
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
demodel.UserId = userInfo.UserId;
demodel.Recycled = 1;
if (demodel.OrderStatus == Common.Enum.Goods.OrderStatusEnum.WaitSendGoods) {
demodel.OrderStatusIds = "2,6";//待处理也是待发货状态才有的
demodel.OrderStatus = 0;
}
var list = orderModule.GetAppletGoodsMyOrderPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list.Select(x => new
{
x.OrderId,
x.OrderNo,
x.DeliveryMethod,
DeliveryMethodName = x.DeliveryMethod.GetEnumName(),
x.Income,
x.FreightMoney,
x.CouponMoney,
x.PaymentWay,
PaymentWayName = x.PaymentWay.GetEnumName(),
DetailList = x.DetailList.Select(y => new {
y.Id,
y.CoverImagePath,
y.OrderType,
OrderTypeName = y.OrderType.GetEnumName(),
y.GoodsName,
y.Specification,
y.ProductCode,
y.Final_Price,
y.Number
}),
x.OrderStatus,
OrderStatusName = x.OrderStatus.GetEnumName(),
x.TenantId,
x.MallBaseId,
CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
});
return ApiResult.Success("", pagelist);
}
/// <summary>
/// 获取我的订单详情
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetAppletMyOrderInfo() {
var req = RequestParm;
var userInfo = AppletUserInfo;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
if (OrderId <= 0)
{
return ApiResult.ParamIsNull();
}
return orderModule.GetAppletMyOrderInfo(OrderId, userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
}
/// <summary>
/// 获取我的订单商品售后初始信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetAppletMyOrderAfterSaleInfo()
{
var req = RequestParm;
var userInfo = AppletUserInfo;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderDetailId = parms.GetInt("OrderDetailId", 0);
if (OrderDetailId <= 0)
{
return ApiResult.ParamIsNull();
}
return orderModule.GetAppletMyOrderAfterSaleInfo(OrderDetailId, userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
}
/// <summary>
/// 申请售后
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetAppletMyOrderAfterSale() {
var req = RequestParm;
var userInfo = AppletUserInfo;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderDetailId = parms.GetInt("OrderDetailId", 0);
if (OrderDetailId <= 0)
{
return ApiResult.ParamIsNull();
}
return ApiResult.Success();
}
/// <summary>
/// 获取我的订单快递信息
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetAppletMyOrderExpressInfo() {
var req = RequestParm;
var userInfo = AppletUserInfo;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
if (OrderId <= 0)
{
return ApiResult.ParamIsNull();
}
var Robj = orderModule.GetAppletMyOrderExpressInfo(OrderId, userInfo.TenantId, userInfo.MallBaseId);
return ApiResult.Success("", Robj);
}
/// <summary>
/// 结算页面详情
/// </summary>
......@@ -224,6 +351,11 @@ namespace Mall.WebApi.Controllers.MallBase
var req = RequestParm;
var userInfo = AppletUserInfo;
RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(req.msg.ToString());
if (demodel.IsFormShoppingCart == 1) {
if (demodel.ShoppingCartIdList == null || !demodel.ShoppingCartIdList.Any()) {
return ApiResult.ParamIsNull("请传递购物车id");
}
}
if (string.IsNullOrEmpty(demodel.Consignee)) {
return ApiResult.ParamIsNull("请传递收件人");
}
......@@ -236,18 +368,11 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.ParamIsNull("收货地址有误");
}
if (string.IsNullOrEmpty(demodel.ShippingAddress)) {
if (string.IsNullOrEmpty(demodel.ShoppingAddress)) {
return ApiResult.ParamIsNull("收货详细地址不能为空");
}
}
else {
if (string.IsNullOrEmpty(demodel.Consignee)) {
return ApiResult.ParamIsNull("收件人不能为空");
}
if (string.IsNullOrEmpty(demodel.Mobile)) {
return ApiResult.ParamIsNull("收件人手机不能为空");
}
}
if (demodel.DetailList == null || !demodel.DetailList.Any()) {
return ApiResult.ParamIsNull("请传递商品信息");
}
......@@ -268,6 +393,7 @@ namespace Mall.WebApi.Controllers.MallBase
#region 赋默认值
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
demodel.Country ??= 2;
demodel.OrderStatus = Common.Enum.Goods.OrderStatusEnum.NonPayment;
demodel.CreateDate = DateTime.Now;
demodel.Fee ??= 0;
......@@ -286,6 +412,31 @@ namespace Mall.WebApi.Controllers.MallBase
return orderModule.SetAppletGoodsOrderInfo(demodel);
}
/// <summary>
/// 未付款取消订单/已付款申请取消订单
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult CancelAppletGoodsOrderInfo() {
var req = RequestParm;
var userInfo = AppletUserInfo;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
int Type = parms.GetInt("Type", 1);//1未付款取消 2已付款未发货申请取消
string Remark = parms.GetStringValue("Remark");//type=2 申请备注
if (OrderId <= 0) {
return ApiResult.ParamIsNull();
}
if (Type == 2) {
if (string.IsNullOrEmpty(Remark)) {
return ApiResult.ParamIsNull("请输入取消申请备注");
}
}
bool flag = orderModule.CancelAppletGoodsOrderInfo(OrderId, Type, Remark, userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
if (flag) { return ApiResult.Success(); } else { return ApiResult.Failed(); }
}
#endregion
}
}
\ No newline at end of file
Mall.WebApi/Controllers/Product/OrderController.cs
View file @ 9d3d507a
......@@ -76,7 +76,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.Consignee,
x.Mobile,
x.DistrictAddress,
x.ShippingAddress,
x.ShoppingAddress,
x.BuyerMessage,
x.Remark,
x.OrderStatus,
......@@ -184,7 +184,7 @@ namespace Mall.WebApi.Controllers.MallBase
case 11:
datarow.ExcelRows.Add(new ExcelColumn(value: item.Mobile) { }); break;
case 12:
datarow.ExcelRows.Add(new ExcelColumn(value: item.ShippingAddress) { }); break;
datarow.ExcelRows.Add(new ExcelColumn(value: item.ShoppingAddress) { }); break;
case 13:
datarow.ExcelRows.Add(new ExcelColumn(value: (item.PreferPrice ?? 0).ToString()) { }); break;
case 14:
......@@ -521,6 +521,69 @@ namespace Mall.WebApi.Controllers.MallBase
}
}
/// <summary>
/// 修改订单明细价格
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderDetialMoneyInfo() {
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderDetailId = parms.GetInt("OrderDetailId", 0);
decimal Income = parms.GetDecimal("Income");
if (OrderDetailId <= 0) {
return ApiResult.ParamIsNull("请传递订单明细id");
}
if (Income <= 0) {
return ApiResult.ParamIsNull("请传递价格");
}
bool flag = orderModule.SetOrderDetialMoneyInfo(OrderDetailId, Income, req.TenantId, req.MallBaseId);
if (flag)
{
return ApiResult.Success();
}
else {
return ApiResult.Failed();
}
}
/// <summary>
/// 修改订单价格/运费
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderMoneyOrFreightInfo()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
decimal Income = parms.GetDecimal("Income");
decimal FreightMoney = parms.GetDecimal("FreightMoney");
if (OrderId <= 0)
{
return ApiResult.ParamIsNull("请传递订单明细id");
}
if (Income <= 0)
{
return ApiResult.ParamIsNull("请传递价格");
}
if (FreightMoney < 0)
{
return ApiResult.ParamIsNull("请传递运费");
}
bool flag = orderModule.SetOrderMoneyOrFreightInfo(OrderId, Income, FreightMoney, req.TenantId, req.MallBaseId);
if (flag)
{
return ApiResult.Success();
}
else
{
return ApiResult.Failed();
}
}
/// <summary>
/// 设置订单收货地址
/// </summary>
......@@ -542,7 +605,7 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.ParamIsNull("请选择区域");
}
if (string.IsNullOrEmpty(demodel.ShippingAddress)) {
if (string.IsNullOrEmpty(demodel.ShoppingAddress)) {
return ApiResult.ParamIsNull("请输入详细地址");
}
......@@ -803,7 +866,7 @@ namespace Mall.WebApi.Controllers.MallBase
}),
x.Consignee,
x.Mobile,
x.ShippingAddress,
x.ShoppingAddress,
x.BuyerMessage,
x.Remark,
x.OrderStatus,
......@@ -938,7 +1001,7 @@ namespace Mall.WebApi.Controllers.MallBase
case 11:
datarow.ExcelRows.Add(new ExcelColumn(value: item.Mobile) { }); break;
case 12:
datarow.ExcelRows.Add(new ExcelColumn(value: item.ShippingAddress) { }); break;
datarow.ExcelRows.Add(new ExcelColumn(value: item.ShoppingAddress) { }); break;
case 13:
datarow.ExcelRows.Add(new ExcelColumn(value: (item.PreferPrice ?? 0).ToString()) { }); break;
case 14:
......
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