修改需求

src/main/java/com/travel/controller/ReleaseTravelController.java

@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.text.DecimalFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 /**

src/main/java/com/travel/controller/ZfbPayController.java

@@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -55,8 +54,8 @@ public class ZfbPayController extends ZfbPayUtils {
         //获得初始化的alipayConfig参数 //证书模式
         CertAlipayRequest alipayConfig  = new CertAlipayRequest();
         alipayConfig.setPrivateKey(MERCHANTPRIVATEKEY);//应用秘钥
-        alipayConfig.setServerUrl(GATEWAYURL);
-        alipayConfig.setAppId(APPID);
+        alipayConfig.setServerUrl(GATEWAYURL);//网关
+        alipayConfig.setAppId(APPID);//appid
         alipayConfig.setCharset(CHARSET);
         alipayConfig.setSignType(SIGNTYPE);
         alipayConfig.setEncryptor("");

src/main/java/com/travel/service/impl/ZFBPayServiceImpl.java

@@ -15,9 +15,6 @@ import com.travel.zfb.ZfbPayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ClassUtils;
-
-import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/travel/util/AmountUtil.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.text.DecimalFormat;
 
 public class AmountUtil {
+    //保留两位小数
     public static DecimalFormat fnum = new DecimalFormat("#.00");
 
     /**

src/main/resources/application.yml

@@ -27,6 +27,10 @@ spring:
     jedis:
       pool:
         max-active: 0
+  task:
+    scheduling:
+      pool:
+        size: 8 #配置Scheduled定时任务为多线程 否则默认为单线程同一时间段不执行
 logging:
   level:
     com:
@@ -56,7 +60,7 @@ ZFBPAY:
   #回调地址
   notify_url: "https://www.tuyatrip.com/api/pay/ZFBcallback"
   #成功后页面跳转路径
-  return_url: "https://cv.tuyatrip.com/page/index"
+  return_url: "https://cv.tuyatrip.com/page/ceshi"
   #签名方式
   sign_type: "RSA2"
   #字符串编码格式

src/main/resources/config/mapping/PrivateOrderMapper.xml

@@ -143,7 +143,7 @@
             a.*,b.code as supplieName
         FROM
             bus_private_ordering a
-            JOIN ( SELECT demand_uuid,code FROM bus_private_ordering_type WHERE order_type = '4' or order_type = '13') b ON a.uuid = b.demand_uuid
+            JOIN ( SELECT demand_uuid,code FROM bus_private_ordering_type WHERE order_type = '4' or order_type = '13' OR order_type = '14' ) b ON a.uuid = b.demand_uuid
         WHERE CONVERT(date, DateAdd(Day, 7 , a.end_time), 120) <![CDATA[ <= ]]> CONVERT(date, SYSDATETIME(), 120)
     </select>
     <!-- 查询定制单状态里是否存在这一项 -->