Merge branch 'develop'

master
yixian 4 years ago
commit c50bd0ea5c

@ -5759,10 +5759,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
WechatMerchantInfo info = Optional.ofNullable(merchantChannelApplicationManager.getRegister(WxPayMerchantRegister.class)) WechatMerchantInfo info = Optional.ofNullable(merchantChannelApplicationManager.getRegister(WxPayMerchantRegister.class))
.map(register -> register.findMerchant(client)) .map(register -> register.findMerchant(client))
.orElseThrow(() -> new ServerErrorException("No Register found for wechat")); .orElseThrow(() -> new ServerErrorException("No Register found for wechat"));
Element xml = info.getRawResponseXml(); Element elem = info.getRawResponseXml();
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("response_str", xml); object.put("response_str", info.getRawResponse());
object.put("apply_status", info.getRawResponse()); object.put("apply_status", elem.elementText("result_code"));
return object; return object;
} }

Loading…
Cancel
Save