Merge remote-tracking branch 'origin/master'

member-services/src/main/java/com/liangjian/dataplatform/member/service/impl/UserOrdersService.java

@@ -149,7 +149,7 @@ public class UserOrdersService implements IUserOrdersService {
         String sqlStr2=" A.*,row_number() over(  order by A."+orbyStr+" )  as rownum ";
         String sqlStr1=" SELECT SQLSTR FROM (SELECT o.OrdersCode,o.OrderTime,o.CreationDate,o.LastModified,o.AccountId,o.Consignee,o.ADeliveryAddress,o.ProductCode,o.OrderState,o.CourierID,o.Address,o.AConsigneePhone,o.SenderType,o.BuyRemark,p.Integral,p.payPirce,p.Is_Pay,p.PayType,(ISNULL(p.PostagePrice, 0)) PostagePrice,d.ProductName,d.Manufacturer,d.Amount,(ISNULL(d.MarketPrice, 0)) MarketPrice ,d.MarketIng,d.ProductObject,u.nickname,u.point as ing " +
                 " from "+
-                " mem_ingOrders o LEFT JOIN mem_ingOrdersPay p ON o. OrdersCode=p.OrdersCode LEFT JOIN mem_ingProduct d ON d.ProductCode=o.ProductCode LEFT JOIN mem_weixin_user_info u ON u.secret_phone=o.AccountId where 1=1) as A where 1=1 "+sqlStr ;
+                " mem_ingOrders o LEFT JOIN mem_ingOrdersPay p ON o. OrdersCode=p.OrdersCode LEFT JOIN mem_ingProduct d ON d.ProductCode=o.ProductCode LEFT JOIN mem_weixin_user_info u ON u.secret_phone=o.AccountId and u.openid!='' where 1=1) as A where 1=1 "+sqlStr ;
         //查询订单sql
         String sql = " select * from ( " + sqlStr1.replace("SQLSTR",sqlStr2) +
                 "  )AAA   where AAA.rownum > "+start+" and AAA.rownum < "+end+"  ORDER BY AAA."+orbyStr;