Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

username@email.com

2024-04-12 5f4384bdab4697cc0a678fb17e55603a91a4750b

 CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs

@@ -832,6 +832,8 @@
                        item.price = o.distributionPrice;
                    item.sku_name_arr = o.spesDesc.Split(",").Select(s => s.Split(":")[1]).ToList();
                    item.stock = o.stock;
                    item.cutMoney = o.cutMoney;
                    item.distributionCutMoney = o.distributionCutMoney;
                    item.mktPrice = o.mktprice;
                    item.selPrice = o.price;
                    if (type == GlobalEnumVars.OrderType.PinTuan.ToString().ToLowerInvariant())
@@ -886,6 +888,8 @@
                    //item.price = o.price - gradePrice; //减去会员等级价格
                    item.sku_name_arr = new List<string> { "默认" };
                    item.stock = o.stock;
                    item.cutMoney = o.cutMoney;
                    item.distributionCutMoney = o.distributionCutMoney;
                    item.mktPrice = o.mktprice;
                    item.selPrice = o.price;
                    if (type == GlobalEnumVars.OrderType.PinTuan.ToString().ToLowerInvariant())