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

Mall.Module.Product/OrderModule.cs

@@ -4253,6 +4253,9 @@ namespace Mall.Module.Product
                     TenantId = tenantId,
                     Type = 1
                 });
+
+                //收货  自动确认订单
+                SetOrderOperation(omodel.RefMapperTo<RB_Goods_Order_Extend>(), 6, "", 0, "", tenantId, mallBaseId);
             }
             return flag;
         }
@@ -6296,10 +6299,15 @@ namespace Mall.Module.Product
                         }
                     }
                 }
-                else if (type == 3) { 
+                else if (type == 3)
+                {
                     //强制取消 (作废  使用新方法)
 
                 }
+                else if (type == 5) {
+                    //收货  自动确认订单
+                    SetOrderOperation(orderModel, 6, "", 0, "", tenantId, mallBaseId);
+                }
             }
             return flag;
         }

Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs

@@ -248,5 +248,15 @@ left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and o
 
             return Get<RB_Goods_OrderCommission_Extend>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取未提现的佣金列表
+        /// </summary>
+        /// <param name="UserId"></param>
+        /// <returns></returns>
+        public List<RB_Goods_OrderCommission_Extend> GetUserCommissionRemit(int UserId) {
+            string sql = $@"SELECT * FROM rb_goods_ordercommission oc WHERE oc.CommissionState=2 and oc.UserId={UserId} and oc.IsRemit <> 1";
+            return Get<RB_Goods_OrderCommission_Extend>(sql).ToList();
+        }
     }
 }