From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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..9bf0c48 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
@@ -35,6 +35,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -79,6 +80,8 @@
private WxMaConfiguration wxMaConfiguration;
@Resource
private UserService userService;
+ @Resource
+ private ConvenientElevatingPointDAO convenientElevatingPointDAO;
@Override
@@ -99,7 +102,8 @@
if (R.isOk(sysUserVOR)) {
SysUserVO sysUserVO = JSONObject.parseObject(JSONObject.toJSONString(sysUserVOR.getData()), SysUserVO.class);
try {
- WxUtil.sendNewRefundOrderNotice(sysUserVO.getOpenid(),maService.getAccessToken(),refundOrderNo,comShopFlowerRefundOrderDO.getRefundAmount().toString(),DateUtil.format(comShopFlowerRefundOrderDO.getRefundTime(),"yyyy-MM-dd HH:mm"));
+ DecimalFormat df = new DecimalFormat("#.00");
+ WxUtil.sendNewRefundOrderNotice(sysUserVO.getOpenid(),maService.getAccessToken(),refundOrderNo,df.format(comShopFlowerRefundOrderDO.getRefundAmount()),DateUtil.format(comShopFlowerRefundOrderDO.getRefundTime(),"yyyy-MM-dd HH:mm"));
} catch (WxErrorException e) {
e.printStackTrace();
}
@@ -113,6 +117,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 +138,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 +147,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 +209,7 @@
comShopFlowerOrderDAO.updateById(comShopFlowerOrderDO);
//退款成功发送消息
- sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"商家同意退款");
+ sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"同意退款");
}else {
//退款失败
comShopFlowerRefundOrderDO.setStatus(ComShopFlowerRefundOrderDO.status.tksb);
@@ -202,7 +218,7 @@
orderPayDO.setPayStatus(ComShopFlowerOrderPayDO.payStatus.no);
orderPayDO.setRefundStatus(ComShopFlowerOrderPayDO.refundStatus.tksb);
//退款失败发送消息
- sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"微信退款失败");
+ sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"退款失败");
}
comShopFlowerOrderPayDAO.insert(orderPayDO);
}
@@ -216,7 +232,7 @@
comShopFlowerRefundOrderDO.setStatus(ComShopFlowerRefundOrderDO.status.tksb);
comShopFlowerRefundOrderDO.setHandleResult(ComShopFlowerRefundOrderDO.handleResult.refuse);
//拒绝退款发送消息
- sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"商家拒绝退款");
+ sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"拒绝退款");
}
this.baseMapper.updateById(comShopFlowerRefundOrderDO);
return R.ok();
@@ -228,7 +244,8 @@
if (R.isOk(userOpenId)) {
String openid = userOpenId.getData().toString();
try {
- WxUtil.sendRefundNotice(openid,maService.getAccessToken(),comShopFlowerRefundOrderDO.getRefundOrderNo(),comShopFlowerRefundOrderDO.getRefundAmount().toString(),msg);
+ DecimalFormat df = new DecimalFormat("#.00");
+ WxUtil.sendRefundNotice(openid,maService.getAccessToken(),comShopFlowerRefundOrderDO.getRefundOrderNo(),df.format(comShopFlowerRefundOrderDO.getRefundAmount()),msg);
} catch (WxErrorException e) {
e.printStackTrace();
}
--
Gitblit v1.7.1