修改 订单支付

src/main/java/org/rcisoft/app/pay/controller/WxPayController.java

@@ -13,8 +13,8 @@ import org.rcisoft.core.util.CyResultGenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
 

src/main/java/org/rcisoft/app/pay/service/WxPayService.java

@@ -5,8 +5,8 @@ import org.jdom.JDOMException;
 import org.rcisoft.business.cmsOrder.entity.CmsOrder;
 import org.rcisoft.core.model.CyPersistModel;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**

src/main/java/org/rcisoft/app/pay/service/impl/WxPayServiceImpl.java

@@ -28,8 +28,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.crypto.BadPaddingException;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/org/rcisoft/business/cmsOrder/entity/CmsOrder.java

@@ -6,22 +6,6 @@ import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.baomidou.mybatisplus.annotation.TableField;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
@@ -114,10 +98,10 @@ public class CmsOrder  extends CyIdSnowflakeEntity<CmsOrder> {
      * @default
      */
      @JsonFormat(
-     pattern = "yyyy-MM-dd"
+     pattern = "yyyy-MM-dd HH:mm:ss"
      )
      @Excel(name = "下单时间", orderNum = "8", width = 20, format = "yyyy-MM-dd")
-     @DateTimeFormat(pattern = "yyyy-MM-dd")
+     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
      private Date orderTime;
 
      /**
@@ -134,10 +118,10 @@ public class CmsOrder  extends CyIdSnowflakeEntity<CmsOrder> {
      * @default
      */
      @JsonFormat(
-     pattern = "yyyy-MM-dd"
+             pattern = "yyyy-MM-dd HH:mm:ss"
      )
      @Excel(name = "退款时间", orderNum = "10", width = 20, format = "yyyy-MM-dd")
-     @DateTimeFormat(pattern = "yyyy-MM-dd")
+     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
      private Date refundTime;
 
      /**
@@ -170,10 +154,10 @@ public class CmsOrder  extends CyIdSnowflakeEntity<CmsOrder> {
      * @default
      */
      @JsonFormat(
-     pattern = "yyyy-MM-dd"
+             pattern = "yyyy-MM-dd HH:mm:ss"
      )
      @Excel(name = "核销时间", orderNum = "14", width = 20, format = "yyyy-MM-dd")
-     @DateTimeFormat(pattern = "yyyy-MM-dd")
+     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
      private Date cancelTime;
 
 

src/main/java/org/rcisoft/core/util/Util.java

@@ -2,7 +2,7 @@ package org.rcisoft.core.util;
 
 import org.apache.commons.lang3.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Random;
 
 public class Util {