From eed89d185cc54187353b03966296498b8495c442 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 十一月 2019 15:29:16 +0800
Subject: [PATCH] 商城订单相关bug修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderServiceImpl.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 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 6b4aa51..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 {
@@ -151,6 +153,7 @@
 		orderGoods.setSetName(set.getName());
 		orderGoods.setState(set.getState());
 		orderGoods.setZkPrice(set.getZkPrice());
+		orderGoods.setPicture(goods.getSquarePicture());
 		banLiShopOrderGoodsMapper.insertSelective(orderGoods);
 		return orderGoods;
 	}
@@ -319,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);

--
Gitblit v1.8.0