Skip to content

M
mall.oytour.com
Commit 6644977d authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents d12e8a0b 285a9eb0
Show whitespace changes
Inline Side-by-side
Showing with 239 additions and 117 deletions
Mall.Common/Config.cs
View file @ 6644977d
......@@ -417,6 +417,15 @@ namespace Mall.Common
}
}
/// <summary>
/// 微信支付结算率0.60%
/// </summary>
public static string SettlementRate
{
get
{
return new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("SettlementRate").Value;
}
}
}
}
\ No newline at end of file
Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs
View file @ 6644977d
......@@ -261,7 +261,7 @@ namespace Mall.Module.MarketingCenter
height = subItem["height"].ToString(),
left = subItem["left"].ToString(),
top = subItem["top"].ToString(),
pic_url = subItem["pic_url"].ToString(),
pic_url = Common.Config.GetFileUrl(subItem["pic_url"].ToString()) ,
backgroundImage = subItem["backgroundImage"].ToString(),
backgroundRepeat = subItem["backgroundRepeat"].ToString(),
backgroundSize = subItem["backgroundSize"].ToString(),
......
Mall.Module.Product/OrderModule.cs
View file @ 6644977d
......@@ -6445,7 +6445,7 @@ namespace Mall.Module.Product
return false;
}
Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
{ nameof(RB_Goods_OrderDetail.FreightMoney),freightMoney }
{ nameof(RB_Goods_OrderDetail.FreightCostMoney),freightMoney }
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
......
Mall.WebApi/Controllers/Product/OrderController.cs
View file @ 6644977d
......@@ -51,7 +51,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetGoodsOrderPageList() {
public ApiResult GetGoodsOrderPageList()
{
var parms = RequestParm;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(parms.msg.ToString());
......@@ -66,22 +67,23 @@ namespace Mall.WebApi.Controllers.MallBase
x.OrderNo,
x.MerchantsNo,
x.OrderSource,
OrderSourceName= x.OrderSource.GetEnumName(),
OrderSourceName = x.OrderSource.GetEnumName(),
x.UserId,
x.UserName,
x.DeliveryMethod,
DeliveryMethodName= x.DeliveryMethod.GetEnumName(),
DeliveryMethodName = x.DeliveryMethod.GetEnumName(),
x.Income,
x.FreightMoney,
x.CouponMoney,
x.PaymentWay,
PaymentWayName= x.PaymentWay.GetEnumName(),
DetailList= x.DetailList.Select(y=>new {
PaymentWayName = x.PaymentWay.GetEnumName(),
DetailList = x.DetailList.Select(y => new
{
y.Id,
y.CoverImage,
y.CoverImagePath,
y.OrderType,
OrderTypeName= y.OrderType.GetEnumName(),
OrderTypeName = y.OrderType.GetEnumName(),
y.GoodsName,
SpecificationList = JsonConvert.DeserializeObject<List<string>>(y.Specification),
y.ProductCode,
......@@ -96,7 +98,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.BuyerMessage,
x.Remark,
x.OrderStatus,
OrderStatusName= x.OrderStatus.GetEnumName(),
OrderStatusName = x.OrderStatus.GetEnumName(),
PaymentTime = x.PaymentTime.HasValue ? x.PaymentTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
DeliveryTime = x.DeliveryTime.HasValue ? x.DeliveryTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
ReceivingTime = x.ReceivingTime.HasValue ? x.ReceivingTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
......@@ -117,7 +119,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetOrderListExportEnumList() {
public ApiResult GetOrderListExportEnumList()
{
var list = EnumHelper.GetEnumList(typeof(OrderListExportEnum));
return ApiResult.Success("", list.Select(x => new
{
......@@ -165,7 +168,8 @@ namespace Mall.WebApi.Controllers.MallBase
int Num = 0;
foreach (var item in list)
{
foreach (var item2 in item.DetailList) {
foreach (var item2 in item.DetailList)
{
Num++;
ExcelDataSource datarow = new ExcelDataSource()
{
......@@ -192,11 +196,11 @@ namespace Mall.WebApi.Controllers.MallBase
case 6:
datarow.ExcelRows.Add(new ExcelColumn(value: item2.Specification) { }); break;
case 7:
datarow.ExcelRows.Add(new ExcelColumn(value: (item2.Number??0).ToString()) { }); break;
datarow.ExcelRows.Add(new ExcelColumn(value: (item2.Number ?? 0).ToString()) { }); break;
case 8:
datarow.ExcelRows.Add(new ExcelColumn(value: item2.ProductCode) { }); break;
case 9:
datarow.ExcelRows.Add(new ExcelColumn(value: (item2.CostMoney??0).ToString()) { }); break;
datarow.ExcelRows.Add(new ExcelColumn(value: (item2.CostMoney ?? 0).ToString()) { }); break;
case 10:
datarow.ExcelRows.Add(new ExcelColumn(value: item.Consignee) { }); break;
case 11:
......@@ -218,7 +222,7 @@ namespace Mall.WebApi.Controllers.MallBase
case 19:
datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderStatus > OrderStatusEnum.NonPayment ? "已付款" : "未付款") { }); break;
case 20:
datarow.ExcelRows.Add(new ExcelColumn(value: item.PaymentTime.HasValue?item.PaymentTime.Value.ToString("yyyy-MM-dd HH:mm:ss"):"") { }); break;
datarow.ExcelRows.Add(new ExcelColumn(value: item.PaymentTime.HasValue ? item.PaymentTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "") { }); break;
case 21:
datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderStatus > OrderStatusEnum.WaitSendGoods ? "已发货" : "未发货") { }); break;
case 22:
......@@ -292,7 +296,7 @@ namespace Mall.WebApi.Controllers.MallBase
public ApiResult GetOrderStatusEnumList()
{
var list = EnumHelper.GetEnumList(typeof(OrderStatusEnum));
return ApiResult.Success("", list.OrderBy(x=> Convert.ToInt32(x.Value)).Select(x => new
return ApiResult.Success("", list.OrderBy(x => Convert.ToInt32(x.Value)).Select(x => new
{
Name = x.Key,
Id = Convert.ToInt32(x.Value)
......@@ -304,11 +308,13 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetGoodsOrderInfo() {
public ApiResult SetGoodsOrderInfo()
{
var req = RequestParm;
RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(req.msg.ToString());
if (demodel.DetailList == null || !demodel.DetailList.Any()) {
if (demodel.DetailList == null || !demodel.DetailList.Any())
{
return ApiResult.ParamIsNull("请选择下单商品");
}
//等小程序登录 收货地址做了之后
......@@ -320,11 +326,13 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetGoodsOrderInfo() {
public ApiResult GetGoodsOrderInfo()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
if (OrderId <= 0) {
if (OrderId <= 0)
{
return ApiResult.Failed();
}
......@@ -336,13 +344,16 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderSendGoods() {
public ApiResult SetOrderSendGoods()
{
var req = RequestParm;
RB_Goods_OrderExpress_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_OrderExpress_Extend>(req.msg.ToString());
if ((demodel.OrderId ?? 0) <= 0) {
if ((demodel.OrderId ?? 0) <= 0)
{
return ApiResult.ParamIsNull("请传递订单id");
}
if (demodel.OrderDetailIdList == null || !demodel.OrderDetailIdList.Any()) {
if (demodel.OrderDetailIdList == null || !demodel.OrderDetailIdList.Any())
{
return ApiResult.ParamIsNull("请传递订单明细id");
}
if (demodel.Type == 1)
......@@ -356,13 +367,16 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.ParamIsNull("请输入快递单号");
}
}
else {
if (string.IsNullOrEmpty(demodel.Remark)) {
else
{
if (string.IsNullOrEmpty(demodel.Remark))
{
return ApiResult.ParamIsNull("请输入物流内容");
}
}
var omodel = orderModule.GetOrderInfo(demodel.OrderId ?? 0);
if (omodel.OrderStatus != OrderStatusEnum.WaitSendGoods && omodel.OrderStatus != OrderStatusEnum.WaitReceiving) {
if (omodel.OrderStatus != OrderStatusEnum.WaitSendGoods && omodel.OrderStatus != OrderStatusEnum.WaitReceiving)
{
return ApiResult.ParamIsNull("状态不对");
}
......@@ -376,7 +390,8 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed(msg);
}
}
......@@ -386,11 +401,13 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetOrderSendGoodsExpressIdByOrderId() {
public ApiResult GetOrderSendGoodsExpressIdByOrderId()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
if (OrderId <= 0) {
if (OrderId <= 0)
{
return ApiResult.ParamIsNull();
}
......@@ -414,11 +431,13 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetOrderSendGoodsInfo() {
public ApiResult GetOrderSendGoodsInfo()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderExpressId = parms.GetInt("OrderExpressId", 0);
if (OrderExpressId <= 0) {
if (OrderExpressId <= 0)
{
return ApiResult.ParamIsNull();
}
......@@ -431,7 +450,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderOperation() {
public ApiResult SetOrderOperation()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
......@@ -439,14 +459,17 @@ namespace Mall.WebApi.Controllers.MallBase
string Remark = parms.GetStringValue("Remark");
decimal Income = parms.GetDecimal("Income");
string Address = parms.GetStringValue("Address");
if (OrderId <= 0) {
if (OrderId <= 0)
{
return ApiResult.ParamIsNull("请传递id");
}
var omodel = orderModule.GetOrderInfo(OrderId);
if (omodel == null) {
if (omodel == null)
{
return ApiResult.ParamIsNull("订单不存在，请核实后再试");
}
if (omodel.Status == 1) {
if (omodel.Status == 1)
{
return ApiResult.Failed("已删除订单无法操作");
}
if (Type == 1)
......@@ -525,16 +548,18 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.ParamIsNull("该订单不在回收站，无法删除");
}
}
else {
else
{
return ApiResult.ParamIsNull("参数有误");
}
bool flag= orderModule.SetOrderOperation(omodel, 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();
}
else {
else
{
return ApiResult.Failed();
}
}
......@@ -590,7 +615,7 @@ namespace Mall.WebApi.Controllers.MallBase
if (Robj.IsSuccess)
{
//获取商品信息
var orderGoodsList = orderModule.GetOrderDetailList(new RB_Goods_OrderDetail_Extend { TenantId= omodel .TenantId,MallBaseId= omodel .MallBaseId,OrderId= omodel .OrderId});
var orderGoodsList = orderModule.GetOrderDetailList(new RB_Goods_OrderDetail_Extend { TenantId = omodel.TenantId, MallBaseId = omodel.MallBaseId, OrderId = omodel.OrderId });
string goodsName = orderGoodsList.FirstOrDefault().GoodsName;
if (orderGoodsList.Count > 1)
{
......@@ -611,7 +636,7 @@ namespace Mall.WebApi.Controllers.MallBase
//退款成功发送退款成功的订阅消息
//根据订单下单人获取openid
var userModel = orderModule.GetMemberUserInfo(omodel.UserId.Value);
if (userModel!=null)
if (userModel != null)
{
miniProgramMsgModule.SendOrderRefundMsg(mallModel.TenantId.Value, mallModel.MallBaseId, userModel.OpenId, "已退款，请注意查收", omodel.OrderNo, (omodel.Income ?? 0).ToString(), goodsName);
}
......@@ -651,15 +676,18 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderDetialMoneyInfo() {
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) {
if (OrderDetailId <= 0)
{
return ApiResult.ParamIsNull("请传递订单明细id");
}
if (Income <= 0) {
if (Income <= 0)
{
return ApiResult.ParamIsNull("请传递价格");
}
......@@ -668,7 +696,8 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed();
}
}
......@@ -714,34 +743,40 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderShopingAddress() {
public ApiResult SetOrderShopingAddress()
{
var req = RequestParm;
RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(req.msg.ToString());
if (demodel.OrderId <= 0) {
if (demodel.OrderId <= 0)
{
return ApiResult.ParamIsNull();
}
if (string.IsNullOrEmpty(demodel.Consignee)) {
if (string.IsNullOrEmpty(demodel.Consignee))
{
return ApiResult.ParamIsNull("请输入收件人");
}
if (string.IsNullOrEmpty(demodel.Mobile)) {
if (string.IsNullOrEmpty(demodel.Mobile))
{
return ApiResult.ParamIsNull("请输入手机号码");
}
if ((demodel.Province ?? 0) <= 0 || (demodel.City ?? 0) <= 0 || (demodel.District ?? 0) <= 0)
{
return ApiResult.ParamIsNull("请选择区域");
}
if (string.IsNullOrEmpty(demodel.ShoppingAddress)) {
if (string.IsNullOrEmpty(demodel.ShoppingAddress))
{
return ApiResult.ParamIsNull("请输入详细地址");
}
demodel.TenantId = req.TenantId;
demodel.MallBaseId = req.MallBaseId;
bool flag= orderModule.SetOrderShopingAddress(demodel);
bool flag = orderModule.SetOrderShopingAddress(demodel);
if (flag)
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed();
}
}
......@@ -758,21 +793,26 @@ namespace Mall.WebApi.Controllers.MallBase
int OrderId = parms.GetInt("OrderId", 0);
int Type = parms.GetInt("Type", 1);//1同意 2拒绝
string Remark = parms.GetStringValue("Remark");
if (OrderId <= 0) {
if (OrderId <= 0)
{
return ApiResult.ParamIsNull();
}
var omodel = orderModule.GetOrderInfo(OrderId);
if (omodel == null) {
if (omodel == null)
{
return ApiResult.Failed("订单不存在");
}
if (omodel.Status == 1) {
if (omodel.Status == 1)
{
return ApiResult.Failed("订单已删除");
}
if (omodel.Recycled == 1) {
if (omodel.Recycled == 1)
{
return ApiResult.Failed("订单已进入回收站无法操作");
}
if (omodel.IsApplyForCancel != 1) {
if (omodel.IsApplyForCancel != 1)
{
return ApiResult.Failed("该订单未申请取消该订单");
}
int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
......@@ -828,7 +868,8 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Failed();
}
}
else {
else
{
LogHelper.Write(JsonConvert.SerializeObject(Robj));
return ApiResult.Failed();
}
......@@ -852,14 +893,16 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderEmptyRecycleBin() {
public ApiResult SetOrderEmptyRecycleBin()
{
var req = RequestParm;
bool flag = orderModule.SetOrderEmptyRecycleBin(req.TenantId, req.MallBaseId);
if (flag)
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed();
}
}
......@@ -916,6 +959,35 @@ namespace Mall.WebApi.Controllers.MallBase
}
}
/// <summary>
/// 修改商品成本
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderCostMoney()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int OrderId = parms.GetInt("Id", 0);
decimal costMoney = parms.GetDecimal("CostMoney");
if (OrderId <= 0)
{
return ApiResult.ParamIsNull("请传递订单明细id");
}
if (costMoney < 0)
{
return ApiResult.ParamIsNull("请传递商品成本");
}
bool flag = orderModule.SetOrderCostMoney(OrderId, costMoney, req.TenantId, req.MallBaseId);
if (flag)
{
return ApiResult.Success();
}
else
{
return ApiResult.Failed();
}
}
#endregion
......@@ -1034,7 +1106,7 @@ namespace Mall.WebApi.Controllers.MallBase
case 3:
datarow.ExcelRows.Add(new ExcelColumn(value: item.UserName) { }); break;
case 4:
datarow.ExcelRows.Add(new ExcelColumn(value: (item.Income??0).ToString()) { }); break;
datarow.ExcelRows.Add(new ExcelColumn(value: (item.Income ?? 0).ToString()) { }); break;
case 5:
datarow.ExcelRows.Add(new ExcelColumn(value: item.PaymentTime.Value.ToString("yyyy-MM-dd HH:mm:ss")) { }); break;
case 6:
......@@ -1095,7 +1167,8 @@ namespace Mall.WebApi.Controllers.MallBase
x.CouponMoney,
x.PaymentWay,
PaymentWayName = x.PaymentWay.GetEnumName(),
DetailList = x.DetailList.Select(y => new {
DetailList = x.DetailList.Select(y => new
{
y.Id,
y.CoverImage,
y.CoverImagePath,
......@@ -1118,7 +1191,8 @@ namespace Mall.WebApi.Controllers.MallBase
DeliveryTime = x.DeliveryTime.HasValue ? x.DeliveryTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
ReceivingTime = x.ReceivingTime.HasValue ? x.ReceivingTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
x.IsOrderCommission,
OrderCommissionList= x.OrderCommissionList.Select(z=>new {
OrderCommissionList = x.OrderCommissionList.Select(z => new
{
z.Id,
z.Grade,
z.GradeDescription,
......@@ -1197,10 +1271,12 @@ namespace Mall.WebApi.Controllers.MallBase
var ocList = item.OrderCommissionList.Where(x => x.OrderDetailId == item2.Id).ToList();
if (ocList.Any())
{
foreach (var ocitem in ocList) {
switch (ocitem.Grade) {
foreach (var ocitem in ocList)
{
switch (ocitem.Grade)
{
case 0:
ZGFY = (ocitem.Commission??0).ToString();break;
ZGFY = (ocitem.Commission ?? 0).ToString(); break;
case 1:
YJFX = $"昵称：{ocitem.UserName}，姓名：{ocitem.Name}，手机号：{ocitem.Mobile}";
YJYJ = (ocitem.Commission ?? 0).ToString(); break;
......@@ -1324,7 +1400,8 @@ namespace Mall.WebApi.Controllers.MallBase
x.ReOrderNo,
x.UserId,
x.UserName,
OrderModel =new {
OrderModel = new
{
x.OrderModel.OrderId,
x.OrderModel.OrderNo,
x.OrderModel.OrderSource,
......@@ -1337,7 +1414,8 @@ namespace Mall.WebApi.Controllers.MallBase
x.OrderModel.DistrictAddress,
x.OrderModel.ShoppingAddress
},
OrderDetailModel =new {
OrderDetailModel = new
{
x.OrderDetailModel.Id,
x.OrderDetailModel.GoodsName,
x.OrderDetailModel.GoodsId,
......@@ -1351,7 +1429,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.Income,
x.Refund,
x.RefundActual,
VoucherList= string.IsNullOrEmpty(x.Voucher)?new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.Voucher),
VoucherList = string.IsNullOrEmpty(x.Voucher) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(x.Voucher),
x.ReOrderStatus,
ReOrderStatusName = x.ReOrderStatus.GetEnumName(),
x.ReRemark,
......@@ -1505,11 +1583,13 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetOrderAfterSaleInfo() {
public ApiResult GetOrderAfterSaleInfo()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int ReOrderId = parms.GetInt("ReOrderId", 0);
if (ReOrderId <= 0) {
if (ReOrderId <= 0)
{
return ApiResult.ParamIsNull();
}
......@@ -1521,7 +1601,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderAfterSaleAudit() {
public ApiResult SetOrderAfterSaleAudit()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int ReOrderId = parms.GetInt("ReOrderId", 0);
......@@ -1532,8 +1613,10 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.ParamIsNull();
}
if (Type == 1) {
if (DeliveryId <= 0) {
if (Type == 1)
{
if (DeliveryId <= 0)
{
return ApiResult.ParamIsNull("请选择退货地址");
}
}
......@@ -1546,7 +1629,8 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderReceivingForReturnsAndRefunds() {
public ApiResult SetOrderReceivingForReturnsAndRefunds()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int ReOrderId = parms.GetInt("ReOrderId", 0);
......@@ -1573,11 +1657,13 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.ParamIsNull();
}
if (Refund <= 0) {
if (Refund <= 0)
{
return ApiResult.ParamIsNull("请传递金额");
}
var ReModel = orderModule.GetOrderAfterSaleEntity(ReOrderId);
if (ReModel == null) {
if (ReModel == null)
{
return ApiResult.Failed("未查询到售后订单信息");
}
if (ReModel == null)
......@@ -1593,7 +1679,8 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Failed("退款金额不能大于" + ReModel.Refund);
}
var orderModel = orderModule.GetOrderInfo(ReModel.OrderId ?? 0);
if (orderModel == null) {
if (orderModel == null)
{
return ApiResult.Failed("未查询到订单信息");
}
int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
......@@ -1640,13 +1727,15 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Failed();
}
}
else {
else
{
bool flag = orderModule.SetOrderAfterSaleForRefunds(ReOrderId, Refund, "", req.TenantId, req.MallBaseId);
if (flag)
{
return ApiResult.Success("");
}
else {
else
{
return ApiResult.Failed();
}
}
......@@ -1750,7 +1839,8 @@ namespace Mall.WebApi.Controllers.MallBase
}
return ApiResult.Failed();
}
else {
else
{
bool flag = orderModule.SetOrderAfterSaleForRefunds(ReOrderId, Refund, "", req.TenantId, req.MallBaseId);
if (flag == false)
{
......@@ -1843,16 +1933,20 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetGoodsCommentTemplateInfo() {
public ApiResult SetGoodsCommentTemplateInfo()
{
var req = RequestParm;
RB_Goods_CommentTemplate_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_CommentTemplate_Extend>(req.msg.ToString());
if (string.IsNullOrEmpty(demodel.Name)) {
if (string.IsNullOrEmpty(demodel.Name))
{
return ApiResult.ParamIsNull("请输入模板名称");
}
if (string.IsNullOrEmpty(demodel.Content)) {
if (string.IsNullOrEmpty(demodel.Content))
{
return ApiResult.ParamIsNull("请输入模板内容");
}
if (!demodel.CommentGrade.HasValue) {
if (!demodel.CommentGrade.HasValue)
{
return ApiResult.ParamIsNull("请选择模板类型");
}
......@@ -1870,11 +1964,13 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DelGoodsCommentTemplateInfo() {
public ApiResult DelGoodsCommentTemplateInfo()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
int TemplateId = parms.GetInt("TemplateId", 0);
if (TemplateId <= 0) {
if (TemplateId <= 0)
{
return ApiResult.ParamIsNull();
}
......@@ -1926,26 +2022,33 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetGoodsCommentInfo() {
public ApiResult SetGoodsCommentInfo()
{
var req = RequestParm;
RB_Goods_Comment_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Comment_Extend>(req.msg.ToString());
if (string.IsNullOrEmpty(demodel.UserName)) {
if (string.IsNullOrEmpty(demodel.UserName))
{
return ApiResult.ParamIsNull("请输入用户名称");
}
if (!demodel.CreateDate.HasValue) {
if (!demodel.CreateDate.HasValue)
{
return ApiResult.ParamIsNull("请输入评论时间");
}
if ((demodel.GoodsId ?? 0) <= 0) {
if ((demodel.GoodsId ?? 0) <= 0)
{
return ApiResult.ParamIsNull("请选择商品");
}
if (string.IsNullOrEmpty(demodel.Content)) {
if (string.IsNullOrEmpty(demodel.Content))
{
return ApiResult.ParamIsNull("请输入评价内容");
}
if (!demodel.CommentGrade.HasValue) {
if (!demodel.CommentGrade.HasValue)
{
return ApiResult.ParamIsNull("请选择评分");
}
demodel.CommentImage = "";
if (demodel.CommentImgList != null && demodel.CommentImgList.Any()) {
if (demodel.CommentImgList != null && demodel.CommentImgList.Any())
{
demodel.CommentImage = JsonConvert.SerializeObject(demodel.CommentImgList);
}
demodel.UserPhoto ??= 0;
......@@ -1969,17 +2072,21 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetGoodsCommentBatch() {
public ApiResult SetGoodsCommentBatch()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
string CommentIds = parms.GetStringValue("CommentIds");
int Type = parms.GetInt("Type", 1);//1批量回复 2批量隐藏 3批量显示 4批量置顶 5取消置顶 6批量删除
string Content = parms.GetStringValue("Content");
if (string.IsNullOrEmpty(CommentIds)) {
if (string.IsNullOrEmpty(CommentIds))
{
return ApiResult.ParamIsNull();
}
if (Type == 1) {
if (string.IsNullOrEmpty(Content)) {
if (Type == 1)
{
if (string.IsNullOrEmpty(Content))
{
return ApiResult.ParamIsNull("回复内容不能为空");
}
}
......@@ -2011,16 +2118,19 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetOrderBatchSendGoods() {
public ApiResult SetOrderBatchSendGoods()
{
var req = RequestParm;
JObject parms = JObject.Parse(req.msg.ToString());
string FilePath = parms.GetStringValue("FilePath");
int ExpressId = parms.GetInt("ExpressId", 0);
if (string.IsNullOrEmpty(FilePath)) {
if (string.IsNullOrEmpty(FilePath))
{
return ApiResult.ParamIsNull("文件路径不存在");
}
if (ExpressId <= 0) {
if (ExpressId <= 0)
{
return ApiResult.ParamIsNull("请选择快递id");
}
......@@ -2029,7 +2139,8 @@ namespace Mall.WebApi.Controllers.MallBase
{
return ApiResult.Success();
}
else {
else
{
return ApiResult.Failed(msg);
}
}
......
Mall.WebApi/appsettings.json
View file @ 6644977d
......@@ -24,16 +24,18 @@
"Mongo": "mongodb://192.168.2.214:27017",
"MongoDBName": "Mall",
"ProjectUrl": "D:/project/GitProject/mallapp",
"DeveloperKitsPort": "63994",
"DeveloperKitsPort": "15720",
"FirstPage": "pages/index/index.html",
"ByteDanceSendTemplate": "https://developer.toutiao.com/api/apps/game/template/send",
"sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信回调地址
"sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信商品回调地址
"sTenpayRechargeNotify": "http://mallapi.oytour.com/api/WeChatNotify/RechargeNotify", //微信充值回调地址
"NetworkDirector": 1756, //网络主管的id，用于新建供应商账户的时候的创建人
"RB_Branch_Id": 49, //所属公司id
"RebornDMC": "reborn_dmc",
"IncomeFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallIn",
"PaymentFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallOut",
"FinanceKey": "FinanceMallInsertToERPViitto2020",
"SettlementRate": "0.60",
"RedisSetting": {
"RedisServer": "192.168.2.214",
"RedisPort": "6379",
......
Mall.WindowsService/Module/FinanceModule.cs
View file @ 6644977d
......@@ -207,13 +207,13 @@ and DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
{
decimal OriginalFee = 0;
//decimal OriginalFee = 0;
var goodsDetailGroupList = goodsDetailList.GroupBy(x => x.OrderId);
foreach (var goodsDetailGroupItem in goodsDetailGroupList)
{
OriginalFee += goodsDetailList.Where(x => x.OrderId == goodsDetailGroupItem.Key).Sum(x => (x.FreightMoney ?? 0) + (x.Final_Price ?? 0)) * (Convert.ToDecimal(Config.SettlementRate) / 100);
}
//var goodsDetailGroupList = goodsDetailList.GroupBy(x => x.OrderId);
//foreach (var goodsDetailGroupItem in goodsDetailGroupList)
//{
// OriginalFee += goodsDetailList.Where(x => x.OrderId == goodsDetailGroupItem.Key).Sum(x => (x.FreightMoney ?? 0) + (x.Final_Price ?? 0)) * (Convert.ToDecimal(Config.SettlementRate) / 100);
//}
var detailList = result.Select(x => new
{
CostTypeId = x.FinanceType == 1 ? item.IncomeCostTypeId : item.FreightCostTypeId,
......
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