785834757 2 лет назад
Родитель
Сommit
66ec9270bb

+ 5 - 1
src/main/java/com/ydtech/modules/order/controller/QrCodeController.java

@@ -14,10 +14,14 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.Date;
 import java.util.Objects;
 
@@ -105,7 +109,7 @@ public class QrCodeController {
 
     @GetMapping(value = "/index")
     @ApiOperation(value = "扫描二维码地址")
-    public String index(String areaCompanyId) {
+    public String index(String areaCompanyId) throws IOException {
         InsOrderQrCode insOrderQrCode = insOrderQrCodeService.getOne(areaCompanyId);
         if (insOrderQrCode != null) {
             //更新二维码扫描时间

+ 1 - 3
src/main/java/com/ydtech/modules/order/service/impl/InsOrderQrCodeServiceImpl.java

@@ -196,12 +196,10 @@ public class InsOrderQrCodeServiceImpl extends ServiceImpl<InsOrderQrCodeMapper,
             if(isHttpUrl(jumlUrl) || isWx){
                 if(companyId.equals("HNIC1000000")) {
                     //华农保险
-                    String encode = URLEncoder.encode(jumlUrl, "UTF-8");
-                    insOrderQrCode.setJumpUrl(encode.replaceAll("\\%3A", ":").replaceAll("\\%2F", "/"));
+                    insOrderQrCode.setJumpUrl(jumlUrl.replace("{", "").replace("}", ""));
                 }else{
                     insOrderQrCode.setJumpUrl(jumlUrl);
                 }
-
             } else {
                 //base64 二维码图片
                 String qrCodeUrl = getQrCodeUrl(jumlUrl);