From 1496a7e366a2796b825e7b989b82654ae1aca6b8 Mon Sep 17 00:00:00 2001 From: 姜友瑶 <935090232@qq.com> Date: Mon, 30 May 2022 20:48:03 +0800 Subject: [PATCH] fix:修复退款订单退款业绩没计算为负数问题 --- zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java index ce3fe59..e2c5007 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java @@ -411,7 +411,7 @@ String title = "商品资料"; orderSheet.setSheetName(title); orderSheet.setTitle(title); - String[] header = {"商品名称", "商品编号", "售价/(本金)", "参考价/(赠送金额)", "真实销量", "状态", "是否赠送", "类型", "分类", "是否固定套餐", "产品归属"}; + String[] header = {"商品名称", "商品编号", "售价/(本金)", "参考价/(赠送金额)", "真实销量", "状态", "是否赠送", "类型", "分类", "是否固定套餐", "产品归属","时长"}; orderSheet.setHeaders(header); List<ShoppingGoods> dataList = shoppingGoodsService.findAll(shoppingGoods); List<List<Object>> list = new ArrayList<>(); @@ -429,6 +429,7 @@ temp.add(item.getCateName()); temp.add(item.getIsCourse()); temp.add(item.getHeadquarters() == 1 ? "总部产品" : "本店产品"); + temp.add(item.getTimeLength()); list.add(temp); } } -- Gitblit v1.9.1