更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -2,7 +2,6 @@ package com.zhongshu.card.server.core.service.payment;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.http.APIResponseModel;
 import com.github.microservice.models.hxz.ConsumTransactionsModel;
@@ -10,16 +9,13 @@ import com.github.microservice.models.hxz.ConsumTransactionsResult;
 import com.github.microservice.models.hxz.QRCodeTransactionModel;
 import com.github.microservice.models.hxz.WxPayResult;
 import com.github.microservice.models.type.OrderFromType;
-import com.github.microservice.pay.client.model.ledger.TransactionLogModel;
-import com.github.microservice.pay.client.ret.ResultState;
-import com.github.microservice.types.payment.PaymentDeviceType;
-import com.github.microservice.types.payment.PaymentType;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultMessage;
 import com.github.microservice.types.OrderModeType;
 import com.github.microservice.types.OrderState;
+import com.github.microservice.types.payment.PaymentDeviceType;
+import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.client.model.base.SuperSearch;
-import com.zhongshu.card.client.model.operLogs.OperationLogsAddParam;
 import com.zhongshu.card.client.model.org.UserJoinBusOrgModel;
 import com.zhongshu.card.client.model.payment.*;
 import com.zhongshu.card.client.model.payment.statistic.BusinessMainStatisticModel;
@@ -27,41 +23,29 @@ import com.zhongshu.card.client.model.payment.statistic.StatisticItem;
 import com.zhongshu.card.client.model.payment.statistic.StatisticSearch;
 import com.zhongshu.card.client.model.school.AreaSimpleModel;
 import com.zhongshu.card.client.service.payment.ExpenseFlowService;
-import com.zhongshu.card.client.type.*;
+import com.zhongshu.card.client.type.DataState;
+import com.zhongshu.card.client.type.StatisticType;
+import com.zhongshu.card.client.type.UserState;
 import com.zhongshu.card.client.type.school.CardState;
 import com.zhongshu.card.client.utils.DateUtils;
+import com.zhongshu.card.server.core.dao.devices.DeviceInfoDao;
 import com.zhongshu.card.server.core.dao.devices.DevicePermissDao;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.dao.payment.ExpenseFlowDao;
-import com.zhongshu.card.server.core.dao.projectAbout.ProjectPaySettingDao;
 import com.zhongshu.card.server.core.dao.school.CardInfoDao;
-import com.zhongshu.card.server.core.dao.devices.DeviceBindDao;
-import com.zhongshu.card.server.core.dao.devices.DeviceInfoDao;
 import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
 import com.zhongshu.card.server.core.domain.org.Organization;
-import com.zhongshu.card.server.core.domain.org.OrganizationRelation;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;
-import com.zhongshu.card.server.core.domain.paySetting.ProjectPaySetting;
 import com.zhongshu.card.server.core.domain.school.CardInfo;
-import com.zhongshu.card.server.core.domain.devices.DeviceBind;
 import com.zhongshu.card.server.core.httpRequest.ApiRequestService;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
-import com.zhongshu.card.server.core.service.pay.BalancePayService;
 import com.zhongshu.card.server.core.service.paySetting.ProjectPaySettingServiceImpl;
 import com.zhongshu.card.server.core.service.school.AreaServiceImpl;
-import com.zhongshu.card.server.core.service.user.OperationLogsService;
 import com.zhongshu.card.server.core.util.*;
-import com.zhongshu.payment.client.model.param.AmountUpdateParam;
-import com.zhongshu.payment.client.pay.service.OrderPayFeignService;
-import com.zhongshu.payment.client.pay.service.WalletFeignService;
-import com.zhongshu.payment.client.payModel.balance.BalanceModel;
-import com.zhongshu.payment.client.payModel.balance.BalanceQueryParam;
-import com.zhongshu.payment.client.payModel.commn.CreateOrderParam;
-import com.zhongshu.payment.client.types.WalletType;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -87,22 +71,22 @@ import java.util.stream.Collectors;
 public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowService {
 
     @Autowired
-    ExpenseFlowDao expenseFlowDao;
+    private ExpenseFlowDao expenseFlowDao;
 
     @Autowired
-    UserCountDao userCountDao;
+    private UserCountDao userCountDao;
 
     @Autowired
-    DeviceInfoDao deviceInfoDao;
+    private DeviceInfoDao deviceInfoDao;
 
     @Autowired
-    CardInfoDao cardInfoDao;
+    private CardInfoDao cardInfoDao;
 
     @Autowired
     private ApiRequestService apiRequestService;
 
     @Autowired
-    OrganizationServiceImpl organizationService;
+    private OrganizationServiceImpl organizationService;
 
     @Autowired
     private OrganizationDao organizationDao;