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/BanLiShopOrderServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java
index aa04c6a..1e585a4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java
@@ -10,6 +10,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.DefaultTransactionDefinition;
+import org.yeshi.utils.exception.WXOrderException;
import com.aliyun.openservices.ons.api.Message;
import com.aliyun.openservices.ons.api.Producer;
@@ -45,6 +46,7 @@
import com.yeshi.fanli.util.factory.RedPackDetailFactory;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
import com.yeshi.fanli.util.shop.BanLiShopOrderUtil;
+import com.yeshi.fanli.util.wx.BanLiShopWXPayUtil;
@Service
public class BanLiShopOrderServiceImpl implements BanLiShopOrderService {
@@ -135,6 +137,7 @@
BanLiShopOrder update = new BanLiShopOrder();
update.setId(order.getId());
update.setOrderNo(orderNo);
+ order.setOrderNo(orderNo);
banLiShopOrderMapper.updateByPrimaryKeySelective(update);
// 璁㈠崟娣诲姞鎴愬姛 ,寤舵椂閫氱煡鍚庣画
@@ -150,6 +153,7 @@
orderGoods.setSetName(set.getName());
orderGoods.setState(set.getState());
orderGoods.setZkPrice(set.getZkPrice());
+ orderGoods.setPicture(goods.getSquarePicture());
banLiShopOrderGoodsMapper.insertSelective(orderGoods);
return orderGoods;
}
@@ -295,6 +299,7 @@
// 鏀粯鎴愬姛
BanLiShopOrder update = new BanLiShopOrder();
+ update.setId(orderId);
update.setMoneyPaymentState(BanLiShopOrder.PAY_STATE_PAID);
// 鍒ゆ柇鍏朵粬寰呮敮浠橀」鏄惁宸茬粡鏀粯
update.setUpdateTime(new Date());
@@ -317,6 +322,28 @@
// 鍒ゆ柇鏄惁澶勪簬鏈粯娆�
if (order.getState() == BanLiShopOrder.STATE_NO_PAY) {
+ /**
+ * 鏌ヨ鏄惁宸茬粡寰俊鏀粯
+ */
+ if (order.getMoneyPayment() != null) {
+ try {
+ boolean isS = BanLiShopWXPayUtil.isPaySuccess(order.getOrderNo());
+ if (isS)// 鏀粯鎴愬姛锛岄噸鏂板彂閫佹敮浠樻垚鍔熸秷鎭�
+ {
+ BanLiShopOrderMQMsg msg = new BanLiShopOrderMQMsg(order.getId(), order.getUid());
+ Message message = new Message(MQTopicName.TOPIC_ORDER.name(),
+ OrderTopicTagEnum.banLiShopOrderPaid.name(), new Gson().toJson(msg).getBytes());
+ producer.send(message);
+ return;
+ }
+
+ } catch (WXOrderException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+
+ }
+ }
+
BanLiShopOrder update = new BanLiShopOrder();
update.setId(id);
update.setStateDesc(desc);
@@ -420,4 +447,9 @@
return order;
}
+ @Override
+ public BanLiShopOrder selectByOrderNo(String orderNo) {
+ return banLiShopOrderMapper.selectByOrderNo(orderNo);
+ }
+
}
--
Gitblit v1.8.0