|
|
|
@@ -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<Map> queryShiftTradeList(NeuPosShiftTradeMasterExt example,Integer pageIndex, Integer pageSize) { |
|
|
|
public ResultData queryShiftTradeList(NeuPosShiftTradeMasterExt example,Integer pageIndex, Integer pageSize) { |
|
|
|
PageInfo<Map> 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<Map> 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<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { |
|
|
|
List<String> orgPayType = neuPosOrderMasterExtMapper.selectOrgPayType(example.getOrgId()); |
|
|
|
|