From bef0ef19d792a16a31a59ec7beafc7b0885529fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 06 十一月 2019 15:36:31 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java
index 12c8bcc..4a5e0be 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java
@@ -7,9 +7,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.yeshi.utils.entity.wx.WXAPPInfo;
import org.yeshi.utils.exception.WXOrderException;
-import org.yeshi.utils.wx.WXPayUtil;
import com.aliyun.openservices.ons.api.Message;
import com.aliyun.openservices.ons.api.Producer;
@@ -167,7 +165,8 @@
BanLiShopOrder order = banLiShopOrderService.selectByPrimaryKeyForUpdate(orderId);
if (order == null)
throw new BanLiShopOrderException(1, "璁㈠崟涓嶅瓨鍦�");
- if (order.getState() != BanLiShopOrder.STATE_REJECT)
+ if (order.getState() == BanLiShopOrder.STATE_REJECT_REFUND_FAIL
+ || order.getState() == BanLiShopOrder.STATE_REJECT_REFUND_SUCCESS)
throw new BanLiShopOrderException(2, "璁㈠崟鏈鎷掔粷/璁㈠崟宸查��娆�");
BanLiShopOrder update = new BanLiShopOrder();
@@ -207,7 +206,7 @@
BanLiShopOrderMQMsg msg = new BanLiShopOrderMQMsg(order.getId(), order.getUid());
Message message = new Message(MQTopicName.TOPIC_ORDER.name(),
OrderTopicTagEnum.banLiShopOrderRefund.name(), new Gson().toJson(msg).getBytes());
- message.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L);// 寤舵椂24灏忔椂閫氱煡妫�娴嬪井淇￠��娆剧姸鎬�
+ message.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60 *5L);// 寤舵椂24灏忔椂閫氱煡妫�娴嬪井淇￠��娆剧姸鎬�
SendResult result = producer.send(message);
if (result == null) {
throw new BanLiShopOrderException(8, "娑堟伅鍙戦�佸け璐�");
--
Gitblit v1.8.0