|
@@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpSession;
|
|
import javax.servlet.http.HttpSession;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
|
+import java.net.URLEncoder;
|
|
import java.net.UnknownHostException;
|
|
import java.net.UnknownHostException;
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
@@ -131,7 +132,7 @@ public class PayController {
|
|
}
|
|
}
|
|
|
|
|
|
@GetMapping("/weixin/callback/openidCode")
|
|
@GetMapping("/weixin/callback/openidCode")
|
|
- public String handleWeixinCallback(@RequestParam("code") String code, @RequestParam("state") String state, HttpSession session) {
|
|
|
|
|
|
+ public String handleWeixinCallback(@RequestParam("code") String code, @RequestParam("state") String state, HttpSession session) throws UnsupportedEncodingException {
|
|
|
|
|
|
Map<String, Object> map = JsonUtil.toMap(state);
|
|
Map<String, Object> map = JsonUtil.toMap(state);
|
|
System.out.println("回调来了啊 code="+code+"111111111111111111111111111111111111111111111state="+state);
|
|
System.out.println("回调来了啊 code="+code+"111111111111111111111111111111111111111111111state="+state);
|
|
@@ -154,6 +155,8 @@ public class PayController {
|
|
price =aDo.getRealPrice() * (1 + aDo.getTaxRate() * 0.01);
|
|
price =aDo.getRealPrice() * (1 + aDo.getTaxRate() * 0.01);
|
|
}
|
|
}
|
|
System.out.println( "redirect:"+map.get("ip").toString()+"#/payType?id="+aDo.getId()+"&sn="+aDo.getSn()+"&price="+price+"&openid="+openId);
|
|
System.out.println( "redirect:"+map.get("ip").toString()+"#/payType?id="+aDo.getId()+"&sn="+aDo.getSn()+"&price="+price+"&openid="+openId);
|
|
- return "redirect:"+map.get("ip").toString()+"#/payType?id="+aDo.getId()+"&sn="+aDo.getSn()+"&price="+price+"&openid="+openId;
|
|
|
|
|
|
+ String url = "redirect:"+map.get("ip").toString()+"#/payType?id="+aDo.getId()+"&sn="+aDo.getSn()+"&price="+price+"&openid="+openId;
|
|
|
|
+ String encodedUrl = URLEncoder.encode(url, "UTF-8");
|
|
|
|
+ return "redirect:" + encodedUrl;
|
|
}
|
|
}
|
|
}
|
|
}
|