From 7b18addebfc5e39cbd0318790daee8f97c89ba25 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 12:22:48 +0800
Subject: [PATCH] #feat 新增商品上下架商品数量
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 33527b5..53fb6b8 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
@@ -502,7 +502,7 @@
//退款
String refundNo = WXPayUtil.generateNonceStr();
try {
- String refundStr = WxPayUtils.refund(appid, mchId, shopOrderDO.getWxTardeNo(), shopOrderDO.getPayAmount(),
+ String refundStr = WxPayUtils.refund(appid, mchId, shopOrderDO.getOrderNo(), shopOrderDO.getPayAmount(),
shopOrderDO.getPayAmount(), refundNo, isTest);
log.info("退款请求接口返回参数:{}", refundStr);
Map<String, String> mapResult = WXPayUtil.xmlToMap(refundStr);
@@ -641,7 +641,7 @@
if (comShopOrderDO == null) {
return R.fail("订单不存在");
}
- if (!(comShopOrderDO.getStatus() == 1) || !(comShopOrderDO.getDeliveryStatus() == 1)) {
+ if (!(comShopOrderDO.getStatus() == 8) || !(comShopOrderDO.getDeliveryStatus() == 1)) {
return R.fail("订单发货失败,订单状态不允许发货");
}
--
Gitblit v1.7.1