From a0f33f915dd4128d98111f67a3c75b1676adae32 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 11:20:39 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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 5a65cc0..d3849f7 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
@@ -427,7 +427,7 @@
//查询自提点信息
ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectOne(new LambdaQueryWrapper<ConvenientElevatingPointDO>().eq(ConvenientElevatingPointDO::getWechatAccount, phone));
if (isNull(convenientElevatingPointDO)) {
- return R.ok();
+ return R.ok("订单不在该自提点");
}
Long pointDOId = convenientElevatingPointDO.getId();
shopOrderDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopFlowerOrderDO>().eq(ComShopFlowerOrderDO::getId, orderId).eq(ComShopFlowerOrderDO::getPointId, pointDOId));
@@ -479,7 +479,10 @@
orderGoodsVOS.add(orderGoodsVO);
sbr.append(orderGoods.getGoodsName()).append(" ");
});
+ orderVO.setGoodsAttrPic(orderGoodsDOList.get(0).getGoodsAttrPic());
+ orderVO.setGoodsAttrName(orderGoodsDOList.get(0).getGoodsAttrName());
}
+
orderVO.setOrderGoodsVOList(orderGoodsVOS);
orderVO.setGoodsName(sbr.toString());
@@ -517,15 +520,33 @@
}
}
//设置退款金额
- ComShopFlowerRefundOrderDO comShopFlowerRefundOrderDO = comShopFlowerRefundOrderDAO.selectOne(new LambdaQueryWrapper<ComShopFlowerRefundOrderDO>().eq(ComShopFlowerRefundOrderDO::getOrderId, shopOrderDO.getOrderNo()));
+ ComShopFlowerRefundOrderDO comShopFlowerRefundOrderDO = comShopFlowerRefundOrderDAO.selectOne(new LambdaQueryWrapper<ComShopFlowerRefundOrderDO>().eq(ComShopFlowerRefundOrderDO::getOrderId, shopOrderDO.getId()));
if (nonNull(comShopFlowerRefundOrderDO)) {
orderVO.setRefundAmount(comShopFlowerRefundOrderDO.getRefundAmount());
+ orderVO.setRefundTime(comShopFlowerRefundOrderDO.getRefundTime());
}
//如果状态时取消状态，更新时间为去取消时间
if (shopOrderDO.getStatus() == ComShopFlowerOrderDO.status.yqx) {
orderVO.setCancelTime(shopOrderDO.getUpdateAt());
}
+ //判断是否可以退款 订单是否已超过15天 是否已有退款订单
+ int count = comShopFlowerRefundOrderDAO.selectCountRefundNowByOrderId(orderId);
+ 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(orderVO);
}
@@ -1006,9 +1027,9 @@
Map<Integer, Integer> collect = comShopOrderCountVOS.stream().collect(Collectors.toMap(ComShopOrderCountVO::getStatus, ComShopOrderCountVO::getAmount));
Map<String, Integer> retMap = new HashMap<>();
int amountTotal = 0;
- for (int i = 1; i <= statusStr.length; i++) {
- if (collect.containsKey(i)) {
- Integer amount = collect.get(i);
+ for (int i = 0; i < statusStr.length; 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