From 58ad941bbbc5302fb55344def45c11a8e81bb80e Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 22 Jan 2024 21:38:54 +0800 Subject: [PATCH] fix --- .../controller/NeuPosAdminController.java | 3 +-- .../mapper/NeuPosOrderMasterExtMapper.java | 1 + .../com/iformall/service/NeuPosOrderService.java | 5 ++++- .../service/impl/NeuPosOrderServiceImpl.java | 15 ++++++++++----- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index 80c99c7e5..c953190bd 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -301,8 +301,7 @@ public class NeuPosAdminController extends BaseController { return new ResultData(Result.ERROR,"请选择时间区间"); } example.setOrgId(24); - PageInfo maplist = neuPosOrderService.queryShiftTradeList(example,pageNum,pageSize); - return new ResultData(maplist); + return neuPosOrderService.queryShiftTradeList(example,pageNum,pageSize); } // @GetMapping("exportShiftTradelist") diff --git a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java index 1bd728124..1f5842fca 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java @@ -8,6 +8,7 @@ import com.iformall.domain.po.NeuPosShiftTradeMasterExt; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; import java.util.Map; diff --git a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java index 9683af47e..6b1d01218 100644 --- a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java @@ -1,12 +1,15 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; import com.iformall.domain.dto.NeuPosUpdatePayDto; import com.iformall.domain.po.NeuPosOrderMasterExt; import com.iformall.domain.po.NeuPosShiftTradeMasterExt; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -21,7 +24,7 @@ public interface NeuPosOrderService { PageInfo queryShopPayOrderListByType(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize); - PageInfo queryShiftTradeList(NeuPosShiftTradeMasterExt example,Integer pageIndex, Integer pageSize); + ResultData queryShiftTradeList(NeuPosShiftTradeMasterExt example,Integer pageIndex, Integer pageSize); List queryShopPayOrderSum(NeuPosOrderMasterExt example); List queryShopPayOrderSumByType(NeuPosOrderMasterExt example); 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 e8d894d76..3689043eb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; import com.iformall.domain.dto.NeuPosUpdatePayDto; import com.iformall.domain.po.NeuPosOrderMasterExt; import com.iformall.domain.po.NeuPosShiftTradeMasterExt; @@ -73,10 +74,10 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { } @Override - public PageInfo queryShiftTradeList(NeuPosShiftTradeMasterExt example,Integer pageIndex, Integer pageSize) { + public ResultData queryShiftTradeList(NeuPosShiftTradeMasterExt example,Integer pageIndex, Integer pageSize) { PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> neuPosOrderMasterExtMapper.queryShiftTradeList(example)); if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) { - return pageInfo; + return new ResultData(); } List payOrderList = pageInfo.getList(); @@ -97,7 +98,7 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { payTypeList.add(Integer.parseInt(payttye)); } } - + BigDecimal totalAmount = new BigDecimal("0.00"); for (Map payOrder:payOrderList ) { String createBy = payOrder.get("username").toString(); Date loginTime = DateUtils.stringToDate(payOrder.get("loginTime").toString(),DateUtils.DATE_TIME_PATTERN); @@ -131,10 +132,14 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { payOrder.put("amountAM", currentUserMap.get("amPaidAmount").toString()); payOrder.put("amountPM", currentUserMap.get("pmPaidAmount").toString()); payOrder.put("totalAmount", currentUserMap.get("paidAmount").toString()); + totalAmount = totalAmount.add(new BigDecimal(currentUserMap.get("paidAmount").toString())); } - return pageInfo; + Map retMap = new HashMap(); + retMap.put("pageInfo", pageInfo); + retMap.put("total", totalAmount.toString()); + return new ResultData(retMap); } - + @Override public PageInfo queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { List orgPayType = neuPosOrderMasterExtMapper.selectOrgPayType(example.getOrgId());