zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java
@@ -243,8 +243,8 @@ public AjaxResult importVipInfo(HttpServletResponse response, HttpServletRequest request, @RequestParam(value = "file", required = false) MultipartFile file) throws IOException { String fileName = file.getOriginalFilename(); // String dirPath = "E:"; String dirPath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH); // String dirPath = "E:"; String dirPath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH); File saveFile = new File(dirPath + "/" + fileName); file.transferTo(saveFile); zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -484,9 +484,6 @@ //检查交易限制调整 checkSealLimit(pageOrder); //交易业绩设置是否合理 checkAchieveIsOk(pageOrder); // 更新收款时间 pageOrder.setPayTime(new Date()); @@ -558,27 +555,7 @@ } /** * 交易业绩设置是否合理 * @param pageOrder */ private void checkAchieveIsOk(SysOrder pageOrder) { double huakouSum = pageOrder.getItems().stream() .mapToDouble( item -> item.getAchieveList().stream() .filter(achieveNew -> "划扣".equals(achieveNew.getPayMethod())) .mapToDouble(achieve -> achieve.getGoodsCash()).sum() ).sum(); double czkPay= pageOrder.getFlows().stream() .filter(sysOrderFlow -> "储值卡".equals(sysOrderFlow.getPayMethod())) .mapToDouble(sysOrderFlow ->sysOrderFlow.getAmount().doubleValue()).sum(); if(czkPay!=huakouSum){ throw new GlobleException("划扣业绩不等于储值卡扣款金额，请修改业绩设置！"); } } /** * 设置会员消费积分 zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderStatisticsAction.java
@@ -2,9 +2,13 @@ import com.matrix.core.constance.MatrixConstance; import com.matrix.core.pojo.AjaxResult; import com.matrix.core.tools.DateUtil; import com.matrix.core.tools.WebUtil; import com.matrix.core.tools.excl.ExcelSheetPO; import com.matrix.core.tools.excl.ExcelVersion; import com.matrix.system.common.bean.SysUsers; import com.matrix.system.common.constance.AppConstance; import com.matrix.system.common.tools.DataAuthUtil; import com.matrix.system.common.tools.ResponseHeadUtil; import com.matrix.system.hive.dao.SysOrderItemDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -12,6 +16,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletResponse; import java.io.OutputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; /** @@ -31,28 +40,83 @@ */ @RequestMapping(value = "/showList") public @ResponseBody AjaxResult showList( @RequestParam Map<String , Object> param) { AjaxResult showList(@RequestParam Map<String, Object> param) { SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY); if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){ param.put("shopId",sysUsers.getShopId()); if(!DataAuthUtil.hasAllShopAuth()){ param.put("shopId", sysUsers.getShopId()); } return AjaxResult.buildSuccessInstance(orderItemDao.selectItemDetail(param), orderItemDao.selectItemDetailTotal(param)); } @RequestMapping(value = "/exportShowList") public void exportShowList(@RequestParam Map<String, Object> param, HttpServletResponse response) throws Exception { SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY); String title = "产品销售明细统计"; String[] header = {"门店", "销售日期", "订单号", "商品名称", "分类", "客户名", "购买数量", "单价", "健康顾问", "支付方式", "状态"}; String[] column = {"SHOP_NAME", "pay_time", "ORDER_NO", "goodsName", "cateName", "VIP_NAME", "COUNT", "ZK_PRICE", "su_name", "pay_method", "status"}; if(!DataAuthUtil.hasAllShopAuth()){ param.put("shopId", sysUsers.getShopId()); } List<Map<String, Object>> dataList = orderItemDao.selectItemDetail(param); exportExcel(title, header,column, dataList, response); } /** * 产品销售明细统计 */ @RequestMapping(value = "/summaryItemDetail") public @ResponseBody AjaxResult summaryItemDetail( @RequestParam Map<String , Object> param) { AjaxResult summaryItemDetail(@RequestParam Map<String, Object> param) { SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY); if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){ param.put("shopId",sysUsers.getShopId()); if(!DataAuthUtil.hasAllShopAuth()){ param.put("shopId", sysUsers.getShopId()); } return AjaxResult.buildSuccessInstance(orderItemDao.summaryItemDetail(param), orderItemDao.summaryItemDetailTotal(param)); } @RequestMapping(value = "/exportSummaryItemDetail") public void exportSummaryItemDetail(@RequestParam Map<String, Object> param, HttpServletResponse response) throws Exception { SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY); String title = "产品销售明细统计"; String[] header = {"门店", "商品名称", "分类", "销售数量", "销售总额"}; String[] column = {"SHOP_NAME", "goodsName", "cateName", "COUNT", "ZK_PRICE"}; if(!DataAuthUtil.hasAllShopAuth()){ param.put("shopId", sysUsers.getShopId()); } List<Map<String, Object>> dataList = orderItemDao.summaryItemDetail(param); exportExcel(title, header,column, dataList, response); } public static void exportExcel(String title, String[] header,String[] column, List<Map<String, Object>> dataList, HttpServletResponse response) throws Exception { //这里是从数据库里查数据并组装成我们想要的数据结构的过程 List<ExcelSheetPO> res = new ArrayList<>(); ExcelSheetPO orderSheet = new ExcelSheetPO(); orderSheet.setSheetName(title); orderSheet.setTitle(title); orderSheet.setHeaders(header); List<List<Object>> list = new ArrayList<>(); if (dataList.size() > 0) { for (Map<String, Object> item : dataList) { List<Object> temp = new ArrayList<>(); Arrays.stream(column).forEach(key-> temp.add(item.get(key))); list.add(temp); } } orderSheet.setDataList(list); res.add(orderSheet); response = ResponseHeadUtil.setExcelHead(response); response.setHeader("Content-Disposition", "attachment;filename=" + java.net.URLEncoder.encode(title + DateUtil.getTimeMark() + ".xlsx".trim(), "UTF-8")); OutputStream os = response.getOutputStream(); com.matrix.core.tools.excl.ExcelUtil.createWorkbookAtOutStream(ExcelVersion.V2007, res, os, true); } } zq-erp/src/main/java/com/matrix/system/hive/statistics/ProjUseStatisticsAction.java
@@ -4,7 +4,7 @@ import com.matrix.core.pojo.AjaxResult; import com.matrix.core.tools.WebUtil; import com.matrix.system.common.bean.SysUsers; import com.matrix.system.common.constance.AppConstance; import com.matrix.system.common.tools.DataAuthUtil; import com.matrix.system.hive.dao.SysProjUseDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; /** @@ -33,12 +35,29 @@ public @ResponseBody AjaxResult showList( @RequestParam Map<String , Object> param) { SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY); if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){ param.put("shopId",sysUsers.getShopId()); if(!DataAuthUtil.hasAllShopAuth()){ param.put("shopId", sysUsers.getShopId()); } return AjaxResult.buildSuccessInstance(projUseDao.selectItemDetail(param), projUseDao.selectItemDetailTotal(param)); } @RequestMapping(value = "/exportShowList") public void exportShowList( @RequestParam Map<String , Object> param, HttpServletResponse response) throws Exception { SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY); String title = "项目剩余次数明细"; String[] header = {"客户名", "服务名称", "到期日期", "剩余次数", "单价", "项目类型", "套餐类型", "是否使用完成", "备注", "来源", "订单号"}; String[] column = {"VIP_NAME", "PROJ_NAME", "FAIL_TIME", "SURPLUS_COUNT", "PRICE", "TYPE_NAME", "type", "IS_OVER", "remark", "SOURCE", "ORDER_NO"}; if(!DataAuthUtil.hasAllShopAuth()){ param.put("shopId", sysUsers.getShopId()); } List<Map<String, Object>> dataList = projUseDao.selectItemDetail(param); OrderStatisticsAction.exportExcel(title, header,column, dataList, response); } /** * 项目剩余次数统计 @@ -47,12 +66,26 @@ public @ResponseBody AjaxResult summaryItemDetail( @RequestParam Map<String , Object> param) { SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY); if(!AppConstance.ZONGDIAN.equals(sysUsers.getShopName())){ param.put("shopId",sysUsers.getShopId()); if(!DataAuthUtil.hasAllShopAuth()){ param.put("shopId", sysUsers.getShopId()); } return AjaxResult.buildSuccessInstance(projUseDao.summaryItemDetail(param), projUseDao.summaryItemDetailTotal(param)); } @RequestMapping(value = "/exportSummaryItemDetail") public void exportSummaryItemDetail( @RequestParam Map<String , Object> param, HttpServletResponse response) throws Exception { SysUsers sysUsers = (SysUsers) WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY); String title = "项目剩余次数统计"; String[] header = {"服务名称", "项目类型", "剩余次数", "剩余消耗总额"}; String[] column = {"PROJ_NAME", "TYPE_NAME", "SURPLUS_COUNT", "PRICE"}; if(!DataAuthUtil.hasAllShopAuth()){ param.put("shopId", sysUsers.getShopId()); } List<Map<String, Object>> dataList = projUseDao.summaryItemDetail(param); OrderStatisticsAction.exportExcel(title, header,column, dataList, response); } } zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-order-item.html
@@ -121,12 +121,8 @@ }); function exportExcel(){ var select_begin = $("#select_begin").val(); var select_end = $("#select_end").val(); var select_id = $("#select_id").val(); var goodsName = $("#goodsName").val(); var guwen = $("#goodsName").val(); window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; var param=MForm.toUrlParam("#serchform"); window.location.href=basePath+"/admin/orderStatistics/exportShowList?"+param; }
@@ -102,7 +102,7 @@ function exportExcel(){ var param=MForm.toUrlParam("#serchform"); window.location.href=basePath+"/form/furnsale/exportFurn? "+param; window.location.href=basePath+"/admin/orderStatistics/exportSummaryItemDetail?"+param; }
@@ -104,18 +104,14 @@ url:basePath+"/admin/projUseStatistics/showList" }); }); function exportExcel(){ var select_begin = $("#select_begin").val(); var select_end = $("#select_end").val(); var select_id = $("#select_id").val(); var goodsName = $("#goodsName").val(); var guwen = $("#goodsName").val(); window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; var param=MForm.toUrlParam("#serchform"); window.location.href=basePath+"/admin/projUseStatistics/exportShowList?"+param; } function initFunctionList() { function initFunctionList() { $.AjaxProxy({ a: false, c: false, zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-sumary.html
@@ -73,15 +73,12 @@ url:basePath+"/admin/projUseStatistics/summaryItemDetail" }); }); function exportExcel(){ var select_begin = $("#select_begin").val(); var select_end = $("#select_end").val(); var select_id = $("#select_id").val(); var goodsName = $("#goodsName").val(); var guwen = $("#goodsName").val(); window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; } function exportExcel(){ var param=MForm.toUrlParam("#serchform"); window.location.href=basePath+"/admin/projUseStatistics/exportSummaryItemDetail?"+param; } function initFunctionList() { zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-order-item.html
@@ -111,15 +111,11 @@ url:basePath+"/admin/orderStatistics/showList" }); }); function exportExcel(){ var select_begin = $("#select_begin").val(); var select_end = $("#select_end").val(); var select_id = $("#select_id").val(); var goodsName = $("#goodsName").val(); var guwen = $("#goodsName").val(); window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; } function exportExcel(){ var param=MForm.toUrlParam("#serchform"); window.location.href=basePath+"/admin/orderStatistics/exportShowList?"+param; } function initFunctionList() { zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-order-summary.html
@@ -90,17 +90,13 @@ url:basePath+"/admin/orderStatistics/summaryItemDetail" }); }); function exportExcel(){ var select_begin = $("#select_begin").val(); var select_end = $("#select_end").val(); var select_id = $("#select_id").val(); var goodsName = $("#goodsName").val(); var guwen = $("#goodsName").val(); window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; } function exportExcel(){ var param=MForm.toUrlParam("#serchform"); window.location.href=basePath+"/admin/projUseStatistics/exportSummaryItemDetail?"+param; } function initFunctionList() { $.AjaxProxy({ a: false, zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html
@@ -104,17 +104,15 @@ url:basePath+"/admin/projUseStatistics/showList" }); }); function exportExcel(){ var select_begin = $("#select_begin").val(); var select_end = $("#select_end").val(); var select_id = $("#select_id").val(); var goodsName = $("#goodsName").val(); var guwen = $("#goodsName").val(); window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; var param=MForm.toUrlParam("#serchform"); window.location.href=basePath+"/admin/projUseStatistics/exportShowList?"+param; } function initFunctionList() { $.AjaxProxy({ a: false, zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-sumary.html
@@ -73,15 +73,12 @@ url:basePath+"/admin/projUseStatistics/summaryItemDetail" }); }); function exportExcel(){ var select_begin = $("#select_begin").val(); var select_end = $("#select_end").val(); var select_id = $("#select_id").val(); var goodsName = $("#goodsName").val(); var guwen = $("#goodsName").val(); window.location.href=basePath+"/form/furnsale/exportFurn?startTime="+select_begin+"&endTime="+select_end+"&goodsName="+goodsName+"&shopId="+select_id+"&guwen="+guwen; } function exportExcel(){ var param=MForm.toUrlParam("#serchform"); window.location.href=basePath+"/admin/projUseStatistics/exportSummaryItemDetail?"+param; } function initFunctionList() {
