diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java index 76811d987..f068814c8 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxPayController.java @@ -70,29 +70,12 @@ public class WxPayController extends BaseController { Map paramMap = null; - - try { paramMap = WxPayment.xmlToMap(resultxml); logger.info("微信支付回调, notify, param: " + paramMap.toString() ); - - - String jsonMsg = JSON.toJSONString(paramMap); - FmInsideNotifyPaySuccessMsg paySuccessMsg = new FmInsideNotifyPaySuccessMsg(); - paySuccessMsg.setMsgType(EnumMsgRecordType.INSIDE_NOTIFY_PAY_SUCCESS.getCode()); - paySuccessMsg.setDelayTimeLevel(3); - paySuccessMsg.setPayWay(EnumPayWay.PAY_WAY_WEAPP.getCode()); - paySuccessMsg.setJsonMsg(jsonMsg); - // String response = wxPayOrderService.notify(paramMap, EnumPayWay.PAY_WAY_WEAPP); - mqBaseProducer.sendMessage(paySuccessMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); - - + String response = wxPayOrderService.notify(paramMap, EnumPayWay.PAY_WAY_WEAPP); logger.info("微信支付回调, notify success, req : " + resultxml); - - SortedMap resultMap = new TreeMap(); - resultMap.put("return_code", "SUCCESS"); - resultMap.put("return_msg", "OK"); - return XmlUtil.getRequestXml(resultMap); + return response; } catch (BizMessageException e) { if (paramMap == null) { logger.error("微信支付回调, order create error, e: " + e.getMessage()); diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java index e101ddc0f..3dc26cf88 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java @@ -94,7 +94,7 @@ public class MqBaseConsumer { fmInsideNotifyPaySuccessMsgService.send(msg); } else if(EnumMsgRecordType.INSIDE_NOTIFY_REFUND_SUCCESS.getCode().equals(baseMsg.getMsgType())) { // 内部消息 - 微信退款通知 - FmInsideNotifyRefundSuccessMsg msg = (FmInsideNotifyRefundSuccessMsg)JsonUtil.readValue(message,FmInsideNotifyPaySuccessMsg.class); + FmInsideNotifyRefundSuccessMsg msg = (FmInsideNotifyRefundSuccessMsg)JsonUtil.readValue(message,FmInsideNotifyRefundSuccessMsg.class); fmInsideNotifyRefundSuccessMsgService.send(msg); } baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_SUCC.getCode());