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

Mall.Module.User/SmallShopsModule.cs

@@ -414,29 +414,26 @@ namespace Mall.Module.User
                             //开始递减金额   订单不足的  给与提示
                             foreach (var item in olist)
                             {
-                                if (TMoney > 0)
+                                decimal CommMoney = 0;
+                                var chlist = clist.Where(x => x.OrderId == item.OrderId).ToList();
+                                foreach (var qitem in chlist)
                                 {
-                                    decimal CommMoney = 0;
-                                    var chlist = clist.Where(x => x.OrderId == item.OrderId).ToList();
-                                    foreach (var qitem in chlist)
-                                    {
-                                        TMoney -= (qitem.Commission ?? 0);
-                                        CommMoney += (qitem.Commission ?? 0);
-                                        Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
-                                            { nameof(RB_SmallShops_Commission_Extend.IsRemit),1}
-                                        };
-                                        List<WhereHelper> wheres2 = new List<WhereHelper>() {
-                                            new WhereHelper(){
-                                                 FiledName=nameof(RB_SmallShops_Commission_Extend.Id),
-                                                  FiledValue=qitem.Id,
-                                                   OperatorEnum=OperatorEnum.Equal
-                                            }
-                                        };
-                                        smallShopsCommissionRepository.Update(keyValues2, wheres2, trans);
-                                    }
-                                    OrderNos += "\"" + item.OrderNo + "\"：" + CommMoney + "元，";
-                                    OrderIdList.Add(item.OrderId);
+                                    TMoney -= (qitem.Commission ?? 0);
+                                    CommMoney += (qitem.Commission ?? 0);
+                                    Dictionary<string, object> keyValues2 = new Dictionary<string, object>() {
+                                        { nameof(RB_SmallShops_Commission_Extend.IsRemit),1}
+                                    };
+                                    List<WhereHelper> wheres2 = new List<WhereHelper>() {
+                                        new WhereHelper(){
+                                                FiledName=nameof(RB_SmallShops_Commission_Extend.Id),
+                                                FiledValue=qitem.Id,
+                                                OperatorEnum=OperatorEnum.Equal
+                                        }
+                                    };
+                                    smallShopsCommissionRepository.Update(keyValues2, wheres2, trans);
                                 }
+                                OrderNos += "\"" + item.OrderNo + "\"：" + CommMoney + "元，";
+                                OrderIdList.Add(item.OrderId);
                             }
                             if (!string.IsNullOrEmpty(OrderNos))
                             {