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

Mall.Module.Product/OrderModule.cs

@@ -3482,7 +3482,7 @@ namespace Mall.Module.Product
                 {
                     if (item.IntegralPresentType == 1)
                     {
-                        IntegralPresent = Convert.ToInt32(((item.Final_Price ?? 0) + (item.FreightMoney ?? 0)) * (item.IntegralPresent ?? 0) / 100);
+                        IntegralPresent = Convert.ToInt32((item.Final_Price ?? 0) * (item.IntegralPresent ?? 0) / 100);
                     }
                 }
                 //插入订单明细表
@@ -3848,7 +3848,7 @@ namespace Mall.Module.Product
         public bool SetAppletMyOrderAfterSale(RB_Goods_OrderAfterSale_Extend demodel)
         {
             var dModel = goods_OrderDetailRepository.GetEntity(demodel.OrderDetialId);
-            if (demodel.Type == 1 && ((dModel.Final_Price ?? 0) - (dModel.FreightMoney ?? 0)) < demodel.Refund)
+            if (demodel.Type == 1 && (dModel.Final_Price ?? 0) < demodel.Refund)
             {
                 return false;
             }

Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs

@@ -129,7 +129,7 @@ where {where} group by oc.OrderId,oc.UserId,oc.Grade,oc.Type order by oc.Grade a
                 where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,5,6)";
             }
 
-            string sql = $@"SELECT oc.OrderId,o.OrderNo,o.UserId,oc.Grade,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
+            string sql = $@"SELECT oc.OrderId,o.OrderNo,o.UserId,oc.Grade,oc.CommissionState,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
 FROM RB_Goods_OrderCommission oc
 inner join rb_goods_order o on oc.OrderId = o.OrderId
 left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)