From 0e928b86a1619af790abd7fb6e00b596dfb17164 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 30 Dec 2022 15:35:11 +0800
Subject: [PATCH] 20221227 充值归集
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 92 +++++++++++++++++++++++++++++++---------------
1 files changed, 62 insertions(+), 30 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 611da7c..f86db0a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -14,10 +14,7 @@
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
-import cc.mrbird.febs.mall.vo.ApiShopApplyVo;
-import cc.mrbird.febs.mall.vo.OrderDetailVo;
-import cc.mrbird.febs.mall.vo.OrderListVo;
-import cc.mrbird.febs.mall.vo.OrderRefundVo;
+import cc.mrbird.febs.mall.vo.*;
import cc.mrbird.febs.pay.model.AgreementPayDto;
import cc.mrbird.febs.pay.model.AgreementSignDto;
import cc.mrbird.febs.pay.model.UnipayDto;
@@ -103,6 +100,14 @@
throw new FebsException(goods.getGoodsName() + "已下架");
}
/**
+ * 存在未支付的订单无法下单
+ */
+ Integer orderIng = this.baseMapper.selectOrderInfoByStatusAndMemberId(OrderStatusEnum.FINISH.getValue(), mallMember.getId());
+ if(1 <= orderIng){
+ throw new FebsException("请先完成未完成的订单");
+ }
+
+ /**
* 会员一天最多下单次数
*/
DataDictionaryCustom buyTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -146,7 +151,7 @@
orderItem.setOrderId(orderInfo.getId());
orderItem.setPrice(sku.getPresentPrice());
orderItem.setGoodsId(sku.getGoodsId());
- orderItem.setGoodsName(sku.getGoodsName());
+ orderItem.setGoodsName(goods.getGoodsName());
orderItem.setSkuId(sku.getId());
orderItem.setStyleName(sku.getStyleName());
orderItem.setSkuName(sku.getSkuName());
@@ -449,18 +454,18 @@
OrderDetailVo orderDetailVo = MallOrderInfoConversion.INSTANCE.entityToDetailVo(orderInfo);
- Integer deliverType = (ObjectUtil.isEmpty(orderInfo.getDeliverType()) ? new Integer(0):orderInfo.getDeliverType());
- if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue() && 2 != deliverType) {
- MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
- orderDetailVo.setExpressNo(expressInfo.getExpressNo());
- orderDetailVo.setExpressCom(expressInfo.getExpressCom());
- }
+// Integer deliverType = (ObjectUtil.isEmpty(orderInfo.getDeliverType()) ? new Integer(0):orderInfo.getDeliverType());
+// if (orderInfo.getStatus() == OrderStatusEnum.WAIT_FINISH.getValue() && 2 != deliverType) {
+// MallExpressInfo expressInfo = expressInfoMapper.selectByOrderId(orderInfo.getId());
+// orderDetailVo.setExpressNo(expressInfo.getExpressNo());
+// orderDetailVo.setExpressCom(expressInfo.getExpressCom());
+// }
- if (orderInfo.getStatus() == OrderStatusEnum.REFUNDING.getValue() || orderInfo.getStatus() == OrderStatusEnum.REFUNDED.getValue()) {
- MallOrderRefund orderRefund = mallOrderRefundMapper.selectOrderRefundByOrderId(orderInfo.getId());
- OrderRefundVo orderRefundVo = MallOrderRefundConversion.INSTANCE.entityToVo(orderRefund);
- orderDetailVo.setOrderRefund(orderRefundVo);
- }
+// if (orderInfo.getStatus() == OrderStatusEnum.REFUNDING.getValue() || orderInfo.getStatus() == OrderStatusEnum.REFUNDED.getValue()) {
+// MallOrderRefund orderRefund = mallOrderRefundMapper.selectOrderRefundByOrderId(orderInfo.getId());
+// OrderRefundVo orderRefundVo = MallOrderRefundConversion.INSTANCE.entityToVo(orderRefund);
+// orderDetailVo.setOrderRefund(orderRefundVo);
+// }
if (OrderStatusEnum.WAIT_PAY.getValue() == orderInfo.getStatus()) {
Date endTime = DateUtil.offsetMinute(orderInfo.getOrderTime(), 15);
@@ -468,20 +473,20 @@
long remainTime = DateUtil.between(new Date(), endTime, DateUnit.SECOND, false);
orderDetailVo.setRemainTime(remainTime);
}
- if(2 == deliverType){
- MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
- if(ObjectUtil.isNotEmpty(mallShopApply)){
- ApiShopApplyVo apiShopApplyVo = new ApiShopApplyVo();
- apiShopApplyVo.setName(mallShopApply.getName());
- apiShopApplyVo.setPhone(mallShopApply.getPhone());
- apiShopApplyVo.setSaleArea(mallShopApply.getSaleArea());
- apiShopApplyVo.setLatitude(mallShopApply.getLatitude());
- apiShopApplyVo.setLongitude(mallShopApply.getLongitude());
- apiShopApplyVo.setShopName(mallShopApply.getShopName());
- apiShopApplyVo.setAddress(mallShopApply.getAddress());
- orderDetailVo.setApiShopApplyVo(apiShopApplyVo);
- }
- }
+// if(2 == deliverType){
+// MallShopApply mallShopApply = mallShopApplyMapper.selectById(orderInfo.getShopId());
+// if(ObjectUtil.isNotEmpty(mallShopApply)){
+// ApiShopApplyVo apiShopApplyVo = new ApiShopApplyVo();
+// apiShopApplyVo.setName(mallShopApply.getName());
+// apiShopApplyVo.setPhone(mallShopApply.getPhone());
+// apiShopApplyVo.setSaleArea(mallShopApply.getSaleArea());
+// apiShopApplyVo.setLatitude(mallShopApply.getLatitude());
+// apiShopApplyVo.setLongitude(mallShopApply.getLongitude());
+// apiShopApplyVo.setShopName(mallShopApply.getShopName());
+// apiShopApplyVo.setAddress(mallShopApply.getAddress());
+// orderDetailVo.setApiShopApplyVo(apiShopApplyVo);
+// }
+// }
return orderDetailVo;
}
@@ -684,4 +689,31 @@
}
}
+ @Override
+ public FebsResponse subsidyAmountInfo() {
+ MallMember member = LoginUserUtil.getLoginUser();
+ ApiMallSubsidyAmountInfoVo apiMallSubsidyAmountInfoVo = new ApiMallSubsidyAmountInfoVo();
+ DateTime today = DateUtil.date();
+ DateTime yesterday = DateUtil.yesterday();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String yyyyMMddToday = sdf.format(today);
+ String yyyyMMddYesterday = sdf.format(yesterday);
+ //今日补贴
+ BigDecimal todayAmount = this.baseMapper.selectTodayAmountByCreateTimeAndMemberId(yyyyMMddToday,member.getId());
+ apiMallSubsidyAmountInfoVo.setTodayAmount(todayAmount);
+ //累计接单
+ Integer todayTotalCnt = this.baseMapper.selectCountByCreateTimeAndMemberId(null,member.getId());
+ apiMallSubsidyAmountInfoVo.setTodayTotalCnt(todayTotalCnt);
+ //昨日补贴
+ BigDecimal yesterdayAmount = this.baseMapper.selectTodayAmountByCreateTimeAndMemberId(yyyyMMddYesterday,member.getId());
+ apiMallSubsidyAmountInfoVo.setYesterdayAmount(yesterdayAmount);
+ //昨日累计接单
+ Integer totalYesterdayCnt = this.baseMapper.selectCountByCreateTimeAndMemberId(yyyyMMddYesterday,member.getId());
+ apiMallSubsidyAmountInfoVo.setTotalYesterdayCnt(totalYesterdayCnt);
+ //获得总额
+ BigDecimal totalAmount = this.baseMapper.selectTodayAmountByCreateTimeAndMemberId(null,member.getId());
+ apiMallSubsidyAmountInfoVo.setTotalAmount(totalAmount);
+ return new FebsResponse().success().data(apiMallSubsidyAmountInfoVo);
+ }
+
}
--
Gitblit v1.9.1