订单财务

Mall.Module.Product/OrderModule.cs

@@ -9026,13 +9026,13 @@ namespace Mall.Module.Product
                 }
                 else
                 {
-                    keyValues.Add(nameof(RB_Goods_OrderDetail.RealMoney), (model.RealMoney ?? 0) + money);
+                    keyValues.Add(nameof(RB_Goods_OrderDetail.YFMoney), (model.YFMoney ?? 0) + money);
                 }
             }
             else {
                 if (otherType == 21)
                 {
-                    keyValues.Add(nameof(RB_Goods_OrderDetail.YFMoney), (model.YFMoney ?? 0) + money);
+                    keyValues.Add(nameof(RB_Goods_OrderDetail.RealMoney), (model.RealMoney ?? 0) + money);
                 }
                 else
                 {

Mall.Module.User/UserModule.cs

@@ -2404,6 +2404,8 @@ namespace Mall.Module.User
                     List<Model.Entity.Finance.RB_ECFinanceId_Relation> ECList = new List<Model.Entity.Finance.RB_ECFinanceId_Relation>();
                     if (!string.IsNullOrEmpty(remitModel.ReOrderIds) || !string.IsNullOrEmpty(remitModel.ReVipIds))
                     {
+                        if (string.IsNullOrEmpty(remitModel.ReOrderIds)) { remitModel.ReOrderIds = "[]"; }
+                        if (string.IsNullOrEmpty(remitModel.ReVipIds)) { remitModel.ReVipIds = "[]"; }
                         List<int> reorderIdList = JsonConvert.DeserializeObject<List<int>>(remitModel.ReOrderIds);
                         List<int> revipIdList = JsonConvert.DeserializeObject<List<int>>(remitModel.ReVipIds);
                         if (revipIdList.Any()) {

Mall.Repository/User/RB_SmallShops_PriceRepository.cs

@@ -73,6 +73,9 @@ where {where} order by di.Id desc";
             {
                 where += $@" and g.{nameof(Model.Entity.Product.RB_Goods.Name)} like '%{demodel.GoodsName}%'";
             }
+            if (demodel.SmallShopsId > 0) {
+                where += $@" and sp.{nameof(RB_SmallShops_Price_Extend.SmallShopsId)}={demodel.SmallShopsId}";
+            }
 
             string sql = $@"
     SELECT sp.GoodsId FROM rb_smallshops_price sp