From e32ef61f9bcbc5d542d19e56f6c96f18bd02c6e9 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 29 十一月 2022 16:56:02 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
index c340675..64283ae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
@@ -260,7 +260,7 @@
.delete(new LambdaQueryWrapper<ComShopFlowerGoodsAttrDO>().eq(ComShopFlowerGoodsAttrDO::getGoodsId, id));
ComShopFlowerGoodsAttrDO comShopFlowerGoodsAttrDO = new ComShopFlowerGoodsAttrDO();
comShopFlowerGoodsAttrDO.setGoodsId(id);
- comShopFlowerGoodsAttrDO.setStoreId(addShopFlowerGoodsVO.getStoreId());
+ comShopFlowerGoodsAttrDO.setStoreId(shopGoodsDO.getStoreId());
comShopFlowerGoodsAttrDO.setGoodsName(addShopFlowerGoodsVO.getName());
comShopFlowerGoodsAttrDO.setGoodsAttrName("默认");
comShopFlowerGoodsAttrDO.setAttrPic(addShopFlowerGoodsVO.getGoodsPic());
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 a37cb02..41ca76b 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
@@ -193,7 +193,7 @@
comShopFlowerOrderDAO.updateById(comShopFlowerOrderDO);
//退款成功发送消息
- sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"商家同意退款");
+ sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"同意退款");
}else {
//退款失败
comShopFlowerRefundOrderDO.setStatus(ComShopFlowerRefundOrderDO.status.tksb);
@@ -202,7 +202,7 @@
orderPayDO.setPayStatus(ComShopFlowerOrderPayDO.payStatus.no);
orderPayDO.setRefundStatus(ComShopFlowerOrderPayDO.refundStatus.tksb);
//退款失败发送消息
- sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"微信退款失败");
+ sendRefundNotice(comShopFlowerRefundOrderDO, comShopFlowerOrderDO,"退款失败");
}
comShopFlowerOrderPayDAO.insert(orderPayDO);
}
@@ -216,7 +216,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