优化
diff --git a/payapi/build.gradle b/payapi/build.gradle
index 2a68a1d..184dbb5 100644
--- a/payapi/build.gradle
+++ b/payapi/build.gradle
@@ -66,7 +66,7 @@
implementation "org.springframework.security:spring-security-oauth2-jose"
implementation "org.springframework.security:spring-security-oauth2-client"
implementation "org.springframework.security:spring-security-oauth2-jose"
- implementation "org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure:2.1.5.RELEASE"
+ implementation "org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure"
implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
implementation "org.springframework.session:spring-session-data-redis"
implementation "org.springframework.boot:spring-boot-starter-cache"
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java
index 4d3a830..b52ea1e 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/SettleReportServiceImpl.java
@@ -9,6 +9,7 @@
import com.supwisdom.dlpay.system.bean.*;
import com.supwisdom.dlpay.system.service.SettleReportService;
import com.supwisdom.dlpay.util.EnumCheck;
+import kotlin.Suppress;
import org.hibernate.query.internal.NativeQueryImpl;
import org.hibernate.transform.Transformers;
import org.hibernate.type.DoubleType;
@@ -24,7 +25,6 @@
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
@Service
@@ -76,18 +76,18 @@
bean.setCramt(info.getCramt() == null ? 0.00 : info.getCramt());
bean.setDrbal(info.getDrbal() == null ? 0.00 : info.getDrbal());
bean.setCrbal(info.getCrbal() == null ? 0.00 : info.getCrbal());
- if (bean.getLastdaydrbal() == 0 && bean.getLastdaycrbal() == 0 && bean.getDramt() == 0 && bean.getCramt() == 0 && bean.getDrbal() == 0 && bean.getCrbal() == 0) {
+ if (bean.getLastdaydrbal() == 0 && bean.getLastdaycrbal() == 0
+ && bean.getDramt() == 0 && bean.getCramt() == 0
+ && bean.getDrbal() == 0 && bean.getCrbal() == 0) {
//无交易记录
if (nodealshow && "y".equals(bean.getDisplayflag())) {
result.add(bean); //显示
- } else {
- continue;
}
} else {
result.add(bean);
}
}
- return new PageResult<SubjectDayShowBean>(result);
+ return new PageResult<>(result);
}
@Override
@@ -221,7 +221,7 @@
//商户组,计算该组下所有的交易额
long transcnt = 0;
double transamt = 0;
- List<TShop> childrenShops = getChildrenShopByShopid(shopAllList, shop.getShopid().intValue()); //子商户列表
+ List<TShop> childrenShops = getChildrenShopByShopid(shopAllList, shop.getShopid()); //子商户列表
for (TShop child : childrenShops) {
if (!StringUtil.isEmpty(child.getShopaccno())) {
for (ShopBusinessInfo info : businessInfos) {
@@ -270,7 +270,7 @@
@Override
- public PageResult<ShopBusinessShowBean> getShopTodayBusinessShowInfos(String startdate, String enddate, String shopid, boolean nodealshow){
+ public PageResult<ShopBusinessShowBean> getShopTodayBusinessShowInfos(String startdate, String enddate, String shopid, boolean nodealshow) {
List<ShopBusinessInfo> businessInfos = getTodayShopbusiness(startdate, enddate); //根据流水统计当天的数据
if (StringUtil.isEmpty(businessInfos) && !nodealshow) {
return new PageResult<>(99, "无数据"); //无交易记录
@@ -300,7 +300,9 @@
.addScalar("dramt", DoubleType.INSTANCE)
.addScalar("cramt", DoubleType.INSTANCE)
.setResultTransformer(Transformers.aliasToBean(ShopBusinessInfo.class));
- List<ShopBusinessInfo> list = query.getResultList();
+
+ @Suppress(names = "UNCHECKED_CAST")
+ List list = (List<ShopBusinessInfo>) query.getResultList();
return list;
}
}