From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 b733cb4..dc1e5fc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java
@@ -3,6 +3,7 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.security.SignatureException;
import java.util.Date;
import java.util.HashMap;
@@ -171,7 +172,10 @@
@RequestMapping(value = "banlishop/pay")
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);
@@ -185,7 +189,8 @@
if (!StringUtil.isNullOrEmpty(orderNo)) {
BanLiShopOrder order = banLiShopOrderService.selectByOrderNo(orderNo);
if (order != null) {// 鏀粯鎴愬姛娑堟伅鎺ㄩ��
- BanLiShopOrderMQMsg msg = new BanLiShopOrderMQMsg(order.getId(), order.getUid());
+ BanLiShopOrderMQMsg msg = new BanLiShopOrderMQMsg(order.getId(), order.getUid(),
+ new BigDecimal(map.get("total_fee")).multiply(new BigDecimal("0.01")));
Message message = new Message(MQTopicName.TOPIC_ORDER.name(),
OrderTopicTagEnum.banLiShopOrderPaid.name(), new Gson().toJson(msg).getBytes());
producer.send(message);
--
Gitblit v1.8.0