winter 2 лет назад
Родитель
Сommit
58ad941bbb
4 измененных файлов: 16 добавлений и 8 удалений
  1. +1
    -2
      mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java
  3. +4
    -1
      mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java
  4. +10
    -5
      mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java

+ 1
- 2
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<Map> maplist = neuPosOrderService.queryShiftTradeList(example,pageNum,pageSize);
return new ResultData(maplist);
return neuPosOrderService.queryShiftTradeList(example,pageNum,pageSize);
}
// @GetMapping("exportShiftTradelist")


+ 1
- 0
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;



+ 4
- 1
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<Map> queryShopPayOrderListByType(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize);
PageInfo<Map> queryShiftTradeList(NeuPosShiftTradeMasterExt example,Integer pageIndex, Integer pageSize);
ResultData queryShiftTradeList(NeuPosShiftTradeMasterExt example,Integer pageIndex, Integer pageSize);
List<Map> queryShopPayOrderSum(NeuPosOrderMasterExt example);
List<Map> queryShopPayOrderSumByType(NeuPosOrderMasterExt example);


+ 10
- 5
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<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());


Загрузка…
Отмена
Сохранить