fix 支付多商户

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TokenService.java

@@ -71,7 +71,6 @@ public class TokenService
      */
     public LoginUser getLoginUser(HttpServletRequest request)
     {
-
         //测试用户
         String test_token = request.getHeader("X-Auth-Token");
         if("test".equals(test_token)){

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -144,6 +144,8 @@ public class WxPayServiceImpl  implements IWxPayService {
             data.put("spbill_create_ip", IpUtils.getIpAddr(ServletUtils.getRequest()));
             data.put("notify_url", notifyUrl);
             data.put("trade_type", "JSAPI");
+            String TenantId = ServletUtils.getRequest().getHeader("TenantId");
+            data.put("attach", TenantId);
             Map<String, String> resp = wxpay.unifiedOrder(data);
 
             Map<String, String> result = new HashMap<>();
@@ -180,6 +182,8 @@ public class WxPayServiceImpl  implements IWxPayService {
             data.put("spbill_create_ip", IpUtils.getIpAddr(ServletUtils.getRequest()));
             data.put("notify_url", notifyUrl);
             data.put("trade_type", "JSAPI");
+            String TenantId = ServletUtils.getRequest().getHeader("TenantId");
+            data.put("attach", TenantId);
             Map<String, String> resp = wxpay.unifiedOrder(data);
             Map<String, String> result = new HashMap<>();
             //         result.put("provider","wxpay");
@@ -223,6 +227,8 @@ public class WxPayServiceImpl  implements IWxPayService {
                 if("SUCCESS".equals(result_code)){
                     String out_trade_no = notifyMap.get("out_trade_no");
                     String transaction_id = notifyMap.get("transaction_id");
+                    String TenantId = notifyMap.get("attach");
+                    ServletUtils.getRequestAttributes().getResponse().setHeader("TenantId",TenantId);
                     if(dealOrder(out_trade_no,transaction_id)){
                         xmlBack = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
                         return xmlBack;