1

陈杰
1 parent 261c4e04
Showing 2 changed files with 35 additions and 24 deletions Show diff stats
src/main/java/com/sincere/wechatbusiness/controller/ReportVoluntaryController.java
src/main/java/com/sincere/wechatbusiness/model/Channel.java
@@ -17,10 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import javax.imageio.ImageIO;
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -95,22 +92,27 @@ public class ReportVoluntaryController {
     @RequestMapping(value = "GetAddOrderDetail",method = RequestMethod.POST)
     @ApiOperation(value = "生成预支付订单并返回详情")
     public JSONObject GetAddOrderDetail(@RequestBody Order order) {
-        JSONObject object = new JSONObject();
-        object.put("account",order.getAccount());
-        object.put("expert_id",0);
-        object.put("paymoney",order.getPaymoney());
-        object.put("payway",2);
-        object.put("product_detail","升学汇产品-代理商");
-        object.put("product_id",order.getProduct_id());
-        object.put("product_name",order.getProduct_name());
-        object.put("type",order.getProduct_id());
-        object.put("user_name",order.getUser_name());
-        object.put("buycount",0);
-        object.put("score_id",0);
-        object.put("channelId",order.getChannelId());
-        object.put("agentId",order.getAgentId());
-        object.put("address",order.getAddress());
-        return HttpClientUtils.httpPostJson(domain+"/University/GetAddOrderDetail",object.toJSONString());
+        try{
+            JSONObject object = new JSONObject();
+            object.put("account",order.getAccount());
+            object.put("expert_id",0);
+            object.put("paymoney",order.getPaymoney());
+            object.put("payway",2);
+            object.put("product_detail","升学汇产品-代理商");
+            object.put("product_id",order.getProduct_id());
+            object.put("product_name",order.getProduct_name());
+            object.put("type",order.getProduct_id());
+            object.put("user_name",order.getUser_name());
+            object.put("buycount",0);
+            object.put("score_id",0);
+            object.put("channelId",order.getChannelId());
+            object.put("agentId",order.getAgentId());
+            object.put("address",order.getAddress());
+            return HttpClientUtils.httpPostJson(domain+"/University/GetAddOrderDetail",object.toJSONString());
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return null ;
     }
     @RequestMapping(value = "WxPay",method = RequestMethod.POST)
@@ -151,14 +153,13 @@ public class ReportVoluntaryController {
         Channel channel = channelService.getDetail(channelId);
         if(StringUtils.isBlank(channel.getReportRoutineUrl())){
             createRoutine(channelId);
-            String url = "https://market.myjxt.com:51315/smallRoutine/"+channelId+".png" ;
+            String url = "D:\\report\\img\\smallRoutine\\"+channelId+".png" ;
             channel.setReportRoutineUrl(url);
             channelService.updateRoutine(channelId,url);
         }
         try{
-            String fileUrl = channel.getReportRoutineUrl().replace("https://market.myjxt.com:51315/smallRoutine/","c:\\report\\img\\smallRoutine\\");
-            response.setHeader("Content-Disposition", "attachment;filename="+ URLEncoder.encode(channel.getName()+"动态码.jpg", "utf-8"));
-            InputStream in = new FileInputStream(fileUrl);
+            response.setHeader("Content-Disposition", "attachment;filename="+ URLEncoder.encode(channel.getName()+"动态码.png", "utf-8"));
+            InputStream in = new FileInputStream(channel.getReportRoutineUrl());
             OutputStream out = response.getOutputStream();
             byte [] by = new byte[1024];
             int i = 0;
@@ -197,7 +198,7 @@ public class ReportVoluntaryController {
             printWriter.flush();
             //开始获取数据
             BufferedInputStream bis = new BufferedInputStream(httpURLConnection.getInputStream());
-            OutputStream os = new FileOutputStream(new File("C:\report\img\smallRoutine\"+channelId+".png"));
+            OutputStream os = new FileOutputStream(new File("D:\report\img\smallRoutine\"+channelId+".png"));
             int len;
             byte[] arr = new byte[1024];
             while ((len = bis.read(arr)) != -1)
@@ -31,8 +31,18 @@ public class Channel {
     //小程序 动态码
     private String reportRoutineUrl ;
+    private int register ;
+
     private List<ChannelProduct> channelProductList;
+    public int getRegister() {
+        return register;
+    }
+
+    public void setRegister(int register) {
+        this.register = register;
+    }
+
     public String getReportRoutineUrl() {
         return reportRoutineUrl;
     }
	@@ -31,8 +31,18 @@ public class Channel {		@@ -31,8 +31,18 @@ public class Channel {
31	//小程序动态码	31	//小程序动态码
32	private String reportRoutineUrl ;	32	private String reportRoutineUrl ;
33		33
		34	+ private int register ;
		35	+
34	private List<ChannelProduct> channelProductList;	36	private List<ChannelProduct> channelProductList;
35		37
		38	+ public int getRegister() {
		39	+ return register;
		40	+ }
		41	+
		42	+ public void setRegister(int register) {
		43	+ this.register = register;
		44	+ }
		45	+
36	public String getReportRoutineUrl() {	46	public String getReportRoutineUrl() {
37	return reportRoutineUrl;	47	return reportRoutineUrl;
38	}	48	}