chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

对账更新

Browse Source
This commit is contained in:
磷叶 2024-12-03 16:29:20 +08:00
parent fa9ebdc484
commit 8a9a04733f
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/auth/ali/AliConfig.java
View File

@ -16,18 +16,18 @@ import org.springframework.stereotype.Component;
@Data
public class AliConfig {
@Value("${ali.appId}")
private String appId;
@Value("${ali.privateKey}")
private String privateKey;
@Bean
public AlipayConfig alipayConfig() {
AlipayConfig config = new AlipayConfig();
config.setAppId(appId);
config.setPrivateKey(privateKey);
return config;
}
// @Value("${ali.appId}")
// private String appId;
//
// @Value("${ali.privateKey}")
// private String privateKey;
//
// @Bean
// public AlipayConfig alipayConfig() {
// AlipayConfig config = new AlipayConfig();
// config.setAppId(appId);
// config.setPrivateKey(privateKey);
//
// return config;
// }
}

4
smart-switch-service/src/main/java/com/ruoyi/dashboard/domain/dto/BillDailyAmountQuery.java
View File

@ -20,4 +20,8 @@ public class BillDailyAmountQuery {
@ApiModelProperty("日期（结束）")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate dateEnd;
@ApiModelProperty("渠道ID")
private Long channelId;
}

2
smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmDashboardController.java
View File

@ -162,12 +162,14 @@ public class SmDashboardController extends BaseController {
payQuery.setPayDateStart(query.getDateStart());
payQuery.setPayDateEnd(query.getDateEnd());
payQuery.setStatusList(PayBillStatus.payedList());
payQuery.setChannelId(query.getChannelId());
List<LocalDateDecimalVO> payList = payBillService.selectDailyAmount(payQuery);
RefundQuery refundQuery = new RefundQuery();
refundQuery.setCreateDateStart(query.getDateStart());
refundQuery.setCreateDateEnd(query.getDateEnd());
refundQuery.setStatusList(RefundStatus.successList());
refundQuery.setChannelId(query.getChannelId());
List<LocalDateDecimalVO> refundList = refundService.selectDailyAmount(refundQuery);
List<PayDailyAmountVO> list = new ArrayList<>();