Merge branch 'pay'

netflix-service/src/main/java/com/cyksj/service/corp/impl/WxCorpOpsImpl.java

@@ -51,7 +51,7 @@ public class WxCorpOpsImpl implements WxCorpOps {
 		if (200 != res.statusCode()) {
 			throw BusinessRuntimeException.getInstance("企业微信获取客户详情错误: " + res.body());
 		}
-
+		log.info("企业微信客户详情:", res.body());
 		return Jsons.parseObject(res.body(), CorpExternalContactInfo.class);
 	}
 

netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

@@ -6,7 +6,6 @@ import com.cyksj.common.EnvCommonService;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.IoKit;
 import com.cyksj.common.util.Xmls;
-import com.cyksj.config.zfb.BaseZfbConfig;
 import com.cyksj.config.zfb.ZfbProductCode;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
@@ -175,14 +174,14 @@ public class OrderController {
 	 */
 	@PostMapping("/post/pay/zfb/{orderId}")
     @Deprecated
-	public void aliPay(@PathVariable Long orderId,HttpServletResponse response) throws Exception {
+	public Result<String> aliPay(@PathVariable Long orderId,HttpServletResponse response) throws Exception {
         AliPayParams aliPayParams = orderDonService.aliPay(orderId, ZfbProductCode.MOBILE_WEB.getProductCode());
-        response.setContentType("text/html;charset=" + BaseZfbConfig.charset);
-        //直接将完整的表单html输出到页面
-        response.getWriter().write(aliPayParams.getBody());
-        response.getWriter().flush();
-        response.getWriter().close();
-//        return GatewayResponse.SUCCESS.newBuilder().toResult();
+//        response.setContentType("text/html;charset=" + BaseZfbConfig.charset);
+//        //直接将完整的表单html输出到页面
+//        response.getWriter().write(aliPayParams.getBody());
+//        response.getWriter().flush();
+//        response.getWriter().close();
+        return GatewayResponse.SUCCESS.newBuilder().toResult(aliPayParams.getBody());
 	}
 
     /**