更新一大堆代码

Reportapi/MyCode.Project.Repositories/JackOrdersItemRepository.cs

@@ -35,7 +35,7 @@ namespace MyCode.Project.Repositories
 FROM [JackOrders] a WITH (NOLOCK)
     LEFT JOIN [dbo].[JackOrdersItem] b WITH (NOLOCK)
         ON a.id = b.JackOrdersId
-WHERE a.status = 0
+WHERE a.status = 0 and TradeType in (1,7) and sellCount <> 0
 GROUP BY [shopCode],[shopName], [shopId], [warehouseName], [warehouseCode],   [status],   CONVERT(NVARCHAR(30),[consignTime],23) ,[goodsNo],  [goodsId], [barcode] ,[warehouseId],  [TradeType],Unit";
             var list = this.SelectList<PushOrderListResp>(sql);
             return list;
@@ -43,5 +43,31 @@ GROUP BY [shopCode],[shopName], [shopId], [warehouseName], [warehouseCode],   [s
         #endregion
 
 
+        #region  GetPushOrder(获取合并后的吉客云订单)
+        /// <summary>
+        /// 获取合并后的吉客云订单
+        /// </summary>
+        /// <returns></returns>
+        public List<PushOrderListResp> GetPushReturnOrder()
+        {
+            string sql = $@"
+   SELECT [shopCode], [shopName], [shopId], [warehouseName], [warehouseCode],     
+       [status], CONVERT(NVARCHAR(30),[consignTime],23)  [consignTime],
+       [goodsNo],  [goodsId],SUM([sellTotal]*-1) [sellTotal],
+       SUM([returnCount]*-1) [sellCount], SUM([ShareShouldReturnFee]*-1) AS [divideSellTotal],
+       [barcode],  [TradeType] ,[warehouseId],Unit
+FROM [JackOrders] a WITH (NOLOCK)
+    LEFT JOIN [dbo].[ReturnChangeGoodsDetail] b WITH (NOLOCK)
+        ON a.id = b.JackOrdersId
+WHERE a.status = 0 and [TradeType]=8 and returnCount <> 0
+GROUP BY [shopCode],[shopName], [shopId], [warehouseName], [warehouseCode],   [status],   CONVERT(NVARCHAR(30),[consignTime],23) ,[goodsNo],
+[goodsId], [barcode] ,[warehouseId],  [TradeType],Unit
+ORDER BY [shopCode],[consignTime] desc,[TradeType]
+";
+            var list = this.SelectList<PushOrderListResp>(sql);
+            return list;
+        }
+        #endregion
+
     }
 }