合并代码

puzhibing

2023-07-07 bfc06fc14d3c54801bfa94a138746daf3076358d

 cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java

@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;

/**
@@ -32,7 +33,7 @@
    @Autowired
    private TokenUtil tokenUtil;

    @Autowired
    @Resource
    private SysLogClient slClient;

    private final SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd");
@@ -146,7 +147,7 @@
            @ApiImplicitParam(value = "年月", name = "yearMonth", required = true, dataType = "string"),
            @ApiImplicitParam(value = "记录id", name = "recordId", required = true, dataType = "int"),
    })
    public ResultUtil<BillingDetailsVo> getUserBillingDetails( String yearMonth, Integer recordId){
    public ResultUtil<BillingDetailsVo> getUserBillingDetails(String yearMonth,Integer recordId){
        try {
            Integer appUserId = tokenUtil.getUserIdFormRedis();
            if(null == appUserId){