Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/order/controller/QrCodeController.java

@@ -128,7 +128,7 @@ public class QrCodeController {
     @GetMapping(value = "/index")
     @ApiOperation(value = "扫描二维码地址")
     @SaIgnore
-    public ModelAndView index(String areaCompanyId) throws IOException {
+    public Object index(String areaCompanyId) throws IOException {
         InsOrderQrCode insOrderQrCode = insOrderQrCodeService.getOne(areaCompanyId);
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(areaCompanyId);
         // 根据保险公司获取二维码配置方式
@@ -148,6 +148,20 @@ public class QrCodeController {
             return modelAndView;
         }
 
+        //更新二维码扫描时间
+        insOrderQrCode.setScanCodeTime(new Date());
+        insOrderQrCodeService.updateById(insOrderQrCode);
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String qrcodeCreateTimeStr = dateFormat.format(insOrderQrCode.getCreatetime());
+        LocalDate qrcodeCreateTime = LocalDate.parse(qrcodeCreateTimeStr);
+        LocalDate currentDate = LocalDate.now();
+
+        if (Math.abs(currentDate.toEpochDay() - qrcodeCreateTime.toEpochDay()) >= 1) {
+            //重定向到错误页面中
+            ModelAndView modelAndView = new ModelAndView("qrcode_error");
+            return modelAndView;
+        }
+
         if(UserConstants.CONFIG_TYPE_2.equals(configType) || UserConstants.CONFIG_TYPE_1.equals(configType)){
             InsOrders insOrders = insOrdersService.getById(insOrderQrCode.getOrderno());
             // 获取图标
@@ -183,21 +197,9 @@ public class QrCodeController {
             modelAndView.addObject("data",qrCodeVo);
             return modelAndView;
         } else if(UserConstants.CONFIG_TYPE_0.equals(configType)){
-            //更新二维码扫描时间
-            insOrderQrCode.setScanCodeTime(new Date());
-            insOrderQrCodeService.updateById(insOrderQrCode);
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            String qrcodeCreateTimeStr = dateFormat.format(insOrderQrCode.getCreatetime());
-            LocalDate qrcodeCreateTime = LocalDate.parse(qrcodeCreateTimeStr);
-            LocalDate currentDate = LocalDate.now();
-
-            if (Math.abs(currentDate.toEpochDay() - qrcodeCreateTime.toEpochDay()) >= 1) {
-                //重定向到错误页面中
-                ModelAndView modelAndView = new ModelAndView("qrcode_error");
-                return modelAndView;
-            }
-            ModelAndView modelAndView = new ModelAndView(insOrderQrCode.getJumpUrl());
-            return modelAndView;
+
+            return "redirect:" + insOrderQrCode.getJumpUrl();
+
         }else{
             //重定向到错误页面中
             ModelAndView modelAndView = new ModelAndView("qrcode_error");