Merge branch 'master' of http://47.108.235.38:8080/r/chuanyin-group-project

CB2-20200827ONU\Administrator

2021-09-22 641ddf669ad57fb544e13a6433aa5905551b3bba

 CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs

@@ -539,6 +539,10 @@
                {
                    Condition += " and  (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime]) >7 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])>7 )";
                }
                else if (DeliveryTime == "逾期")
                {
                    Condition += " and (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=0 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=0 )";
                }

            }