Skip to content

S
ShopERP
Commit be8dd901 by PC-20220610JUCQ\Administrator
Options

<develop>:(Web 端)<无> ShopERP 项目 WebAPI 接口代码提交。

parent 28339605
Showing with 41 additions and 215 deletions
CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs
...@@ -485,15 +485,6 @@ namespace CoreCms.Net.Model.Entities ...@@ -485,15 +485,6 @@ namespace CoreCms.Net.Model.Entities
public System.Boolean isdel { get; set; } public System.Boolean isdel { get; set; }
/// <summary>
/// 关联营销类型对象序列
/// </summary>
[Display(Name = "关联营销类型对象序列")]
[Required(ErrorMessage = "请输入{0}")]
public System.Int32 objectId { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
......
CoreCms.Net.Services/Order/CoreCmsOrderServices.cs
...@@ -198,8 +198,7 @@ namespace CoreCms.Net.Services ...@@ -198,8 +198,7 @@ namespace CoreCms.Net.Services
orderType = orderType, orderType = orderType,
point = point, point = point,
coupon = couponCode, coupon = couponCode,
receiptType = receiptType, receiptType = receiptType
objectId = objectId
}; };
//生成收货信息 //生成收货信息
...@@ -628,34 +627,21 @@ namespace CoreCms.Net.Services ...@@ -628,34 +627,21 @@ namespace CoreCms.Net.Services
public async Task<WebApiCallBack> GetOrderInfoByOrderId(string id, int userId = 0, int aftersaleLevel = 0) public async Task<WebApiCallBack> GetOrderInfoByOrderId(string id, int userId = 0, int aftersaleLevel = 0)
{ {
var jm = new WebApiCallBack(); var jm = new WebApiCallBack();
var order = new CoreCmsOrder(); var order = new CoreCmsOrder();
order = userId > 0
? await _dal.QueryByClauseAsync(p => p.orderId == id && p.userId == userId) try
: await _dal.QueryByClauseAsync(p => p.orderId == id); {
order = await _dal.QueryByClauseAsync(p => p.orderId == id);
if (order == null) if (order == null)
{ {
jm.msg = "获取订单失败"; jm.msg = "获取订单失败";
return jm; return jm;
} }
//订单详情(子货品数据) //订单详情(子货品数据)
order.items = await _orderItemServices.QueryListByClauseAsync(p => p.orderId == order.orderId); order.items = await _orderItemServices.QueryListByClauseAsync(p => p.orderId == order.orderId);
if (order.items.Any())
{
order.items.ForEach(p =>
{
if (!string.IsNullOrEmpty(p.promotionList))
{
var jobj = JObject.Parse(p.promotionList);
if (jobj.Values().Any())
{
p.promotionObj = jobj.Values().FirstOrDefault();
}
}
});
}
//获取相关状态描述说明转换 //获取相关状态描述说明转换
order.statusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderStatus>(order.status); order.statusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderStatus>(order.status);
order.payStatusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderPayStatus>(order.payStatus); order.payStatusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.OrderPayStatus>(order.payStatus);
...@@ -702,16 +688,6 @@ namespace CoreCms.Net.Services ...@@ -702,16 +688,6 @@ namespace CoreCms.Net.Services
item.logiName = outFirstAsync != null ? outFirstAsync.logiName : item.logiCode; item.logiName = outFirstAsync != null ? outFirstAsync.logiName : item.logiCode;
} }
} }
//获取提货门店
if (order.storeId != 0)
{
order.store = await _storeServices.QueryByIdAsync(order.storeId);
if (order.store != null)
{
var areaBack = await _areaServices.GetAreaFullName(order.store.areaId);
order.store.allAddress = areaBack.status ? areaBack.data + order.store.address : order.store.address;
}
}
//获取配送方式 //获取配送方式
if (order.logisticsId > 0) if (order.logisticsId > 0)
{ {
...@@ -729,11 +705,6 @@ namespace CoreCms.Net.Services ...@@ -729,11 +705,6 @@ namespace CoreCms.Net.Services
//获取支付方式 //获取支付方式
var pm = await _paymentsServices.QueryByClauseAsync(p => p.code == order.paymentCode); var pm = await _paymentsServices.QueryByClauseAsync(p => p.code == order.paymentCode);
order.paymentName = pm != null ? pm.name : "未知支付方式"; order.paymentName = pm != null ? pm.name : "未知支付方式";
//优惠券
//if (!string.IsNullOrEmpty(order.coupon))
//{
// order.couponObj = await _couponServices.QueryWithAboutAsync(p => p.usedId == order.orderId);
//}
order.couponObj = await _couponServices.QueryWithAboutAsync(p => p.usedId == order.orderId); order.couponObj = await _couponServices.QueryWithAboutAsync(p => p.usedId == order.orderId);
var allConfigs = await _settingServices.GetConfigDictionaries(); var allConfigs = await _settingServices.GetConfigDictionaries();
...@@ -834,6 +805,7 @@ namespace CoreCms.Net.Services ...@@ -834,6 +805,7 @@ namespace CoreCms.Net.Services
item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.BillReshipStatus>(item.status); item.statusName = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.BillReshipStatus>(item.status);
} }
} }
//售后单取当前活动的收货单 //售后单取当前活动的收货单
if (order.aftersalesItem != null && order.aftersalesItem.Any()) if (order.aftersalesItem != null && order.aftersalesItem.Any())
{ {
...@@ -844,34 +816,19 @@ namespace CoreCms.Net.Services ...@@ -844,34 +816,19 @@ namespace CoreCms.Net.Services
if (item.status == (int)GlobalEnumVars.BillAftersalesStatus.WaitAudit) break; if (item.status == (int)GlobalEnumVars.BillAftersalesStatus.WaitAudit) break;
} }
} }
//把退款金额和退货商品查出来 //把退款金额和退货商品查出来
AfterSalesVal(order, aftersaleLevel); AfterSalesVal(order, aftersaleLevel);
//促销信息
if (!string.IsNullOrEmpty(order.promotionList))
{
order.promotionObj = JsonConvert.DeserializeObject(order.promotionList);
}
//发票信息
var invoiceModel = await _invoiceServices.GetOrderInvoiceInfo(order.orderId);
if (invoiceModel != null && invoiceModel.status)
{
order.invoice = invoiceModel.data;
}
else
{
order.invoice = new
{
type = order.taxType,
title = order.taxTitle,
taxNumber = order.taxCode
};
}
jm.status = true; jm.status = true;
jm.data = order; jm.data = order;
jm.msg = GlobalConstVars.GetDataSuccess; jm.msg = GlobalConstVars.GetDataSuccess;
}
catch (Exception ex)
{
jm.msg = ex.Message;
Console.WriteLine(ex.Message);
}
return jm; return jm;
} }
......
CoreCms.Net.Web.Admin/Controllers/Order/CoreCmsOrderController.cs
...@@ -53,8 +53,7 @@ namespace CoreCms.Net.Web.Admin.Controllers ...@@ -53,8 +53,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
private readonly ICoreCmsOrderItemServices _orderItemServices; private readonly ICoreCmsOrderItemServices _orderItemServices;
#region 构造函数
/// <summary> /// <summary>
/// 构造函数 /// 构造函数
///</summary> ///</summary>
...@@ -83,6 +82,7 @@ namespace CoreCms.Net.Web.Admin.Controllers ...@@ -83,6 +82,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
_billDeliveryServices = billDeliveryServices; _billDeliveryServices = billDeliveryServices;
_orderItemServices = orderItemServices; _orderItemServices = orderItemServices;
} }
#endregion
#region 获取列表============================================================ #region 获取列表============================================================
// POST: Api/CoreCmsOrder/GetPageList // POST: Api/CoreCmsOrder/GetPageList
......
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
...@@ -105,24 +105,6 @@ ...@@ -105,24 +105,6 @@
<div class="layui-input-inline layui-inline-3 layui-form-mid">￥{{d.params.data.payedAmount}}元</div> <div class="layui-input-inline layui-inline-3 layui-form-mid">￥{{d.params.data.payedAmount}}元</div>
</div> </div>
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
<legend style="font-size:14px;">发票信息</legend>
</fieldset>
<div class="layui-form-item">
<label class="layui-form-label">发票类型</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">{{d.params.data.taxTypeText}}</div>
<label class="layui-form-label">发票内容</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">
{{# if (d.params.data.invoice.type != 1) { }}商品明细{{# } else{ }} 无 {{# } }}
</div>
<label class="layui-form-label">税号</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">{{d.params.data.invoice.taxNumber||'无'}}</div>
<label class="layui-form-label">发票抬头</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">{{d.params.data.invoice.title||'无'}}</div>
</div>
<!--收货人信息--> <!--收货人信息-->
{{# if (d.params.data.store) { }} {{# if (d.params.data.store) { }}
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;"> <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
...@@ -183,26 +165,7 @@ ...@@ -183,26 +165,7 @@
<label class="layui-form-label">买家备注</label> <label class="layui-form-label">买家备注</label>
<div class="layui-input-inline layui-form-mid layui-inline-10">{{d.params.data.memo||'无'}}</div> <div class="layui-input-inline layui-form-mid layui-inline-10">{{d.params.data.memo||'无'}}</div>
</div> </div>
<!--下单用户-->
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
<legend style="font-size:14px;">下单用户</legend>
</fieldset>
<div class="layui-form-item">
<label class="layui-form-label">用户编号</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">
{{d.params.data.user.id}}
</div>
<label class="layui-form-label">用户手机</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">
{{d.params.data.user.mobile}}
</div><label class="layui-form-label">用户昵称</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">
{{d.params.data.user.nickName}}
</div><label class="layui-form-label">微信编号</label>
<div class="layui-input-inline layui-inline-3 layui-form-mid">
{{d.params.data.user.userWx}}
</div>
</div>
</div> </div>
<!--商品详情--> <!--商品详情-->
......
CoreCms.Net.Web.Admin/wwwroot/views/order/orders/index.html
...@@ -280,11 +280,7 @@ ...@@ -280,11 +280,7 @@
cols: [ cols: [
[ [
{ type: 'checkbox' }, { type: 'checkbox' },
{
field: 'operating', title: '操作', width: 90, align: 'center', templet: function (data) {
return data.operating;
}
},
{ {
field: 'orderId', field: 'orderId',
title: '订单号', title: '订单号',
...@@ -299,14 +295,9 @@ ...@@ -299,14 +295,9 @@
} }
}, },
{ field: 'orderAmount', title: '订单总额', width: 100, align: 'center', templet: '#orderAmount', totalRow: true }, { field: 'orderAmount', title: '订单总额', width: 100, align: 'center', templet: '#orderAmount', totalRow: true },
{ field: 'item', title: '货品', align: 'center', width: 330, templet: "#orderItems" },
{ {
field: 'item', title: '货品', align: 'center', width: 330, templet: "#orderItems" field: 'orderAmount', title: '类型', width: 60, align: 'center',
},
{
field: 'orderAmount',
title: '类型',
width: 60,
align: 'center',
templet: function (data) { templet: function (data) {
for (var i = 0; i < d.data.orderType.length; i++) { for (var i = 0; i < d.data.orderType.length; i++) {
if (data.orderType == d.data.orderType[i].value) { if (data.orderType == d.data.orderType[i].value) {
...@@ -316,26 +307,10 @@ ...@@ -316,26 +307,10 @@
return ""; return "";
} }
}, },
{
field: 'orderId',
title: '打印',
align: 'center',
width: 80,
templet: function (data) {
var html = '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="shoppingPrint" data-id="' + data.orderId + '" class="cursor">购物单</a><br>';
html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="distributionPrint" data-id="' + data.orderId + '" class="cursor">配送单</a><br>';
html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="unionPrint" data-id="' + data.orderId + '" class="cursor">联合单</a><br>';
return html;
}
},
{ field: 'createTime', title: '下单时间/支付时间', width: 150, align: 'center', templet: '#orderTime' }, { field: 'createTime', title: '下单时间/支付时间', width: 150, align: 'center', templet: '#orderTime' },
//{ field: 'paymentTime', title: '付款时间', width: 130, align: 'center' }, { field: 'paymentTime', title: '付款时间', width: 130, align: 'center' },
//{ field: 'paymentTime', title: '付款时间', width: 130, align: 'center' },
{ {
field: 'StatusText', field: 'StatusText',title: '订单状态',width: 80, align: 'center',
title: '订单状态',
width: 80,
align: 'center',
templet: function (data) { templet: function (data) {
var html = ''; var html = '';
for (var i = 0; i < d.data.orderStatus.length; i++) { for (var i = 0; i < d.data.orderStatus.length; i++) {
...@@ -349,39 +324,19 @@ ...@@ -349,39 +324,19 @@
return html; return html;
} }
}, },
//{
// field: 'payStatus',
// title: '支付状态',
// width: 65,
// align: 'center',
// templet: function (data) {
// for (var i = 0; i < d.data.payStatus.length; i++) {
// if (data.payStatus == d.data.payStatus[i].value) {
// return d.data.payStatus[i].description;
// }
// }
// return "";
// }
//},
{ {
field: 'paymentCode', field: 'payStatus',title: '支付状态',width: 65,align: 'center',
title: '支付方式',
width: 65,
align: 'center',
templet: function (data) { templet: function (data) {
for (var i = 0; i < d.data.paymentCode.length; i++) { for (var i = 0; i < d.data.payStatus.length; i++) {
if (data.paymentCode == d.data.paymentCode[i].title) { if (data.payStatus == d.data.payStatus[i].value) {
return d.data.paymentCode[i].description; return d.data.payStatus[i].description;
} }
} }
return ""; return "";
} }
}, },
{ {
field: 'shipStatus', field: 'shipStatus',title: '发货状态',width: 65,align: 'center',
title: '发货状态',
width: 65,
align: 'center',
templet: function (data) { templet: function (data) {
for (var i = 0; i < d.data.shipStatus.length; i++) { for (var i = 0; i < d.data.shipStatus.length; i++) {
if (data.shipStatus == d.data.shipStatus[i].value) { if (data.shipStatus == d.data.shipStatus[i].value) {
...@@ -390,68 +345,28 @@ ...@@ -390,68 +345,28 @@
} }
return ""; return "";
} }
}, {
field: 'confirmStatus',
title: '收货状态',
width: 80,
align: 'center',
templet: function (data) {
for (var i = 0; i < d.data.confirmStatus.length; i++) {
if (data.confirmStatus == d.data.confirmStatus[i].value) {
return d.data.confirmStatus[i].description;
}
}
return "";
}
}, },
{ {
field: 'storeId', field: 'afterSaleStatus', title: '售后状态', width: 75, align: 'center', templet: function (data)
title: '订单属性', {
width: 80, return '<a style="color:red">' + data.afterSaleStatus + '</a>';
align: 'center',
templet: function (data) {
for (var i = 0; i < d.data.receiptType.length; i++) {
if (data.receiptType == d.data.receiptType[i].value) {
return d.data.receiptType[i].description;
}
}
return "";
} }
}, },
{ field: 'shipMobile', title: '地址', align: 'left', templet: "#orderShip" },
{ {
field: 'afterSaleStatus', field: 'orderId', title: '打印', align: 'center', width: 100,
title: '售后状态',
width: 75,
align: 'center',
templet: function (data) { templet: function (data) {
return '<a style="color:red">' + data.afterSaleStatus + '</a>'; var html = '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="shoppingPrint" data-id="' + data.orderId + '" class="cursor">购物单</a><br>';
html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="distributionPrint" data-id="' + data.orderId + '" class="cursor">配送单</a><br>';
html += '<a class="layui-btn layui-btn-primary layui-btn-xs" lay-active="unionPrint" data-id="' + data.orderId + '" class="cursor">联合单</a><br>';
return html;
} }
}, },
{ {
field: 'shipMobile', title: '地址', align: 'left', templet: "#orderShip" field: 'operating', title: '操作', width: 120, align: 'center', templet: function (data) {
}, return data.operating;
//{ }
// field: 'userNickName', }
// title: '来源',
// width: 120,
// align: 'left',
//},
//{
// field: 'source', title:
// '订单来源', width:
// 80, align:
// 'center', templet:
// function (data) {
// for (var i = 0; i < d.data.source.length; i++) {
// if (data.source == d.data.source[i].value) {
// return d.data.source[i].description;
// }
// }
// return "";
// }
//}
] ]
] ]
}); });
......
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