From c168f544ecd041760e7d0fba66c48e06b9ab67dc Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 16:51:21 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java
index 4a7c18c..7469c2b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java
@@ -79,6 +79,8 @@
private WxMaConfiguration wxMaConfiguration;
@Resource
private UserService userService;
+ @Resource
+ private ConvenientElevatingPointDAO convenientElevatingPointDAO;
@Override
@@ -113,6 +115,15 @@
IPage<ComShopFlowerRefundOrderVO> pages = this.baseMapper.pageRefundOrder(page, pageComOrderRefundDTO);
for (ComShopFlowerRefundOrderVO comShopFlowerRefundOrderVO : pages.getRecords()) {
String orderNo = comShopFlowerRefundOrderVO.getOrderNo();
+ ComShopFlowerOrderDO comShopFlowerOrderDO = comShopFlowerOrderDAO.selectById(comShopFlowerRefundOrderVO.getOrderId());
+ if (nonNull(comShopFlowerOrderDO)){
+ comShopFlowerRefundOrderVO.setTotalAmount(comShopFlowerOrderDO.getTotalAmount());
+ ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(comShopFlowerOrderDO.getPointId());
+ if (nonNull(convenientElevatingPointDO)){
+ comShopFlowerRefundOrderVO.setPointName(convenientElevatingPointDO.getName());
+ }
+ }
+
List<ComShopFlowerOrderGoodsVO> orderGoodsVOS = new ArrayList<>();
// 查询订单下商品信息
List<ComShopFlowerOrderGoodsDO> orderGoodsDOList = comShopFlowerOrderGoodsDAO
@@ -125,7 +136,7 @@
orderGoodsVO.setNum(orderGoods.getAmount());
orderGoodsVO.setGoodsPic(orderGoods.getGoodsAttrPic());
orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());
-
+ orderGoodsVO.setGoodsAttr(orderGoods.getGoodsAttrName());
orderGoodsVOS.add(orderGoodsVO);
sbr.append(orderGoods.getGoodsName()).append(" ");
});
@@ -134,13 +145,16 @@
comShopFlowerRefundOrderVO.setOrderGoodsVOList(orderGoodsVOS);
comShopFlowerRefundOrderVO.setGoodsName(sbr.toString());
- ConvenientMerchantVO shopStoreVO = new ConvenientMerchantVO();
+
// 查询店铺信息
+/* ConvenientMerchantVO shopStoreVO = new ConvenientMerchantVO();
ConvenientMerchantDO shopStoreDO = convenientMerchantDAO.selectById(comShopFlowerRefundOrderVO.getStoreId());
if (shopStoreDO != null) {
BeanUtils.copyProperties(shopStoreDO, shopStoreVO);
}
comShopFlowerRefundOrderVO.setConvenientMerchantVO(shopStoreVO);
+*/
+
}
return R.ok(pages);
}
@@ -193,7 +207,7 @@
comShopFlowerOrderDAO.updateById(comShopFlowerOrderDO);
//退款成功发送消息
- sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"商家同意退款");
+ sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"同意退款");
}else {
//退款失败
comShopFlowerRefundOrderDO.setStatus(ComShopFlowerRefundOrderDO.status.tksb);
@@ -202,7 +216,7 @@
orderPayDO.setPayStatus(ComShopFlowerOrderPayDO.payStatus.no);
orderPayDO.setRefundStatus(ComShopFlowerOrderPayDO.refundStatus.tksb);
//退款失败发送消息
- sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"微信退款失败");
+ sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"退款失败");
}
comShopFlowerOrderPayDAO.insert(orderPayDO);
}
@@ -216,7 +230,7 @@
comShopFlowerRefundOrderDO.setStatus(ComShopFlowerRefundOrderDO.status.tksb);
comShopFlowerRefundOrderDO.setHandleResult(ComShopFlowerRefundOrderDO.handleResult.refuse);
//拒绝退款发送消息
- sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"商家拒绝退款");
+ sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"拒绝退款");
}
this.baseMapper.updateById(comShopFlowerRefundOrderDO);
return R.ok();
--
Gitblit v1.7.1