From c7748fcd810efee6ed3aded415087e6cf9e638e8 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 29 十一月 2022 15:41:44 +0800
Subject: [PATCH] #feat .
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
index e66fb06..6eb64a9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
@@ -387,6 +387,24 @@
orderVo.setComShopFlowerEvaluateVO(comShopFlowerEvaluateVO);
}
}
+
+ //判断是否可以退款 订单是否已超过15天 是否已有退款订单
+ int count = comShopFlowerRefundOrderDAO.selectCountRefundNowByOrderId(orderVo.getOrderId());
+ if (count > 0){
+ orderVo.setRefundable(2);
+ }else {
+ if (null == orderVo.getReceivingTime()){
+ orderVo.setRefundable(2);
+ }else {
+ //收货时间往前推15天和当前时间做比较
+ Date date = DateUtils.addDay(orderVo.getReceivingTime(), 15);
+ if(date.before(new Date())){
+ orderVo.setRefundable(2);
+ }
+ }
+ }
+
+
});
}
return R.ok(orderPageVOIPage);
@@ -409,7 +427,7 @@
//查询自提点信息
ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectOne(new LambdaQueryWrapper<ConvenientElevatingPointDO>().eq(ConvenientElevatingPointDO::getWechatAccount, phone));
if (isNull(convenientElevatingPointDO)) {
- return R.fail("自提点不存在");
+ return R.ok();
}
Long pointDOId = convenientElevatingPointDO.getId();
shopOrderDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopFlowerOrderDO>().eq(ComShopFlowerOrderDO::getId, orderId).eq(ComShopFlowerOrderDO::getPointId, pointDOId));
@@ -989,8 +1007,8 @@
Map<String, Integer> retMap = new HashMap<>();
int amountTotal = 0;
for (int i = 0; i < statusStr.length; i++) {
- if (collect.containsKey(i)) {
- Integer amount = collect.get(i);
+ if (collect.containsKey(i+1)) {
+ Integer amount = collect.get(i+1);
amountTotal = amountTotal + amount;
retMap.put(statusStr[i], amount);
} else {
--
Gitblit v1.7.1