bug fixes

base-module/src/main/java/com/caimei/module/base/entity/po/CmOrderPayLink.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 /**
@@ -38,6 +39,7 @@ public class CmOrderPayLink implements Serializable {
     /**
      * 链接有效时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date effectiveTime;
 
     /**

pay/src/main/java/com/caimei/module/pay/service/impl/PayServiceImpl.java

@@ -621,13 +621,18 @@ public class PayServiceImpl implements PayService {
 
     @Override
     public void jumpPage(String linkLogo, String linkPage, HttpServletResponse response) throws IOException {
+        response.sendRedirect(linkPage + "?linkLogo=" + linkLogo);
+    }
+
+    @Override
+    public JsonModel linkData(String linkLogo) {
+        Map<String, Object> map = new HashMap<>(3);
         OrderPayLinkVo orderPayLink = payDao.getOrderPayLink(linkLogo);
         //链接状态,0成功
         int code = 0;
         if (null == orderPayLink) {
             //已重新生成链接
-            code = -1;
-            response.sendRedirect(linkPage + "?code=" + code);
+            return JsonModel.newInstance().error("链接更新,请重新获取");
         } else {
             OrderVo order = payDao.findOrder(orderPayLink.getOrderId().intValue());
             List<DiscernReceiptVo> discernReceiptList = payDao.getDiscernReceipt(order);
@@ -649,17 +654,11 @@ public class PayServiceImpl implements PayService {
             }
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String time = dateFormat.format(orderPayLink.getEffectiveTime());
-            response.sendRedirect(linkPage + "?code=" + code + "&linkLogo=" + linkLogo);
-        }
-    }
-
-    @Override
-    public JsonModel linkData(String linkLogo) {
-        OrderPayLinkVo orderPayLink = payDao.getOrderPayLink(linkLogo);
-        if (orderPayLink == null) {
-            return JsonModel.newInstance().error("请不要随意修改链接");
+            map.put("orderPayLink", orderPayLink);
+            map.put("code", code);
+            map.put("time", time);
         }
-        return JsonModel.newInstance().success(orderPayLink);
+        return JsonModel.newInstance().success(map);
     }
 
     @Override