zoujiajian 3 vuotta sitten
vanhempi
sitoutus
4b2ea61924

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

@@ -8,7 +8,6 @@ import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.common.util.IoKit;
 import com.cyksj.common.util.Xmls;
 import com.cyksj.config.WeChatConfig;
-import com.cyksj.config.zfb.BaseZfbConfig;
 import com.cyksj.config.zfb.ZfbProductCode;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
@@ -220,14 +219,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);
+//        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.getWriter().write(aliPayParams.getBody());
+//        response.getWriter().flush();
+//        response.getWriter().close();
+        return GatewayResponse.SUCCESS.newBuilder().toResult(aliPayParams.getBody());
 	}
 
     /**