From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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 17f8d2c..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;
@@ -101,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();
}
@@ -115,10 +117,15 @@
IPage<ComShopFlowerRefundOrderVO> pages = this.baseMapper.pageRefundOrder(page, pageComOrderRefundDTO);
for (ComShopFlowerRefundOrderVO comShopFlowerRefundOrderVO : pages.getRecords()) {
String orderNo = comShopFlowerRefundOrderVO.getOrderNo();
- ComShopFlowerOrderDO comShopFlowerOrderDO = comShopFlowerOrderDAO.selectById(comShopFlowerRefundOrderVO.getId());
- comShopFlowerRefundOrderVO.setTotalAmount(comShopFlowerOrderDO.getTotalAmount());
- ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(comShopFlowerOrderDO.getPointId());
- comShopFlowerRefundOrderVO.setPointName(convenientElevatingPointDO.getName());
+ 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
@@ -140,14 +147,15 @@
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);
- comShopFlowerRefundOrderVO.setStoreName(shopStoreVO.getName());
+*/
}
return R.ok(pages);
@@ -236,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