Commit 8cf6d0b2 authored by liudong1993's avatar liudong1993

1

parent 9a8a9ef6
...@@ -2070,7 +2070,6 @@ namespace Mall.Module.Product ...@@ -2070,7 +2070,6 @@ namespace Mall.Module.Product
pinkageList = PinkageList, pinkageList = PinkageList,
express_price = TotalExpress, express_price = TotalExpress,
remark = "", remark = "",
promptNoSuperiorFY = PromptNoSuperiorFY,
//order_form_data= [], //order_form_data= [],
total_goods_price = TotalGoodsSellMoney, total_goods_price = TotalGoodsSellMoney,
total_goods_original_price = TotalGoodsOriginalMoney, total_goods_original_price = TotalGoodsOriginalMoney,
...@@ -2115,6 +2114,7 @@ namespace Mall.Module.Product ...@@ -2115,6 +2114,7 @@ namespace Mall.Module.Product
var Robj = new var Robj = new
{ {
mch_list, mch_list,
promptNoSuperiorFY = PromptNoSuperiorFY,
total_price = TotalGoodsMoney, total_price = TotalGoodsMoney,
price_enable = true, price_enable = true,
address = new address = new
......
...@@ -2806,7 +2806,7 @@ namespace Mall.Module.User ...@@ -2806,7 +2806,7 @@ namespace Mall.Module.User
if (addmodel.IsDefault != 1) if (addmodel.IsDefault != 1)
{ {
var defmodel = member_ShippingAddressRepository.GetList(new RB_Member_ShippingAddress_Extend() { UserId = userId, IsDefault = 1 }).FirstOrDefault(); var defmodel = member_ShippingAddressRepository.GetList(new RB_Member_ShippingAddress_Extend() { UserId = userId, IsDefault = 1 }).FirstOrDefault();
oldId = defmodel.Id; oldId = defmodel?.Id ?? 0;
} }
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Member_ShippingAddress.IsDefault),addmodel.IsDefault==1?2:1}, { nameof(RB_Member_ShippingAddress.IsDefault),addmodel.IsDefault==1?2:1},
......
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