Commit c01b360e authored by 黄奎's avatar 黄奎

代码优化

parent 69d1c69b
...@@ -1171,11 +1171,8 @@ namespace Mall.Module.Product ...@@ -1171,11 +1171,8 @@ namespace Mall.Module.Product
/// 获取售后页面 /// 获取售后页面
/// </summary> /// </summary>
/// <param name="orderDetailId"></param> /// <param name="orderDetailId"></param>
/// <param name="userId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns> /// <returns></returns>
public ApiResult GetAppletMyOrderAfterSaleInfo(int orderDetailId, int userId, int tenantId, int mallBaseId) public ApiResult GetAppletMyOrderAfterSaleInfo(int orderDetailId)
{ {
var dModel = goods_OrderDetailRepository.GetEntity<RB_Goods_OrderDetail_Extend>(orderDetailId); var dModel = goods_OrderDetailRepository.GetEntity<RB_Goods_OrderDetail_Extend>(orderDetailId);
if (dModel == null) if (dModel == null)
...@@ -2647,7 +2644,7 @@ namespace Mall.Module.Product ...@@ -2647,7 +2644,7 @@ namespace Mall.Module.Product
var IntegralObj = new var IntegralObj = new
{ {
can_use = IsPointsDeduction, can_use = IsPointsDeduction,
use = demodel.Use_Integral == 1 ? true : false, use = demodel.Use_Integral == 1,
use_num = Total_use_integral, use_num = Total_use_integral,
deduction_price = Total_integral_price deduction_price = Total_integral_price
}; };
...@@ -2747,7 +2744,7 @@ namespace Mall.Module.Product ...@@ -2747,7 +2744,7 @@ namespace Mall.Module.Product
//custom_currency_all= [], //custom_currency_all= [],
//allZiti= false, //allZiti= false,
//hasCity= false, //hasCity= false,
template_message_list = template_message_list //new List<string>() { "WPELErDfYO3JnizA5Zikta6Y8qrBBAgecuj2aLoucuY", "pCmTJwvTqNpyRREo7vvqIYBcrATNWoitfbLS61fLhzU", "i6QPsaOHgfNwlIRMwmvFGSCqX28g0cRa8XaLZ5_gpgc" } template_message_list //new List<string>() { "WPELErDfYO3JnizA5Zikta6Y8qrBBAgecuj2aLoucuY", "pCmTJwvTqNpyRREo7vvqIYBcrATNWoitfbLS61fLhzU", "i6QPsaOHgfNwlIRMwmvFGSCqX28g0cRa8XaLZ5_gpgc" }
}; };
#endregion #endregion
return ApiResult.Success("", Robj); return ApiResult.Success("", Robj);
...@@ -2980,10 +2977,12 @@ namespace Mall.Module.Product ...@@ -2980,10 +2977,12 @@ namespace Mall.Module.Product
{ {
return ApiResult.Failed("您在黑名单状态无法下单,请联系管理员核实"); return ApiResult.Failed("您在黑名单状态无法下单,请联系管理员核实");
} }
List<int> disList = new List<int>(); List<int> disList = new List<int>
disList.Add(demodel.Province ?? 0); {
disList.Add(demodel.City ?? 0); demodel.Province ?? 0,
disList.Add(demodel.District ?? 0); demodel.City ?? 0,
demodel.District ?? 0
};
decimal TotalExpress = 0; decimal TotalExpress = 0;
...@@ -4280,10 +4279,12 @@ namespace Mall.Module.Product ...@@ -4280,10 +4279,12 @@ namespace Mall.Module.Product
{ {
return ApiResult.Failed("您在黑名单状态无法下单,请联系管理员核实"); return ApiResult.Failed("您在黑名单状态无法下单,请联系管理员核实");
} }
List<int> disList = new List<int>(); List<int> disList = new List<int>
disList.Add(demodel.Province ?? 0); {
disList.Add(demodel.City ?? 0); demodel.Province ?? 0,
disList.Add(demodel.District ?? 0); demodel.City ?? 0,
demodel.District ?? 0
};
decimal TotalMoney = 0; decimal TotalMoney = 0;
string GoodsIds = ""; string GoodsIds = "";
...@@ -8006,10 +8007,8 @@ namespace Mall.Module.Product ...@@ -8006,10 +8007,8 @@ namespace Mall.Module.Product
/// 获取买家发货界面信息 /// 获取买家发货界面信息
/// </summary> /// </summary>
/// <param name="reOrderId"></param> /// <param name="reOrderId"></param>
/// <param name="tenantId"></param>
/// <param name="mallBaseId"></param>
/// <returns></returns> /// <returns></returns>
public ApiResult GetAppletOrderBuyerToDeliverInfo(int reOrderId, int tenantId, int mallBaseId) public ApiResult GetAppletOrderBuyerToDeliverInfo(int reOrderId)
{ {
var omodel = goods_OrderAfterSaleRepository.GetEntity(reOrderId); var omodel = goods_OrderAfterSaleRepository.GetEntity(reOrderId);
if (omodel == null) if (omodel == null)
...@@ -10056,7 +10055,7 @@ namespace Mall.Module.Product ...@@ -10056,7 +10055,7 @@ namespace Mall.Module.Product
if (flag) if (flag)
{ {
//记录流程 //记录流程
string Content = ""; string Content;
if (type == 1) if (type == 1)
{ {
Content = "卖家同意售后"; Content = "卖家同意售后";
...@@ -10128,7 +10127,7 @@ namespace Mall.Module.Product ...@@ -10128,7 +10127,7 @@ namespace Mall.Module.Product
{ {
//2020-07-03 屏蔽 改每日自动生成 //2020-07-03 屏蔽 改每日自动生成
//2020-09-15 电商erp订单 财务单据生成 //2020-09-15 电商erp订单 财务单据生成
OrderRefundFinanceModule(model, tenantId, mallBaseId); OrderRefundFinanceModule(model);
} }
} }
goods_OrderAfterSaleLogRepository.Insert(new RB_Goods_OrderAfterSaleLog() goods_OrderAfterSaleLogRepository.Insert(new RB_Goods_OrderAfterSaleLog()
...@@ -10150,7 +10149,7 @@ namespace Mall.Module.Product ...@@ -10150,7 +10149,7 @@ namespace Mall.Module.Product
/// 生成退款单据 /// 生成退款单据
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public bool OrderRefundFinanceModule(RB_Goods_OrderAfterSale dmodel, int TenantId, int MallBaseId) public bool OrderRefundFinanceModule(RB_Goods_OrderAfterSale dmodel)
{ {
var flag = false; var flag = false;
try try
...@@ -12481,9 +12480,8 @@ namespace Mall.Module.Product ...@@ -12481,9 +12480,8 @@ namespace Mall.Module.Product
/// <param name="money"></param> /// <param name="money"></param>
/// <param name="otherType"></param> /// <param name="otherType"></param>
/// <param name="type"></param> /// <param name="type"></param>
/// <param name="remark"></param>
/// <returns></returns> /// <returns></returns>
public bool SetECUpdateOrderOtherMoney(RB_Goods_OrderDetail_Extend model, int money, int otherType, int type, string remark) public bool SetECUpdateOrderOtherMoney(RB_Goods_OrderDetail_Extend model, int money, int otherType, int type)
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { }; Dictionary<string, object> keyValues = new Dictionary<string, object>() { };
if (type == 1) if (type == 1)
......
...@@ -1023,7 +1023,7 @@ namespace Mall.Module.User ...@@ -1023,7 +1023,7 @@ namespace Mall.Module.User
string Url = "https://api.weixin.qq.com/wxa/msg_sec_check?access_token=" + token; string Url = "https://api.weixin.qq.com/wxa/msg_sec_check?access_token=" + token;
var postdata = new var postdata = new
{ {
content = content content
}; };
wenXinResult = HttpHelper.HttpPost(Url, JsonHelper.Serialize(postdata), ""); wenXinResult = HttpHelper.HttpPost(Url, JsonHelper.Serialize(postdata), "");
LogHelper.WriteInfo("下单成功发送订阅消息:" + wenXinResult); LogHelper.WriteInfo("下单成功发送订阅消息:" + wenXinResult);
......
...@@ -432,10 +432,12 @@ namespace Mall.Module.User ...@@ -432,10 +432,12 @@ namespace Mall.Module.User
TransactionPriceInfo transactionPriceInfo = CacheManager.User.UserReidsCache.GetTransactionPriceInfo(oldOrder.MallBaseId); TransactionPriceInfo transactionPriceInfo = CacheManager.User.UserReidsCache.GetTransactionPriceInfo(oldOrder.MallBaseId);
if (transactionPriceInfo == null) if (transactionPriceInfo == null)
{ {
transactionPriceInfo = new TransactionPriceInfo(); transactionPriceInfo = new TransactionPriceInfo
transactionPriceInfo.TenantId = oldOrder.TenantId; {
transactionPriceInfo.MallBaseId = oldOrder.MallBaseId; TenantId = oldOrder.TenantId,
transactionPriceInfo.TotalPrice = totalPrice; MallBaseId = oldOrder.MallBaseId,
TotalPrice = totalPrice
};
} }
else else
{ {
......
...@@ -1674,7 +1674,6 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1674,7 +1674,6 @@ namespace Mall.WebApi.Controllers.Education
[HttpPost] [HttpPost]
public ApiResult GetDynamicMessageCount() public ApiResult GetDynamicMessageCount()
{ {
var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
int messageCount = 0; int messageCount = 0;
if (userInfo != null && userInfo.UserId > 0) if (userInfo != null && userInfo.UserId > 0)
......
...@@ -405,7 +405,7 @@ namespace Mall.WebApi.Controllers.Finance ...@@ -405,7 +405,7 @@ namespace Mall.WebApi.Controllers.Finance
return ApiResult.ParamIsNull("只能修改和平的"); return ApiResult.ParamIsNull("只能修改和平的");
} }
bool flag = orderModule.SetECUpdateOrderOtherMoney(model, Money, OtherType, Type, Remark); bool flag = orderModule.SetECUpdateOrderOtherMoney(model, Money, OtherType, Type);
if (flag) if (flag)
{ {
return ApiResult.Success(); return ApiResult.Success();
......
...@@ -1032,7 +1032,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1032,7 +1032,7 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
return orderModule.GetAppletMyOrderAfterSaleInfo(OrderDetailId, userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId); return orderModule.GetAppletMyOrderAfterSaleInfo(OrderDetailId);
} }
/// <summary> /// <summary>
...@@ -1137,7 +1137,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1137,7 +1137,7 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
return orderModule.GetAppletOrderBuyerToDeliverInfo(ReOrderId, userInfo.TenantId, userInfo.MallBaseId); return orderModule.GetAppletOrderBuyerToDeliverInfo(ReOrderId);
} }
/// <summary> /// <summary>
......
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