lisy
2023-07-10 e51685798c47fc3fb3c73e5b78dc426f688b660c
重复方法名称去除1
4个文件已修改
16 ■■■■■ 已修改文件
cloud-server-account/src/main/java/com/dsh/AccountApplication.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/AccountApplication.java
@@ -28,7 +28,11 @@
@MapperScan("com.dsh.account.mapper")
public class AccountApplication {
    public static void main(String[] args) {
        SpringApplication.run(AccountApplication.class, args);
        try {
            SpringApplication.run(AccountApplication.class, args);
        }catch (Exception e){
            e.printStackTrace();
        }
    }
    @Bean
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -209,18 +209,18 @@
     * 课时详情-支付
     */
    @ResponseBody
    @PostMapping("/api/startCource/payment")
    @PostMapping("/api/useBenefit/payment")
    @ApiOperation(value = "充值中心-支付", tags = {"APP-开始上课"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })
    public ResultUtil rechargePayment(RechargePayRequest request){
    public ResultUtil rechargeCenPayment(RechargePayRequest request){
        try {
            Integer userIdFormRedis = tokenUtil.getUserIdFormRedis();
            if(null == userIdFormRedis){
                return ResultUtil.tokenErr();
            }
            return rechargeRService.rechargePayment(userIdFormRedis,request);
            return rechargeRService.rechargeCenPayment(userIdFormRedis,request);
        }catch (Exception e){
            return ResultUtil.runErr();
        }
cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java
@@ -18,6 +18,6 @@
    RechargeDetailsVo getAppUserRechargeRecord(String yearMonth, Integer recordId, Integer appUserId);
    ResultUtil rechargePayment(Integer userIdFormRedis, RechargePayRequest request);
    ResultUtil rechargeCenPayment(Integer userIdFormRedis, RechargePayRequest request);
}
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -104,7 +104,7 @@
    }
    @Override
    public ResultUtil rechargePayment(Integer userIdFormRedis, RechargePayRequest request) {
    public ResultUtil rechargeCenPayment(Integer userIdFormRedis, RechargePayRequest request) {
        // TODO: 2023/7/10 充值支付
        switch (request.getPayType()){
            case 1: