diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index 3bbf65b87..f04ff5add 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -98,35 +98,41 @@ public class NeuPosAdminController extends BaseController { return new ResultData(maplist); } - @ApiOperation("集团类型流水总数") - @GetMapping("payTypeOrderSum") + @GetMapping("exportPayTypeOrderlist") @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)}) - public ResultData payTypeOrderSum(@ModelAttribute NeuPosOrderMasterExt example,String tenantId) { + public void exportPayTypeOrderSum(@ModelAttribute NeuPosOrderMasterExt example,String tenantId, HttpServletRequest request, HttpServletResponse response) { if (!tenantValid(tenantId)) { - return new ResultData(Result.ERROR,"未安装POS系统"); + return; } setDate(example); example.setOrgId(24); - List maplist = neuPosOrderService.queryShopPayOrderSum(example); - return new ResultData(maplist); + PageInfo maplist = neuPosOrderService.queryShopPayOrderList(example,1,10000); + if (null != maplist && null != maplist.getList()) { + neuPosOrderService.exportData(maplist.getList(),new String[] {"支付方式","消费金额","折扣金额","消费笔数","退款金额","退款笔数","实收金额"}, + new String[] {"payTypeName","payAmount","discountAmount","payCount","refundAmount","refundCount","amount"},"pos交易汇总",new NeuPosSumDataBVo(), request, response); + } } - @GetMapping("exportPayTypeOrderSum") + + @ApiOperation("集团类型流水总数") + @GetMapping("payTypeOrderSum") @ApiImplicitParams({ @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)}) - public void exportPayTypeOrderSum(@ModelAttribute NeuPosOrderMasterExt example,String tenantId, HttpServletRequest request, HttpServletResponse response) { + public ResultData payTypeOrderSum(@ModelAttribute NeuPosOrderMasterExt example,String tenantId) { if (!tenantValid(tenantId)) { - return; + return new ResultData(Result.ERROR,"未安装POS系统"); } setDate(example); example.setOrgId(24); List maplist = neuPosOrderService.queryShopPayOrderSum(example); - if (null != maplist) { - neuPosOrderService.exportData(maplist,"pos交易汇总",new NeuPosSumDataBVo(), request, response); - } + return new ResultData(maplist); } + + @ApiOperation("流水记录") @GetMapping("orderlist") @ApiImplicitParams({ @@ -157,10 +163,10 @@ public class NeuPosAdminController extends BaseController { PageInfo maplist = neuPosOrderService.queryOrderList(example,1,60000); List payTypeMap = neuPosOrderService.selectPayTypeList(); - Map typeMap = new HashMap(); + Map typeMap = new HashMap(); for (Map payt:payTypeMap) { String payttye = (String)payt.get("pay_type"); - typeMap.put(Integer.parseInt(payttye), (String)payt.get("name")); + typeMap.put(payttye, (String)payt.get("name")); } if (null != maplist && null != maplist.getList()) { maplist.getList().parallelStream().forEach(c -> { @@ -168,7 +174,8 @@ public class NeuPosAdminController extends BaseController { c.put("payTypeName",typeMap.get(c.get("payType"))); } }); - neuPosOrderService.exportData(maplist.getList(),"pos交易明细",new NeuPosOrderDataBVo(), request, response); + neuPosOrderService.exportData(maplist.getList(),new String[] {"交易单号","POSsn","账单金额","折扣","支付方式","交易时间"}, + new String[] {"orderNumber","serialNo","orderAmount","discountAmount","payTypeName","paidTime"},"pos交易明细",new NeuPosOrderDataBVo(), request, response); } } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosOrderDataBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosOrderDataBVo.java index 3a47d4a83..009f2e86f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosOrderDataBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosOrderDataBVo.java @@ -24,7 +24,6 @@ public class NeuPosOrderDataBVo implements Serializable { @Excel(name = "交易单号", width = 20, orderNum = "1", prefix = "`") private String orderNumber; - /** 基础购买到的券信息 */ @Excel(name = "POSsn", width = 20, orderNum = "1", prefix = "`") private String serialNo; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosSumDataBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosSumDataBVo.java index fc34d1dac..5c9774a20 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosSumDataBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/NeuPosSumDataBVo.java @@ -21,26 +21,25 @@ public class NeuPosSumDataBVo implements Serializable { private static final long serialVersionUID = 6687954932922444531L; - @Excel(name = "支付方式", width = 20, orderNum = "1", prefix = "`") + @Excel(name = "支付方式", width = 20, orderNum = "1") private String payTypeName; - /** 基础购买到的券信息 */ - @Excel(name = "消费金额", width = 20, orderNum = "1", prefix = "`") + @Excel(name = "消费金额", width = 20, orderNum = "2") private String payAmount; - @Excel(name = "折扣金额", width = 50, orderNum = "2") + @Excel(name = "折扣金额", width = 50, orderNum = "3") private String discountAmount; - @Excel(name = "消费笔数", width = 50, orderNum = "2") + @Excel(name = "消费笔数", width = 50, orderNum = "4") private String payCount; - @Excel(name = "退款金额", width = 50, orderNum = "2") + @Excel(name = "退款金额", width = 50, orderNum = "5") private String refundAmount; - @Excel(name = "退款笔数", width = 50, orderNum = "2") + @Excel(name = "退款笔数", width = 50, orderNum = "6") private String refundCount; - @Excel(name = "实收金额", width = 50, orderNum = "2") + @Excel(name = "实收金额", width = 50, orderNum = "7") private String amount; // @Excel(name = "状态", width = 20, replace = {"待使用_0", "已核销_1", "已过期_2", "已退款_3"}, orderNum = "14") diff --git a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java index cbf9ff2ee..b37dd9b23 100644 --- a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java @@ -33,5 +33,5 @@ public interface NeuPosOrderService { PageInfo queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize); - void exportData(List datas,String fileName,Object voObject, HttpServletRequest request, HttpServletResponse response); + void exportData(List datas, String[] titleNames,String[] columnKeys,String fileName,Object voObject, HttpServletRequest request, HttpServletResponse response); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java index a533e5770..92b66b42e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java @@ -8,6 +8,8 @@ import com.iformall.mapper.NeuPosOrderMasterExtMapper; import com.iformall.service.ExcelService; import com.iformall.service.NeuPosOrderService; +import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; + import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; @@ -87,8 +89,19 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { } @Override - public void exportData(List datas, String fileName,Object voObject,HttpServletRequest request, HttpServletResponse response) { - excelService.exportCsv(datas, null, "", voObject.getClass(), fileName + ".csv", response, false); + public void exportData(List datas, String[] titleNames,String[] columnKeys,String fileName,Object voObject,HttpServletRequest request, HttpServletResponse response) { + //excelService.exportCsv(datas, null, "", voObject.getClass(), fileName + ".csv", response, false); + List headList = new ArrayList(); + for (int i = 0 ; i < titleNames.length; i ++) { + ExcelExportEntity ee = new ExcelExportEntity(); + ee.setName(titleNames[i]); + ee.setKey(columnKeys[i]); + ee.setWidth(20); + ee.setOrderNum(i+1); + headList.add(ee); + } + excelService.exportExcel(headList, datas, null, "sheet1", fileName+".csv", true, response); + }