From f46bb8a9b266948f27aa9a9f92ed2a16337b3f7e Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Tue, 10 Sep 2024 10:22:50 +0800 Subject: [PATCH] 9.10 --- fuintAdmin/src/api/allOrder.js | 10 + fuintAdmin/src/views/shopowner.vue | 4 +- .../controller/AllOrderInfoController.java | 13 + .../service/impl/AllOrderInfoServiceImpl.java | 694 +++++++++--------- 4 files changed, 384 insertions(+), 337 deletions(-) diff --git a/fuintAdmin/src/api/allOrder.js b/fuintAdmin/src/api/allOrder.js index 78599f1fb..87cc1919d 100644 --- a/fuintAdmin/src/api/allOrder.js +++ b/fuintAdmin/src/api/allOrder.js @@ -146,6 +146,7 @@ export function exportExcelDayApi(data) { }); } +// 油站首页核心数据 export function getTotalAmount() { return request({ url: 'business/allOrderInfo/getTotalAmount', @@ -153,3 +154,12 @@ export function getTotalAmount() { }); } +// 油站首页数据展示 +export function getDataBoard(query) { + return request({ + url: 'business/allOrderInfo/getDataBoard', + method: 'get', + params:query + }); +} + diff --git a/fuintAdmin/src/views/shopowner.vue b/fuintAdmin/src/views/shopowner.vue index ac9adc9ea..947611f7c 100644 --- a/fuintAdmin/src/views/shopowner.vue +++ b/fuintAdmin/src/views/shopowner.vue @@ -182,7 +182,7 @@ import {parseTime} from "@/utils/fuint"; import {getBannerListApi} from "@/api/sys/banner"; import {getNotificationlogList} from "@/api/sys/sysNotificationlog"; import {employeeSalesApi} from "@/api/indexStatistics"; -import {getTotalAmount} from "@/api/allOrder"; +import {getDataBoard, getTotalAmount} from "@/api/allOrder"; export default { props:["accountId"], @@ -323,7 +323,7 @@ export default { }) }, getStoreAmount(){ - storeAmountIndex(this.addDateRange(this.queryParams,this.value1)).then(res => { + getDataBoard(this.addDateRange(this.queryParams,this.value1)).then(res => { this.storeAmount = res.data this.initChart() }) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java index 6a8facf2d..d59b90410 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java @@ -287,8 +287,21 @@ public class AllOrderInfoController extends BaseController { return getSuccessResult(allOrderInfoService.getHandoverByOrderNo(allOrderInfo)); } + /** + * 油站首页 核心数据 + * @return + */ @GetMapping("getTotalAmount") public ResponseObject getTotalAmount(){ return getSuccessResult(allOrderInfoService.getTotalAmount()); } + + /** + * 油站首页 数据展示 + * @return + */ + @GetMapping("getDataBoard") + public ResponseObject getDataBoard(@RequestParam Map map){ + return getSuccessResult(allOrderInfoService.getDataBoard(map)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index 7ec15ea5a..351703a18 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -72,7 +72,7 @@ import java.util.stream.Collectors; @Service @Slf4j -public class AllOrderInfoServiceImpl extends ServiceImpl implements AllOrderInfoService { +public class AllOrderInfoServiceImpl extends ServiceImpl implements AllOrderInfoService { @Autowired private MerchantConfigService merchantConfigService; @@ -84,6 +84,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getPageList(Page page, AllOrderInfo allOrderInfo) { IPage pageList = allOrderInfoMapper.getPageList(page, allOrderInfo); @@ -94,6 +95,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getPageListByPos(Page page, AllOrderInfo allOrderInfo) { AccountInfo accountInfoByToken = TokenUtil.getNowAccountInfo(); @@ -119,9 +121,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl(); - queryWrapper.eq("order_no",orderNo); + queryWrapper.eq("order_no", orderNo); return baseMapper.selectOne(queryWrapper); } @@ -141,7 +141,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getFenxiByDailiTypeBydata(AllOrderInfo allOrderInfo) { if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) { @@ -199,11 +200,12 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getFenxiByDailiBydata(AllOrderInfo allOrderInfo) { if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) { @@ -216,7 +218,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl fenxiByDailiBydata = allOrderInfoMapper.getFenxiByDailiBydata(allOrderInfo); List fenxiByDaili2ByData = allOrderInfoMapper.getFenxiByDaili2ByData(allOrderInfo); - fenxiByDailiBydata.put("fenxiByDaili2ByData",fenxiByDaili2ByData); + fenxiByDailiBydata.put("fenxiByDaili2ByData", fenxiByDaili2ByData); return fenxiByDailiBydata; } @@ -228,6 +230,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getHandoverByOrderNo(AllOrderInfo allOrderInfo) { // 金额详情 AllOrderInfoVo runningWaterByData = allOrderInfoMapper.getHandoverByOrderNo(allOrderInfo); @@ -244,72 +247,72 @@ public class AllOrderInfoServiceImpl extends ServiceImpl res = new HashMap<>(); Map base = new HashMap<>(); - base.put("orderNo",runningWaterByData.getOrderNo()); - base.put("userId",runningWaterByData.getUserId()); - base.put("payChannel",runningWaterByData.getPayChannel()); - base.put("createTime",runningWaterByData.getCreateTime()); - base.put("payType",runningWaterByData.getPayType()); + base.put("orderNo", runningWaterByData.getOrderNo()); + base.put("userId", runningWaterByData.getUserId()); + base.put("payChannel", runningWaterByData.getPayChannel()); + base.put("createTime", runningWaterByData.getCreateTime()); + base.put("payType", runningWaterByData.getPayType()); - base.put("createBy",runningWaterByData.getCreateBy()); - base.put("status",runningWaterByData.getStatus()); - base.put("payTime",runningWaterByData.getPayTime()); - res.put("base",base); + base.put("createBy", runningWaterByData.getCreateBy()); + base.put("status", runningWaterByData.getStatus()); + base.put("payTime", runningWaterByData.getPayTime()); + res.put("base", base); // 金额详情 Map amountDetails = new HashMap<>(); - amountDetails.put("goodsMoney",runningWaterByData.getGoodsMoney()); - amountDetails.put("discountAmount",runningWaterByData.getDailyAmount()); - amountDetails.put("refMoney",runningWaterByData.getRefMoney()); - amountDetails.put("payMoney",runningWaterByData.getPayMoney()); - res.put("amountDetails",amountDetails); + amountDetails.put("goodsMoney", runningWaterByData.getGoodsMoney()); + amountDetails.put("discountAmount", runningWaterByData.getDailyAmount()); + amountDetails.put("refMoney", runningWaterByData.getRefMoney()); + amountDetails.put("payMoney", runningWaterByData.getPayMoney()); + res.put("amountDetails", amountDetails); // 会员支付详情 Map memberPayment = new HashMap<>(); - memberPayment.put("memberPayment",runningWaterByData.getGoodsMoney()); - res.put("memberPayment",memberPayment); + memberPayment.put("memberPayment", runningWaterByData.getGoodsMoney()); + res.put("memberPayment", memberPayment); // 油品信息 Map oilInfo = new HashMap<>(); if (ObjectUtil.isNotEmpty(oilInfo)) { - oilInfo.put("oilName",ObjectUtil.isNotEmpty(infoByOrderNo.getOilName())?infoByOrderNo.getOilName():"--"); - oilInfo.put("gunName",ObjectUtil.isNotEmpty(infoByOrderNo.getGunName())?infoByOrderNo.getGunName():"--"); - oilInfo.put("oilPrice",ObjectUtil.isNotEmpty(infoByOrderNo.getOilPrice())?infoByOrderNo.getOilPrice():"--"); - oilInfo.put("oilPricea",ObjectUtil.isNotEmpty(infoByOrderNo.getOilPrice())?infoByOrderNo.getOilPrice():"--"); - oilInfo.put("oilNum",ObjectUtil.isNotEmpty(infoByOrderNo.getOilNum())?infoByOrderNo.getOilNum():"--"); - oilInfo.put("payAmount",ObjectUtil.isNotEmpty(infoByOrderNo.getPayAmount())?infoByOrderNo.getPayAmount():"--"); + oilInfo.put("oilName", ObjectUtil.isNotEmpty(infoByOrderNo.getOilName()) ? infoByOrderNo.getOilName() : "--"); + oilInfo.put("gunName", ObjectUtil.isNotEmpty(infoByOrderNo.getGunName()) ? infoByOrderNo.getGunName() : "--"); + oilInfo.put("oilPrice", ObjectUtil.isNotEmpty(infoByOrderNo.getOilPrice()) ? infoByOrderNo.getOilPrice() : "--"); + oilInfo.put("oilPricea", ObjectUtil.isNotEmpty(infoByOrderNo.getOilPrice()) ? infoByOrderNo.getOilPrice() : "--"); + oilInfo.put("oilNum", ObjectUtil.isNotEmpty(infoByOrderNo.getOilNum()) ? infoByOrderNo.getOilNum() : "--"); + oilInfo.put("payAmount", ObjectUtil.isNotEmpty(infoByOrderNo.getPayAmount()) ? infoByOrderNo.getPayAmount() : "--"); } - res.put("oilInfo",memberPayment); + res.put("oilInfo", memberPayment); List> goodsInfo = new ArrayList<>(); if (ObjectUtil.isNotEmpty(goodsInfo)) { // 商品信息 for (OrderGoodsVO orderGoodsVO : infoByOrderNo1) { Map map = new HashMap<>(); - map.put("goodsName",orderGoodsVO.getGoodsName()); - map.put("retailPrice",orderGoodsVO.getGoodsName()); + map.put("goodsName", orderGoodsVO.getGoodsName()); + map.put("retailPrice", orderGoodsVO.getGoodsName()); // map.put("retailPrice",orderGoodsVO.getGoodsName()); - map.put("num",orderGoodsVO.getGoodsName()); - map.put("pay_amount",orderGoodsVO.getGoodsName()); + map.put("num", orderGoodsVO.getGoodsName()); + map.put("pay_amount", orderGoodsVO.getGoodsName()); goodsInfo.add(map); } } - res.put("goodsInfo",goodsInfo); + res.put("goodsInfo", goodsInfo); Map ref = new HashMap<>(); - ref.put("ref_money",runningWaterByData.getRefMoney()); - ref.put("ref_by",runningWaterByData.getRefBy()); - ref.put("update_by",runningWaterByData.getUpdateBy()); - ref.put("update_time",runningWaterByData.getUpdateTime()); + ref.put("ref_money", runningWaterByData.getRefMoney()); + ref.put("ref_by", runningWaterByData.getRefBy()); + ref.put("update_by", runningWaterByData.getUpdateBy()); + ref.put("update_time", runningWaterByData.getUpdateTime()); - res.put("ref",ref); + res.put("ref", ref); return res; } - public IPage getFenxiByDailiType(Page page, AllOrderInfo allOrderInfo) { + public IPage getFenxiByDailiType(Page page, AllOrderInfo allOrderInfo) { if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); allOrderInfo.setDeptId(nowAccountInfo.getDeptId()); @@ -330,9 +333,10 @@ public class AllOrderInfoServiceImpl extends ServiceImpl refund = new HashMap<>(); // try { - AllOrderInfo allOrderInfo = selectAllOrderInfoByOrderNo(map.get("orderNo")); + AllOrderInfo allOrderInfo = selectAllOrderInfoByOrderNo(map.get("orderNo")); - if (ObjectUtil.isEmpty(map.get("type"))) { - throw new RuntimeException("该订单不支持退款,无退款类别！"); - }else if ("canRefund".equals(map.get("type"))) { - // 根据订单号查询订单 - if ("APPLET_CODE".equals(allOrderInfo.getPayType())) { // 储值卡不支持退款 - throw new RuntimeException("该订单不支持退款！"); - } - // 判断是否有退款金额 && ObjectUtil.isNotEmpty(map.get("refundAmt") // 目前全退 - if (ObjectUtil.isNotEmpty(allOrderInfo.getPayMoney())) { - Integer money = (int)(allOrderInfo.getPayMoney() * 100); + if (ObjectUtil.isEmpty(map.get("type"))) { + throw new RuntimeException("该订单不支持退款,无退款类别！"); + } else if ("canRefund".equals(map.get("type"))) { + // 根据订单号查询订单 + if ("APPLET_CODE".equals(allOrderInfo.getPayType())) { // 储值卡不支持退款 + throw new RuntimeException("该订单不支持退款！"); + } + // 判断是否有退款金额 && ObjectUtil.isNotEmpty(map.get("refundAmt") // 目前全退 + if (ObjectUtil.isNotEmpty(allOrderInfo.getPayMoney())) { + Integer money = (int) (allOrderInfo.getPayMoney() * 100); - // 总金额（金钱的传值需要×100） + // 总金额（金钱的传值需要×100） // BigDecimal payMoneyBig = new BigDecimal(allOrderInfo.getPayMoney().toString()); // BigDecimal payMoneyBefBig = payMoneyBig.multiply(new BigDecimal("100")).stripTrailingZeros(); - // 退款金额(暂不支持部分退款) - BigDecimal refundAmtBig = new BigDecimal(allOrderInfo.getPayMoney()); - if (ObjectUtil.isNotEmpty(map.get("refundAmt"))){ - refundAmtBig = new BigDecimal(map.get("refundAmt")); - } - BigDecimal refundAmtBefBig = refundAmtBig.multiply(new BigDecimal("100")); - map.put("totalAmt",money.toString()); - map.put("refundAmt",refundAmtBefBig.setScale(0, RoundingMode.DOWN).toString()); + // 退款金额(暂不支持部分退款) + BigDecimal refundAmtBig = new BigDecimal(allOrderInfo.getPayMoney()); + if (ObjectUtil.isNotEmpty(map.get("refundAmt"))) { + refundAmtBig = new BigDecimal(map.get("refundAmt")); + } + BigDecimal refundAmtBefBig = refundAmtBig.multiply(new BigDecimal("100")); + map.put("totalAmt", money.toString()); + map.put("refundAmt", refundAmtBefBig.setScale(0, RoundingMode.DOWN).toString()); - map.put("orderNo",allOrderInfo.getOrderNo()); - map.put("payType",allOrderInfo.getPayType()); + map.put("orderNo", allOrderInfo.getOrderNo()); + map.put("payType", allOrderInfo.getPayType()); - // 获取机构信息 + // 获取机构信息 // if ("CASH".equals(allOrderInfo.getPayType())){ - map.putAll(getMerchantConfig(allOrderInfo)); + map.putAll(getMerchantConfig(allOrderInfo)); // } - }else { - throw new RuntimeException("退款失败，无退款金额"); - } } else { - throw new RuntimeException("该订单类型不支持退款！"); + throw new RuntimeException("退款失败，无退款金额"); } - boolean flag = false; - if (!"CASH".equals(allOrderInfo.getPayType()) && Double.valueOf(map.get("refundAmt")) > 0) { - try { - refund = fyPayService.refund(map); - } catch (Exception e) { - throw new RuntimeException(e); - } - }else { - // 现金退款处理 - refund.put("result_msg","SUCCESS"); - flag = true; + } else { + throw new RuntimeException("该订单类型不支持退款！"); + } + boolean flag = false; + if (!"CASH".equals(allOrderInfo.getPayType()) && Double.valueOf(map.get("refundAmt")) > 0) { + try { + refund = fyPayService.refund(map); + } catch (Exception e) { + throw new RuntimeException(e); } - log.info("支付返回信息{}",refund); - // 处理退款结果 - if ("SUCCESS".equals(refund.get("result_msg")) || "订单已全额退款".equals(refund.get("result_msg")) ) { - // 修改该总订单的数据 - allOrderInfo.setStatus("refund"); - allOrderInfo.setReasonRefund(map.get("refundRemark")); - allOrderInfo.setRefOrderNo(map.get("refundOrderNo")); - allOrderInfo.setRefBy(nowAccountInfo.getStaffId().toString()); - baseMapper.updateById(allOrderInfo); - // 处理油品订单 - OilOrder oilOrder = new OilOrder(); - if (ObjectUtil.isNotEmpty(map.get("isOil")) && "true".equals(map.get("isOil"))) { - oilOrder = oilOrderService.selectOilOrderByOrderNo(map.get("orderNo")); - } - - // 处理商品订单 - LJOrder ljOrder = null; - - if (ObjectUtil.isNotEmpty(map.get("isGoods")) && "true".equals(map.get("isGoods"))) { - ljOrder = ljOrderService.selectGoodsOrder(map.get("orderNo")); - } - - - // 处理收银台订单 - CashierOrder orderNo = new CashierOrder(); - - orderNo = cashierOrderService.selectCashierOrder(map.get("orderNo")); - if (ObjectUtil.isNotEmpty(orderNo)) { - orderNo.setStatus("refund"); - cashierOrderService.updateById(orderNo); - } - if (ObjectUtil.isNotEmpty(oilOrder)) { - // 判断是否推掉优惠卷 - disposeOil(oilOrder,map); - if (ObjectUtil.isNotEmpty(oilOrder.getStoreId())) { - commissionRecordService.addRefundRecord(oilOrder.getOrderNo(),"1",oilOrder.getStaffId(),oilOrder.getStoreId()); - growthValueChangeService.refundGrowthValueChange(oilOrder.getOrderNo(),oilOrder.getUserId(),oilOrder.getStoreId()); - - } - - } - if (ObjectUtil.isNotEmpty(ljOrder) ) { - disposeGoods(ljOrder,map.get("refundOrderNo")); - commissionRecordService.addRefundRecord(ljOrder.getOrderNo(),"2",ljOrder.getStaffId(),ljOrder.getStoreId()); - } - - if (flag) { - return 1;// 当前为现金支付 - } - if (!flag) { - String mchntCd = refund.get("mchnt_cd"); - merchantConfigService.subtractAmount(allOrderInfo.getStoreId(), allOrderInfo.getPayMoney().toString(),mchntCd); - - } - // 修改商户配置 - }else { - throw new RuntimeException("退款失败,请联系管理员! 失败原因："+refund.get("result_msg")); + } else { + // 现金退款处理 + refund.put("result_msg", "SUCCESS"); + flag = true; + } + log.info("支付返回信息{}", refund); + // 处理退款结果 + if ("SUCCESS".equals(refund.get("result_msg")) || "订单已全额退款".equals(refund.get("result_msg"))) { + // 修改该总订单的数据 + allOrderInfo.setStatus("refund"); + allOrderInfo.setReasonRefund(map.get("refundRemark")); + allOrderInfo.setRefOrderNo(map.get("refundOrderNo")); + allOrderInfo.setRefBy(nowAccountInfo.getStaffId().toString()); + baseMapper.updateById(allOrderInfo); + // 处理油品订单 + OilOrder oilOrder = new OilOrder(); + if (ObjectUtil.isNotEmpty(map.get("isOil")) && "true".equals(map.get("isOil"))) { + oilOrder = oilOrderService.selectOilOrderByOrderNo(map.get("orderNo")); } + // 处理商品订单 + LJOrder ljOrder = null; + + if (ObjectUtil.isNotEmpty(map.get("isGoods")) && "true".equals(map.get("isGoods"))) { + ljOrder = ljOrderService.selectGoodsOrder(map.get("orderNo")); + } + + + // 处理收银台订单 + CashierOrder orderNo = new CashierOrder(); + + orderNo = cashierOrderService.selectCashierOrder(map.get("orderNo")); + if (ObjectUtil.isNotEmpty(orderNo)) { + orderNo.setStatus("refund"); + cashierOrderService.updateById(orderNo); + } + if (ObjectUtil.isNotEmpty(oilOrder)) { + // 判断是否推掉优惠卷 + disposeOil(oilOrder, map); + if (ObjectUtil.isNotEmpty(oilOrder.getStoreId())) { + commissionRecordService.addRefundRecord(oilOrder.getOrderNo(), "1", oilOrder.getStaffId(), oilOrder.getStoreId()); + growthValueChangeService.refundGrowthValueChange(oilOrder.getOrderNo(), oilOrder.getUserId(), oilOrder.getStoreId()); + + } + + } + if (ObjectUtil.isNotEmpty(ljOrder)) { + disposeGoods(ljOrder, map.get("refundOrderNo")); + commissionRecordService.addRefundRecord(ljOrder.getOrderNo(), "2", ljOrder.getStaffId(), ljOrder.getStoreId()); + } + + if (flag) { + return 1;// 当前为现金支付 + } + if (!flag) { + String mchntCd = refund.get("mchnt_cd"); + merchantConfigService.subtractAmount(allOrderInfo.getStoreId(), allOrderInfo.getPayMoney().toString(), mchntCd); + + } + // 修改商户配置 + } else { + throw new RuntimeException("退款失败,请联系管理员! 失败原因：" + refund.get("result_msg")); + } + // } // catch (Exception e) { // e.printStackTrace(); // throw new RuntimeException("退款失败!"); // } - log.info("refund{}",refund); + log.info("refund{}", refund); return 0; } @@ -518,34 +522,35 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getMerchantConfig(AllOrderInfo allOrderInfo){ + private Map getMerchantConfig(AllOrderInfo allOrderInfo) { Map map = new HashMap<>(); // 商户机构查询 String transactionType = null; String oilGunId = null; OilOrder oilOrder = orderService.selectOilOrderByOrderNo(allOrderInfo.getOrderNo()); - if (allOrderInfo.getType().equals("1")){ + if (allOrderInfo.getType().equals("1")) { transactionType = "4"; oilGunId = oilOrder.getOilGunNum(); - }else if (allOrderInfo.getType().equals("2")){ + } else if (allOrderInfo.getType().equals("2")) { transactionType = "2"; - }else if (allOrderInfo.getType().equals("3") || allOrderInfo.getType().equals("5")){ + } else if (allOrderInfo.getType().equals("3") || allOrderInfo.getType().equals("5")) { transactionType = "1"; - }else if (allOrderInfo.getType().equals("4")){ + } else if (allOrderInfo.getType().equals("4")) { transactionType = "3"; - }else if (allOrderInfo.getType().equals("6")){ + } else if (allOrderInfo.getType().equals("6")) { transactionType = "5"; - }else if (allOrderInfo.getType().equals("8")){ - if (ObjectUtil.isNotEmpty(oilOrder)){ + } else if (allOrderInfo.getType().equals("8")) { + if (ObjectUtil.isNotEmpty(oilOrder)) { transactionType = "4"; oilGunId = oilOrder.getOilGunNum(); - }else { + } else { transactionType = "1"; } } - MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(allOrderInfo.getStoreId(),transactionType,oilGunId); + MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(allOrderInfo.getStoreId(), transactionType, oilGunId); if (ObjectUtil.isEmpty(merchantConfig)) { throw new RuntimeException("未配置商户号"); } @@ -554,9 +559,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl map) { + private void disposeOil(OilOrder oilOrder, Map map) { // map.get("refundOrderNo") // map.get("isOilVouchers") @@ -593,7 +598,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getOrderInfo(String orderNo, String type) { - Map res = new HashMap<>(); + public Map getOrderInfo(String orderNo, String type) { + Map res = new HashMap<>(); // 处理油品订单 OilOrder oilOrder = oilOrderService.selectOilOrderByOrderNo(orderNo); // 处理商品订单 LJOrder ljOrder = ljOrderService.selectGoodsOrder(orderNo); CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo); - res.put("type","0"); + res.put("type", "0"); if ("oil".equals(type)) { if (ObjectUtil.isNotEmpty(ljOrder)) { - res.put("money",cashierOrder.getPayAmount().toString()); - res.put("type","1"); + res.put("money", cashierOrder.getPayAmount().toString()); + res.put("type", "1"); } - }else if ("goods".equals(type)) { + } else if ("goods".equals(type)) { if (ObjectUtil.isNotEmpty(oilOrder)) { - res.put("money",cashierOrder.getPayAmount().toString()); - res.put("type","1"); + res.put("money", cashierOrder.getPayAmount().toString()); + res.put("type", "1"); } } return res; @@ -683,7 +689,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl sysDepts = sysDeptMapper.selectChildrenDeptById2(new Page(1,10000),nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(),allOrderInfo.getDeptType()); + IPage sysDepts = sysDeptMapper.selectChildrenDeptById2(new Page(1, 10000), nowAccountInfo.getDeptId(), allOrderInfo.getDeptId(), allOrderInfo.getDeptType()); if (ObjectUtil.isEmpty(sysDepts.getRecords())) { throw new RuntimeException("组织下没有油站！"); @@ -713,7 +719,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl sysDepts = sysDeptMapper.selectChildrenDeptById2( new Page(1,10000),nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(),allOrderInfo.getDeptType()); + IPage sysDepts = sysDeptMapper.selectChildrenDeptById2(new Page(1, 10000), nowAccountInfo.getDeptId(), allOrderInfo.getDeptId(), allOrderInfo.getDeptType()); if (ObjectUtil.isEmpty(sysDepts.getRecords())) { throw new RuntimeException("组织下没有油站！"); @@ -734,9 +740,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl pageList = allOrderInfoMapper.getTradingPage(page, allOrderInfo); for (AllOrderInfoVo record : pageList.getRecords()) { MtStore mtStore = storeService.queryStoreById3(record.getStoreId()); @@ -744,47 +747,47 @@ public class AllOrderInfoServiceImpl extends ServiceImpl runningWaterByInstituion(Page page, AllOrderInfoDto allOrderInfo) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); IPage sysDepts = new Page<>(); if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) { - sysDepts = sysDeptMapper.selectChildrenDeptById2( page,nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(),allOrderInfo.getDeptType()); - }else { + sysDepts = sysDeptMapper.selectChildrenDeptById2(page, nowAccountInfo.getDeptId(), allOrderInfo.getDeptId(), allOrderInfo.getDeptType()); + } else { SysDeptVo sysDept = sysDeptMapper.selectDeptByIdVo(nowAccountInfo.getDeptId()); List ssysDept = new ArrayList<>(); ssysDept.add(sysDept); @@ -876,7 +879,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl store = new ArrayList<>(); @@ -892,13 +895,13 @@ public class AllOrderInfoServiceImpl extends ServiceImpl runningWaterByInstituion2(Page page, AllOrderInfoDto allOrderInfo) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); allOrderInfo.setStoreId(nowAccountInfo.getStoreId()); - return allOrderInfoMapper.runningWaterByInstituion2(page,allOrderInfo); + return allOrderInfoMapper.runningWaterByInstituion2(page, allOrderInfo); } public void runningWaterByTissueExportExcel(HttpServletResponse response, AllOrderInfoDto order) { @@ -935,10 +938,10 @@ public class AllOrderInfoServiceImpl extends ServiceImpl runningWaterByNone(Page page, AllOrderInfoDto allOrderInfo) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); allOrderInfo.setDeptType("3"); - IPage sysDepts = sysDeptMapper.selectChildrenDeptById2( page,nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(),allOrderInfo.getDeptType()); + IPage sysDepts = sysDeptMapper.selectChildrenDeptById2(page, nowAccountInfo.getDeptId(), allOrderInfo.getDeptId(), allOrderInfo.getDeptType()); List sysDeptVos = new ArrayList<>(); for (SysDeptVo sysDept : sysDepts.getRecords()) { long dayNum = 0; @@ -989,7 +992,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl store = new ArrayList<>(); @@ -997,13 +1000,13 @@ public class AllOrderInfoServiceImpl extends ServiceImpl sysDepts = sysDeptMapper.selectChildrenDeptByIdStore(nowAccountInfo.getDeptId()); allOrderInfo.setStoreIds(sysDepts.stream().map(SysDeptVo::getStoreId).collect(Collectors.toList())); - }else { + } else { ArrayList longs = new ArrayList<>(); longs.add(Long.parseLong(nowAccountInfo.getStoreId().toString())); allOrderInfo.setStoreIds(longs); @@ -1043,7 +1046,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl runningWaterByDay = allOrderInfoMapper.getRunningWaterByDay(page,allOrderInfo); + IPage runningWaterByDay = allOrderInfoMapper.getRunningWaterByDay(page, allOrderInfo); return runningWaterByDay; @@ -1081,7 +1083,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl sysDepts = sysDeptMapper.selectChildrenDeptByIdStore(nowAccountInfo.getDeptId()); allOrderInfo.setStoreIds(sysDepts.stream().map(SysDeptVo::getStoreId).collect(Collectors.toList())); - }else { + } else { ArrayList longs = new ArrayList<>(); longs.add(Long.parseLong(nowAccountInfo.getStoreId().toString())); allOrderInfo.setStoreIds(longs); @@ -1093,7 +1095,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl sysDepts = new Page<>(); if (ObjectUtil.isEmpty(allOrderInfo.getDeptId())) { - sysDepts = sysDeptMapper.selectChildrenDeptById2( page,nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(),allOrderInfo.getDeptType()); - }else { + sysDepts = sysDeptMapper.selectChildrenDeptById2(page, nowAccountInfo.getDeptId(), allOrderInfo.getDeptId(), allOrderInfo.getDeptType()); + } else { SysDeptVo sysDept = sysDeptMapper.selectDeptByIdVo(nowAccountInfo.getDeptId()); List ssysDept = new ArrayList<>(); ssysDept.add(sysDept); @@ -1174,7 +1175,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl store = new ArrayList<>(); @@ -1190,22 +1191,22 @@ public class AllOrderInfoServiceImpl extends ServiceImpl runningWaterByTissue(Page page, AllOrderInfoDto allOrderInfo) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); - IPage sysDepts = sysDeptMapper.selectChildrenDeptById2(page, nowAccountInfo.getDeptId(),allOrderInfo.getDeptId(), allOrderInfo.getDeptType()); + IPage sysDepts = sysDeptMapper.selectChildrenDeptById2(page, nowAccountInfo.getDeptId(), allOrderInfo.getDeptId(), allOrderInfo.getDeptType()); return sysDepts; } - - - - @Override - public AllOrderInfoVo getIndexData4Pos(){ + public AllOrderInfoVo getIndexData4Pos() { AllOrderInfoDto allOrderInfoDto = new AllOrderInfoDto(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); allOrderInfoDto.setStoreId(nowAccountInfo.getStoreId()); @@ -1254,7 +1251,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl longs = new ArrayList<>(); @@ -1276,15 +1273,15 @@ public class AllOrderInfoServiceImpl extends ServiceImpl map,List storeIds) { + public Integer selectStoreTotal(Map map, List storeIds) { String startTime = map.get("startTime"); String endTime = map.get("endTime"); QueryWrapper queryWrapper = new QueryWrapper<>(); - if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){ - queryWrapper.apply(true,"create_time BETWEEN '" + startTime + "' and '" + endTime + "'"); + if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)) { + queryWrapper.apply(true, "create_time BETWEEN '" + startTime + "' and '" + endTime + "'"); } - if (ObjectUtil.isNotEmpty(storeIds)){ - queryWrapper.in("store_id",storeIds); + if (ObjectUtil.isNotEmpty(storeIds)) { + queryWrapper.in("store_id", storeIds); } queryWrapper.groupBy("store_id"); queryWrapper.orderByDesc("create_time"); @@ -1295,18 +1292,18 @@ public class AllOrderInfoServiceImpl extends ServiceImpl map,List storeIds,List types) { + public Integer selectProportion(Map map, List storeIds, List types) { String startTime = map.get("startTime"); String endTime = map.get("endTime"); QueryWrapper queryWrapper = new QueryWrapper<>(); - if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){ - queryWrapper.apply(true,"create_time BETWEEN '" + startTime + "' and '" + endTime + "'"); + if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)) { + queryWrapper.apply(true, "create_time BETWEEN '" + startTime + "' and '" + endTime + "'"); } - if (ObjectUtil.isNotEmpty(storeIds)){ - queryWrapper.in("store_id",storeIds); + if (ObjectUtil.isNotEmpty(storeIds)) { + queryWrapper.in("store_id", storeIds); } - if (ObjectUtil.isNotEmpty(types)){ - queryWrapper.in("type",types); + if (ObjectUtil.isNotEmpty(types)) { + queryWrapper.in("type", types); } List allOrderInfos = baseMapper.selectList(queryWrapper); Integer row = 0; @@ -1322,9 +1319,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl(); - if (ObjectUtil.isNotEmpty(storeIds)){ - queryWrapper.in("store_id",storeIds); + if (ObjectUtil.isNotEmpty(storeIds)) { + queryWrapper.in("store_id", storeIds); } if (ObjectUtil.isNotEmpty(allOrderInfoVo.getParams()) && ObjectUtil.isNotEmpty(allOrderInfoVo.getParams().get("beginTime")) - && ObjectUtil.isNotEmpty(allOrderInfoVo.getParams().get("endTime"))){ - queryWrapper.apply(true,"create_time BETWEEN '" + allOrderInfoVo.getParams().get("beginTime") + "' and '" + allOrderInfoVo.getParams().get("endTime") + "'"); + && ObjectUtil.isNotEmpty(allOrderInfoVo.getParams().get("endTime"))) { + queryWrapper.apply(true, "create_time BETWEEN '" + allOrderInfoVo.getParams().get("beginTime") + "' and '" + allOrderInfoVo.getParams().get("endTime") + "'"); } Integer tradeTotal = ObjectUtil.isNotEmpty(baseMapper.selectCount(queryWrapper)) ? baseMapper.selectCount(queryWrapper) : 0; List list = this.listObjs(queryWrapper.select("pay_money")); Double tradeAmount = 0.0; if (!list.isEmpty()) { - for (Object payMoney: list) { + for (Object payMoney : list) { tradeAmount += Double.valueOf(payMoney.toString()); } } allOrderInfoVo.setStatus("refund"); - if (ObjectUtil.isNotEmpty(allOrderInfoVo.getStatus())){ - queryWrapper.eq("status",allOrderInfoVo.getStatus()); + if (ObjectUtil.isNotEmpty(allOrderInfoVo.getStatus())) { + queryWrapper.eq("status", allOrderInfoVo.getStatus()); } Integer refundTotal = ObjectUtil.isNotEmpty(baseMapper.selectCount(queryWrapper)) ? baseMapper.selectCount(queryWrapper) : 0; List list1 = this.listObjs(queryWrapper.select("pay_money")); Double refundAmount = 0.0; if (!list1.isEmpty()) { - for (Object payMoney: list1) { + for (Object payMoney : list1) { refundAmount += Double.valueOf(payMoney.toString()); } } @@ -1370,7 +1367,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl oilOrderVos = orderService.selectProportion(map1, storeIds); - map.put("tradeTotal",tradeTotal); - map.put("tradeAmount",tradeAmount > 0 ? df.format(tradeAmount) : 0); - map.put("refundTotal",refundTotal); - map.put("refundAmount",refundAmount > 0 ? df.format(refundAmount) : 0); - map.put("averagePrice",averagePrice > 0 ? df.format(averagePrice) : 0); - map.put("dayTradeAmount",dayTradeAmount > 0 ? df.format(dayTradeAmount) : 0); - map.put("dayTradeTotal",dayTradeTotal); - map.put("storeTotal",storeTotal); - map.put("oilNum",oilNum); - map.put("noOilNum",noOilNum); - map.put("userNum",userNum); - map.put("integralNum",integralNum); - map.put("goodNum",goodNum); - map.put("oilNameList",oilOrderVos); + map.put("tradeTotal", tradeTotal); + map.put("tradeAmount", tradeAmount > 0 ? df.format(tradeAmount) : 0); + map.put("refundTotal", refundTotal); + map.put("refundAmount", refundAmount > 0 ? df.format(refundAmount) : 0); + map.put("averagePrice", averagePrice > 0 ? df.format(averagePrice) : 0); + map.put("dayTradeAmount", dayTradeAmount > 0 ? df.format(dayTradeAmount) : 0); + map.put("dayTradeTotal", dayTradeTotal); + map.put("storeTotal", storeTotal); + map.put("oilNum", oilNum); + map.put("noOilNum", noOilNum); + map.put("userNum", userNum); + map.put("integralNum", integralNum); + map.put("goodNum", goodNum); + map.put("oilNameList", oilOrderVos); return map; } @@ -1450,9 +1447,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl(); - if (ObjectUtil.isNotEmpty(storeIds)){ - queryWrapper.in("store_id",storeIds); + if (ObjectUtil.isNotEmpty(storeIds)) { + queryWrapper.in("store_id", storeIds); } if (ObjectUtil.isNotEmpty(allOrderInfoVo.getParams()) && ObjectUtil.isNotEmpty(allOrderInfoVo.getParams().get("beginTime")) - && ObjectUtil.isNotEmpty(allOrderInfoVo.getParams().get("endTime"))){ - queryWrapper.apply(true,"create_time BETWEEN '" + allOrderInfoVo.getParams().get("beginTime") + "' and '" + allOrderInfoVo.getParams().get("endTime") + "'"); + && ObjectUtil.isNotEmpty(allOrderInfoVo.getParams().get("endTime"))) { + queryWrapper.apply(true, "create_time BETWEEN '" + allOrderInfoVo.getParams().get("beginTime") + "' and '" + allOrderInfoVo.getParams().get("endTime") + "'"); } Integer tradeTotal = ObjectUtil.isNotEmpty(baseMapper.selectCount(queryWrapper)) ? baseMapper.selectCount(queryWrapper) : 0; List list = this.listObjs(queryWrapper.select("pay_money")); Double tradeAmount = 0.0; if (!list.isEmpty()) { - for (Object payMoney: list) { + for (Object payMoney : list) { tradeAmount += Double.valueOf(payMoney.toString()); } } allOrderInfoVo.setStatus("refund"); - if (ObjectUtil.isNotEmpty(allOrderInfoVo.getStatus())){ - queryWrapper.eq("status",allOrderInfoVo.getStatus()); + if (ObjectUtil.isNotEmpty(allOrderInfoVo.getStatus())) { + queryWrapper.eq("status", allOrderInfoVo.getStatus()); } Integer refundTotal = ObjectUtil.isNotEmpty(baseMapper.selectCount(queryWrapper)) ? baseMapper.selectCount(queryWrapper) : 0; List list1 = this.listObjs(queryWrapper.select("pay_money")); Double refundAmount = 0.0; if (!list1.isEmpty()) { - for (Object payMoney: list1) { + for (Object payMoney : list1) { refundAmount += Double.valueOf(payMoney.toString()); } } - Double averagePrice = tradeAmount/tradeTotal; + Double averagePrice = tradeAmount / tradeTotal; DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); Double dayTradeAmount = 0.0; @@ -1504,14 +1501,14 @@ public class AllOrderInfoServiceImpl extends ServiceImpl 0 ? df.format(tradeAmount) : 0); - map.put("refundTotal",refundTotal); - map.put("refundAmount",refundAmount > 0 ? df.format(refundAmount) : 0); - map.put("averagePrice",averagePrice > 0 ? df.format(averagePrice) : 0); - map.put("dayTradeAmount",dayTradeAmount > 0 ? df.format(dayTradeAmount) : 0); - map.put("dayTradeTotal",dayTradeTotal); - map.put("storeTotal",storeTotal); - map.put("noStoreTotal",allTotal - storeTotal); - map.put("addStoreTotal",monthTotal); - map.put("noAddStoreTotal",allTotal - monthTotal); - map.put("weekStoreTotal",weekTotal); - map.put("noWeekStoreTotal",allTotal - weekTotal); - map.put("fuYouAmount",fuYouAmount); - map.put("laKaLaAmount",laKaLaAmount); + map.put("tradeTotal", tradeTotal); + map.put("tradeAmount", tradeAmount > 0 ? df.format(tradeAmount) : 0); + map.put("refundTotal", refundTotal); + map.put("refundAmount", refundAmount > 0 ? df.format(refundAmount) : 0); + map.put("averagePrice", averagePrice > 0 ? df.format(averagePrice) : 0); + map.put("dayTradeAmount", dayTradeAmount > 0 ? df.format(dayTradeAmount) : 0); + map.put("dayTradeTotal", dayTradeTotal); + map.put("storeTotal", storeTotal); + map.put("noStoreTotal", allTotal - storeTotal); + map.put("addStoreTotal", monthTotal); + map.put("noAddStoreTotal", allTotal - monthTotal); + map.put("weekStoreTotal", weekTotal); + map.put("noWeekStoreTotal", allTotal - weekTotal); + map.put("fuYouAmount", fuYouAmount); + map.put("laKaLaAmount", laKaLaAmount); return map; } @@ -1548,47 +1545,47 @@ public class AllOrderInfoServiceImpl extends ServiceImpl(); - if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){ - queryWrapper.apply(true,"create_time BETWEEN '" + startTime + "' and '" + endTime + "'"); + if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)) { + queryWrapper.apply(true, "create_time BETWEEN '" + startTime + "' and '" + endTime + "'"); } - if (ObjectUtil.isNotEmpty(storeId)){ - queryWrapper.eq("store_id",storeId); + if (ObjectUtil.isNotEmpty(storeId)) { + queryWrapper.eq("store_id", storeId); } - if (ObjectUtil.isNotEmpty(types)){ - queryWrapper.in("type",types); + if (ObjectUtil.isNotEmpty(types)) { + queryWrapper.in("type", types); } queryWrapper.select("SUM(pay_money) as payMoney"); AllOrderInfo allOrderInfo = baseMapper.selectOne(queryWrapper); Double payMoney = 0.0; - if (ObjectUtil.isNotEmpty(allOrderInfo) && ObjectUtil.isNotEmpty(allOrderInfo.getPayMoney())){ + if (ObjectUtil.isNotEmpty(allOrderInfo) && ObjectUtil.isNotEmpty(allOrderInfo.getPayMoney())) { payMoney = allOrderInfo.getPayMoney(); } return payMoney; } @Override - public Map getSumAndNum(AllOrderInfo allOrderInfo,Map map1) { + public Map getSumAndNum(AllOrderInfo allOrderInfo, Map map1) { String startTime = map1.get("startTime"); String endTime = map1.get("endTime"); Map map = new HashMap<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("status","paid"); - queryWrapper.eq("store_id",TokenUtil.getNowAccountInfo().getStoreId()); - if (ObjectUtil.isNotEmpty(allOrderInfo.getType())){ - queryWrapper.eq("type",allOrderInfo.getType()); + queryWrapper.eq("status", "paid"); + queryWrapper.eq("store_id", TokenUtil.getNowAccountInfo().getStoreId()); + if (ObjectUtil.isNotEmpty(allOrderInfo.getType())) { + queryWrapper.eq("type", allOrderInfo.getType()); } - if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)){ - queryWrapper.apply(true,"create_time BETWEEN '" + startTime + "' and '" + endTime + "'"); + if (ObjectUtil.isNotEmpty(startTime) && ObjectUtil.isNotEmpty(endTime)) { + queryWrapper.apply(true, "create_time BETWEEN '" + startTime + "' and '" + endTime + "'"); } Integer allNum = baseMapper.selectCount(queryWrapper); queryWrapper.select("SUM(pay_money) as payMoney"); AllOrderInfo allOrderInfo1 = baseMapper.selectOne(queryWrapper); Double payMoney = 0.0; - if (ObjectUtil.isNotEmpty(allOrderInfo1) && ObjectUtil.isNotEmpty(allOrderInfo1.getPayMoney())){ + if (ObjectUtil.isNotEmpty(allOrderInfo1) && ObjectUtil.isNotEmpty(allOrderInfo1.getPayMoney())) { payMoney = allOrderInfo1.getPayMoney(); } - map.put("payMoney",payMoney); - map.put("allNum",allNum); + map.put("payMoney", payMoney); + map.put("allNum", allNum); return map; } @@ -1604,17 +1601,17 @@ public class AllOrderInfoServiceImpl extends ServiceImpl sumAndNum = getSumAndNum(new AllOrderInfo(),new HashMap<>()); + Map sumAndNum = getSumAndNum(new AllOrderInfo(), new HashMap<>()); allAmount = Double.valueOf(sumAndNum.get("payMoney").toString()); allNum = Integer.valueOf(sumAndNum.get("allNum").toString()); - BigDecimal bd = BigDecimal.valueOf(allAmount/allNum).setScale(2, RoundingMode.HALF_UP); + BigDecimal bd = BigDecimal.valueOf(allAmount / allNum).setScale(2, RoundingMode.HALF_UP); unitPrice = bd.doubleValue(); userBalance = userBalanceService.selectAllBalance(TokenUtil.getNowAccountInfo().getStoreId()); - map.put("allAmount",allAmount); - map.put("allNum",allNum); - map.put("unitPrice",unitPrice); - map.put("userBalance",userBalance); + map.put("allAmount", allAmount); + map.put("allNum", allNum); + map.put("unitPrice", unitPrice); + map.put("userBalance", userBalance); return map; } @@ -1622,19 +1619,44 @@ public class AllOrderInfoServiceImpl extends ServiceImpl getDataBoard(Map map) { Map map1 = new HashMap<>(); // 油品销售金额 + Double oilAmount = 0.0; // 油品交易笔数 + Integer oilNum = 0; // 会员充值金额 + Double userRechargeAmount = 0.0; // 会员充值笔数 + Integer userRechargeNum = 0; // 便利店销售金额 -// 交易笔数 + Double minimartAmount = 0.0; +// 便利店交易笔数 + Integer minimartNum = 0; // 积分商城销售金额 -// 兑换笔数 + Double pointMallAmount = 0.0; +// 积分商城兑换笔数 + Integer pointMallNum = 0; // 非油品交易占比 + Integer noOilNum = 0; + + AllOrderInfo allOrderInfo = new AllOrderInfo(); + allOrderInfo.setType("1"); + Map sumAndNum = getSumAndNum(allOrderInfo, map); + oilAmount = Double.valueOf(sumAndNum.get("payMoney").toString()); + oilNum = Integer.valueOf(sumAndNum.get("allNum").toString()); + + map1.put("oilAmount", oilAmount); + map1.put("oilNum", oilNum); + map1.put("userRechargeAmount", userRechargeAmount); + map1.put("userRechargeNum", userRechargeNum); + map1.put("minimartAmount", minimartAmount); + map1.put("minimartNum", minimartNum); + map1.put("pointMallAmount", pointMallAmount); + map1.put("pointMallNum", pointMallNum); + map1.put("noOilNum", noOilNum); return map1; } - private long dayCount(String beginTimeStr, String endTimeStr ) { + private long dayCount(String beginTimeStr, String endTimeStr) { // 将字符串表示的时间转换成 LocalDate 对象 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/M/d"); LocalDate beginDate = LocalDate.parse(beginTimeStr, formatter); @@ -1643,13 +1665,15 @@ public class AllOrderInfoServiceImpl extends ServiceImpl