修改统计分析 销售明细

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -28,6 +28,7 @@ import org.springblade.finance.vojo.Acc;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.entity.OrderFees;
 import org.springblade.purchase.sales.entity.OrderItems;
+import org.springblade.purchase.sales.excel.EnquiryExcel;
 import org.springblade.purchase.sales.excel.ExportOrderExcel;
 import org.springblade.purchase.sales.excel.ProfitItemExcel;
 import org.springblade.purchase.sales.service.*;
@@ -655,9 +656,18 @@ public class ExportOrderController extends BladeController {
 	@ApiOperation(value = "统计分析 销售明细", notes = "统计分析 销售明细")
 	public R<IPage<SalesDetailsVo>> selBusinessOrder(SalesDetailsVo detailsVo, Query query)
 	{
-		System.out.println("1111111111111111111111");
-		System.out.println(detailsVo);
+		System.out.println("detailsVo================"+detailsVo);
 		IPage<SalesDetailsVo> pages = orderService.selBusinessOrder(Condition.getPage(query), detailsVo);
 		return R.data(pages);
 	}
+
+	/**
+	 * 统计分析 销售明细导出
+	 */
+	/**@GetMapping("/export")
+	@ApiOperation(value = "销售明细导出", notes = "销售明细导出")
+	public void export(SalesDetailsVo detailsVo, Query query, HttpServletResponse response){
+		IPage<SalesDetailsVo> page = orderService.selBusinessOrder(Condition.getPage(query), detailsVo);;
+		//enquiryExcels = JSON.parseArray(JSON.toJSONString(page.getRecords()), EnquiryExcel.class);
+	}*/
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -544,10 +544,15 @@ ORDER BY
         BGD.Typeno AS typeno,
         BGD.brand_item AS brandItem,
         BOI.Actual_quantity AS quantity,
-        BOI.Amount AS amount,
+        Round(BOI.Amount, 2) AS amount,
         BGD.Price AS price,
         BO.Settlment_amount AS settlmentAmount,
-        BOF.Amount AS feesAmount,
+        (CASE WHEN
+            BO.package_remarks != '有包装'
+        THEN
+            BOF.Amount
+        ELSE ''
+        END) AS feesAmount,
         BGD.Brand AS brand
         FROM business_order_items AS BOI
         LEFT JOIN business_order BO ON BOI.pid = BO.id
@@ -572,6 +577,7 @@ ORDER BY
                 and BO.create_time <= #{detailsVo.endCreateTime}
             </if>
         </where>
+        order by BO.create_time desc
     </select>
 
     <select id="monthSales"  resultType="BigDecimal">