From 26a4fd62144845a79d93a815eb3d94612af78811 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 8 Apr 2024 16:27:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E5=AD=97=E6=AE=B5=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/order/TbOrderInfoServiceImpl.java | 62 ++++++++----------- 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java index bde1fda4..7b3b2044 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java @@ -112,11 +112,11 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { Long end = Instant.now().toEpochMilli(); if (!CollectionUtils.isEmpty(createdAt)) { if (createdAt.get(0) > createdAt.get(1)) { - start=createdAt.get(1); - end=createdAt.get(0); - }else { - start=createdAt.get(0); - end=createdAt.get(1); + start = createdAt.get(1); + end = createdAt.get(0); + } else { + start = createdAt.get(0); + end = createdAt.get(1); } } List payCountVoList = tbOrderInfoRepository.queryTbOrderPayCount(criteria.getShopId(), start, end); @@ -164,6 +164,26 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { TbOrderInfo tbOrderInfo = tbOrderInfoRepository.findById(id).orElseGet(TbOrderInfo::new); ValidationUtil.isNull(tbOrderInfo.getId(), "TbOrderInfo", "id", id); TbOrderInfoDto dto = tbOrderInfoMapper.toDto(tbOrderInfo); + if (StringUtils.isNotBlank(dto.getPayType())) { + switch (dto.getPayType()) { + case "scanCode": + dto.setPayType("扫码支付"); + break; + case "cash": + dto.setPayType("现金"); + break; + case "wx_lite": + dto.setPayType("微信小程序支付"); + break; + default: + dto.setPayType(tbOrderInfo.getSendType()); + break; + } + }else { + if (dto.getStatus().equals("refund")) { + dto.setPayType("退单"); + } + } List details = tbOrderDetailRepository.searchDetailByOrderId(tbOrderInfo.getId()); dto.setIsRefund(0); BigDecimal refundAmount = BigDecimal.ZERO; @@ -298,38 +318,6 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService { map.put("状态", tbOrderInfo.getStatus()); map.put("创建日期", DateUtil.timeStampFormatyMdHms(tbOrderInfo.getCreatedAt())); map.put("备注", tbOrderInfo.getRemark()); -// -// map.put("商户结算金额", tbOrderInfo.getSettlementAmount()); -// map.put("包装费", tbOrderInfo.getPackFee()); -// map.put("商品售价", tbOrderInfo.getProductAmount()); -// map.put("最终金额---退单后，金额变动", tbOrderInfo.getAmount()); -// map.put("订单邮递费用", tbOrderInfo.getFreightAmount()); -// map.put("折扣金额", tbOrderInfo.getDiscountAmount()); -// map.put("台桌Id", tbOrderInfo.getTableId()); -// map.put("订单抹零", tbOrderInfo.getSmallChange()); -// map.put("订单里面商品的类型", tbOrderInfo.getProductType()); -// map.put("orderType为union-minor时，parentId生效，为其上级合单id", tbOrderInfo.getBillingId()); -// map.put("对于平台订单,是收款商户Id", tbOrderInfo.getMerchantId()); -// map.put("店铺Id", tbOrderInfo.getShopId()); -// map.put("是否vip订单", tbOrderInfo.getIsVip()); -// map.put("商户会员Id", tbOrderInfo.getMemberId()); -// map.put("用户Id", tbOrderInfo.getUserId()); -// map.put("该订单商品赠送的积分", tbOrderInfo.getProductScore()); -// map.put("抵扣积分", tbOrderInfo.getDeductScore()); -// map.put("用户使用的卡券", tbOrderInfo.getUserCouponId()); -// map.put("优惠券抵扣金额", tbOrderInfo.getUserCouponAmount()); -// map.put("如果为退单时，主单号", tbOrderInfo.getMasterId()); -// map.put("是否支持退款，1支持退单， 0不支持退单", tbOrderInfo.getRefundAble()); -// map.put("支付时间", tbOrderInfo.getPaidTime()); -// map.put("是否生效，若订单合单之后，则原订单不会生效", tbOrderInfo.getIsEffect()); -// map.put("是否合台", tbOrderInfo.getIsGroup()); -// map.put("更新日期", tbOrderInfo.getUpdatedAt()); -// map.put("系统时间", tbOrderInfo.getSystemTime()); -// map.put("收银台是否已接单", tbOrderInfo.getIsAccepted()); -// map.put("折扣比例", tbOrderInfo.getDiscountRatio()); -// map.put("支付订单号", tbOrderInfo.getPayOrderNo()); -// map.put("tradeDay", tbOrderInfo.getTradeDay()); -// map.put("原订单", tbOrderInfo.getSource()); list.add(map); } FileUtil.downloadExcel(list, response);