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/controller/CallBackController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
index c02fbdd..edca3b6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
@@ -5,6 +5,8 @@
import java.io.PrintWriter;
import java.security.SignatureException;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
import javax.annotation.Resource;
import javax.crypto.Mac;
@@ -14,16 +16,27 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.wx.WXUtil;
+import com.aliyun.openservices.ons.api.Message;
+import com.aliyun.openservices.ons.api.Producer;
+import com.google.gson.Gson;
+import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
+import com.yeshi.fanli.dto.mq.order.body.BanLiShopOrderMQMsg;
import com.yeshi.fanli.dto.push.PushContentDTO;
import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
import com.yeshi.fanli.entity.config.push.PushMsgFactory;
+import com.yeshi.fanli.entity.shop.BanLiShopOrder;
import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;
import com.yeshi.fanli.service.inter.push.PushService;
+import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.rocketmq.MQTopicName;
+import com.yeshi.fanli.util.shop.BanLiShopOrderUtil;
+import com.yeshi.fanli.util.wx.BanLiShopWXPayUtil;
import net.sf.json.JSONObject;
@@ -44,6 +57,12 @@
@Resource
private MsgDeviceReadStateService msgDeviceReadStateService;
+
+ @Resource(name = "producer")
+ private Producer producer;
+
+ @Resource
+ private BanLiShopOrderService banLiShopOrderService;
/**
* 瀹㈡湇娑堟伅鍥炶皟
@@ -150,10 +169,37 @@
out.print("success");
}
-
@RequestMapping(value = "banlishop/pay")
- public void banLiShopPay(PrintWriter out) {
- out.print("success");
+ public void banLiShopPay(HttpServletRequest request, PrintWriter out) {
+
+ Map<String, String> map = WXUtil.parseXML(request);
+ JSONObject json = JSONObject.fromObject(map);
+ LogHelper.test("鍟嗗煄寰俊鏀粯鍥炶皟:" + json.toString());
+ String sign = map.get("sign");
+ map.remove("sign");
+ boolean isSuccess = BanLiShopWXPayUtil.signIsRight(map, sign);
+ if (isSuccess)
+ if (map.get("return_code").equalsIgnoreCase("SUCCESS")
+ && map.get("result_code").equalsIgnoreCase("SUCCESS")) {
+ // 鍟嗘埛璁㈠崟鍙�
+ String wxPayOrderNo = map.get("out_trade_no");
+ // 璁㈠崟鍙�
+ String orderNo = BanLiShopOrderUtil.getOrderNoFromWXPayOrderNo(wxPayOrderNo);
+ if (!StringUtil.isNullOrEmpty(orderNo)) {
+ BanLiShopOrder order = banLiShopOrderService.selectByOrderNo(orderNo);
+ if (order != null) {// 鏀粯鎴愬姛娑堟伅鎺ㄩ��
+ 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);
+ Map<String, String> returnMap = new HashMap<>();
+ returnMap.put("return_code", "SUCCESS");
+ returnMap.put("return_msg", "OK");
+ out.print(WXUtil.loadWXMessage(returnMap));
+ out.close();
+ }
+ }
+ }
}
-
+
}
--
Gitblit v1.8.0