代码修改

无关风月

2025-01-01 ca070436770f715572405880cfe548c02f639c73

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGeneratedRecordsController.java

@@ -6,10 +6,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.*;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.query.GeneratedQuery;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TGeneratedRecordsService;
import com.ruoyi.system.service.TOrderService;
import com.ruoyi.system.service.impl.SysConfigServiceImpl;
@@ -32,10 +35,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.Period;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * <p>
@@ -62,6 +62,8 @@
    private NativePayService nativePayService;
    @Resource
    private SysConfigMapper sysConfigMapper;
    @Resource
    private TAppUserService appUserService;
    //列表
    @ApiOperation(value = "查询",tags = "后台-用户生成数据")
    @PostMapping("/list")
@@ -72,7 +74,14 @@
    @ApiOperation(value = "详情",tags = "后台-用户生成数据")
    @PostMapping("/detail")
    public R<TGeneratedRecords> detail(Long id){
        return R.ok(generatedRecordsService.getById(id));
        TGeneratedRecords generatedRecords = generatedRecordsService.getById(id);
        TAppUser appUser = appUserService.getById(generatedRecords.getUserId());
        if(Objects.nonNull(appUser)){
            generatedRecords.setAvatar(appUser.getAvatar());
            generatedRecords.setUserPhone(appUser.getPhone());
            generatedRecords.setUserName(appUser.getName());
        }
        return R.ok(generatedRecords);
    }
    @ApiOperation(value = "检查当前用户是否付费",tags = {"web-职称工作总结"})
    @PostMapping("/pay/check")
@@ -142,7 +151,6 @@
    @PostMapping(value = "/buy")
    public R buy(@RequestParam Integer type, @RequestParam Long orderId) throws AlipayApiException {
        TOrder byId = orderService.getById(orderId);
        TOrder byId1 = orderService.getById(orderId);
        SysConfig sysConfig = sysConfigMapper.selectConfigById(6L);
        BigDecimal payMoney = new BigDecimal(sysConfig.getConfigValue());
        if (type == 1) {
@@ -153,9 +161,9 @@
            com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest prepayRequest = new com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest();
            prepayRequest.setAppid(weChatConfig.appId);
            prepayRequest.setMchid(weChatConfig.merchantId);
            prepayRequest.setOutTradeNo(byId1.getCode());
            prepayRequest.setOutTradeNo(byId.getCode());
            prepayRequest.setDescription("生成工作总结");
            prepayRequest.setNotifyUrl("http://www.zhipingwang.com.cn:8081/call-back/buy");
            prepayRequest.setNotifyUrl("https://0ifzoxq2516g.guyubao.com/call-back/buy");
            com.wechat.pay.java.service.payments.nativepay.model.Amount amount = new com.wechat.pay.java.service.payments.nativepay.model.Amount();
            amount.setTotal(payMoney.multiply(BigDecimal.valueOf(100)).intValue());
            prepayRequest.setAmount(amount);
@@ -180,7 +188,7 @@
            }
            return null;
        } else {
            String qrCode = AlipayTradePagePay.pay("生成工作总结",byId1.getCode(),payMoney.toString());
            String qrCode = AlipayTradePagePay.pay("生成工作总结",byId.getCode(),payMoney.toString());
            //预支付成功，创建预支付订单

            PayDto payDto = new PayDto();
@@ -232,7 +240,7 @@
        templateParam.put("workUnit", generatedRecords.getWorkUnit());
        templateParam.put("workContent", generatedRecords.getWorkContent());
        templateParam.put("generateUniversityComplete", generatedRecords.getGenerateUniversityComplete());
        templateParam.put("level", generatedRecords.getLevel());
        templateParam.put("level", generatedRecords.getTechnicalName());
        templateParam.put("technicalName", generatedRecords.getTechnicalName());
        templateParam.put("majorName", generatedRecords.getMajorName());
        templateParam.put("certificate", generatedRecords.getCertificate());