Merge branch 'master' into dev

admin/src/main/java/com/kym/admin/AdminApplication.java

@@ -1,5 +1,6 @@
 package com.kym.admin;
 
+import cn.hutool.crypto.SecureUtil;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -21,6 +22,7 @@ public class AdminApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(AdminApplication.class, args);
+        SecureUtil.disableBouncyCastle();
     }
 
 

admin/src/main/java/com/kym/admin/controller/StationController.java

@@ -49,9 +49,10 @@ public class StationController {
         // 判断数据权限
         var adminStationId = kymCache.getAdminUserStationId(StpUtil.getLoginIdAsLong());
         var res = stationService.lambdaQuery()
+                .eq(Station::getStationStatus,Station.STATION_STATUS_正常使用)
                 .eq(isNotNull(adminStationId), Station::getStationId, adminStationId)
                 .like(isNotNull(stationName), Station::getStationName, stationName)
-                .orderByDesc(Station::getStationId).list();
+                .orderByAsc(Station::getStationId).list();
         return R.success(res);
     }
 

entity/src/main/java/com/kym/entity/admin/Station.java

@@ -27,6 +27,13 @@ public class Station extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    // 站点状态：0：未知 1：建设中 5：关闭下线 6：维护中 50：正常使用
+    public static final int STATION_STATUS_未知 = 0;
+    public static final int STATION_STATUS_建设中 = 1;
+    public static final int STATION_STATUS_关闭下线 = 5;
+    public static final int STATION_STATUS_维护中= 6;
+    public static final int STATION_STATUS_正常使用 = 50;
+
     /**
      * 公司id
      */

miniapp/src/main/resources/application-prod.yml

@@ -40,7 +40,7 @@ wechat:
     baseInformation: https://api.mch.weixin.qq.com/v3/new-tax-control-fapiao/merchant/base-information
     taxCodes: https://api.mch.weixin.qq.com/v3/new-tax-control-fapiao/merchant/tax-codes
     fapiaoApplications: https://api.mch.weixin.qq.com/v3/new-tax-control-fapiao/fapiao-applications
-    notifyUrl: https://dev.kuaiyuman.cn/api/invoice/notify
+    notifyUrl: https://www.kuaiyuman.cn/api/invoice/notify
     devConfig: https://api.mch.weixin.qq.com/v3/new-tax-control-fapiao/merchant/development-config
     fapiaoFiles: https://api.mch.weixin.qq.com/v3/new-tax-control-fapiao/fapiao-applications/%s/fapiao-files
     queryFapiao: https://api.mch.weixin.qq.com/v3/new-tax-control-fapiao/fapiao-applications/%s

service/src/main/java/com/kym/service/miniapp/impl/ChargeServiceImpl.java

@@ -18,8 +18,8 @@ import com.kym.entity.miniapp.delay.DelayChargeOrder;
 import com.kym.service.admin.EquipmentInfoService;
 import com.kym.service.admin.EquipmentRelationService;
 import com.kym.service.enplus.EnPlusService;
-import com.kym.service.miniapp.*;
 import com.kym.service.jobs.DelayService;
+import com.kym.service.miniapp.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -171,7 +171,7 @@ public class ChargeServiceImpl implements ChargeService {
      * @return
      */
     @Override
-    @DSTransactional(rollbackFor = Exception.class)
+    @DSTransactional(noRollbackFor = java.net.SocketTimeoutException.class)
     public Map<String, String> queryStartCharge(Long userId, String connectorId, Long userRechargeRightsId, Boolean isBooking, LocalDateTime startTime, LocalDateTime endTime) {
         if (isBooking) {
             // 预约时间不能超过未来24H

service/src/main/java/com/kym/service/miniapp/impl/WalletDetailServiceImpl.java

@@ -32,9 +32,9 @@ public class WalletDetailServiceImpl extends ServiceImpl<WalletDetailMapper, Wal
     public List<WalletDetail> listWalletDetail(int type) {
         var userId = StpUtil.getLoginIdAsLong();
         if (type > 0) {
-            return lambdaQuery().eq(WalletDetail::getUserId, userId).eq(WalletDetail::getType, type).orderByDesc(WalletDetail::getId).list();
+            return lambdaQuery().eq(WalletDetail::getUserId, userId).eq(WalletDetail::getStatus,WalletDetail.STATUS_已确认).eq(WalletDetail::getType, type).orderByDesc(WalletDetail::getId).list();
         } else {
-            return lambdaQuery().eq(WalletDetail::getUserId, userId).orderByDesc(WalletDetail::getId).list();
+            return lambdaQuery().eq(WalletDetail::getUserId, userId).eq(WalletDetail::getStatus,WalletDetail.STATUS_已确认).orderByDesc(WalletDetail::getId).list();
         }
 
     }