Merge branch 'hpf' of http://47.101.143.145:8090/77975466/pco into hpf

# Conflicts:
#	sp-admin/sa-view/tb-deduction-record/tb-deduction-record-list.html

sp-server/src/main/java/com/pj/project/tb_account/AutomaticPay.java

@@ -343,7 +343,7 @@ public class AutomaticPay {
      */
     private void updateTbBusinessCar(TbBusinessCar car) {
         if (car == null) return;
-        car.setPay(1).setPayTime(new Date());
+        car.setPay(1).setPayTime(new Date()).setPayType(TbBusinessCar.PayTypeEnum.HAS_PAY_TYPE.getType());
         car.updateById();
     }
 
@@ -562,7 +562,7 @@ public class AutomaticPay {
     private boolean isExistTask(String businessId, String plate) {
         String key = getRedisKey(businessId, plate);
         if (NbUtil.isNullStr(RedisUtil.get(key))) {
-            RedisUtil.setByMINUTES(key, key, 5);
+            RedisUtil.setBySECONDS(key, key, 5);
             return false;
         }
         return true;

sp-server/src/main/java/com/pj/utils/cache/RedisUtil.java

@@ -61,6 +61,11 @@ public class RedisUtil {
         stringRedisTemplate.opsForValue().set(key, value, timeout, TimeUnit.MINUTES);
     }
 
+    // 写入，并设置时长，单位 分钟 MINUTES
+    public static void setBySECONDS(String key, String value, int timeout) {
+        stringRedisTemplate.opsForValue().set(key, value, timeout, TimeUnit.SECONDS);
+    }
+
     // 读取
     public static String get(String key) {
         return stringRedisTemplate.opsForValue().get(key);