修改

xuhy

2024-12-11 0a1533fd30ec1a2f4624ccda4ff11f2535ea8a46

修改

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

@@ -62,6 +62,16 @@
        if (check) {
            one.setPaymentStatus(2);
            orderService.updateById(one);
            if (one.getGoodType()==1){
                try {
                    TCourse byId = courseService.getById(one.getGoodId());
                    byId.setBuyNum(byId.getBuyNum()+1);
                    courseService.updateById(byId);
                }catch (Exception e){
                    e.printStackTrace();
                }

            }
            return R.ok();
        }else {
            return R.fail("请支付");
@@ -86,17 +96,17 @@
            one.setPayTime(LocalDateTime.now());

            one.setPaymentType(1);
                    orderService.updateById(one);
                    if (one.getGoodType()==1){
                        try {
                            TCourse byId = courseService.getById(one.getGoodId());
                            byId.setBuyNum(byId.getBuyNum()+1);
                            courseService.updateById(byId);
                        }catch (Exception e){
                            e.printStackTrace();
                        }
            orderService.updateById(one);
            if (one.getGoodType()==1){
                try {
                    TCourse byId = courseService.getById(one.getGoodId());
                    byId.setBuyNum(byId.getBuyNum()+1);
                    courseService.updateById(byId);
                }catch (Exception e){
                    e.printStackTrace();
                }

                    }
            }
        }
        return R.ok(null,"SUCCESS");
    }

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

@@ -505,6 +505,8 @@
                tUserChangeDetail.setTitleName(byId2.getTitileName());
                TTitleMajor byId3 = majorService.getById(tUserChangeDetail.getMajorId());
                tUserChangeDetail.setMajorName(byId3.getMajorName());
                TLevel byId4 = levelService.getById(tUserChangeDetail.getLevelId());
                tUserChangeDetail.setLevelName(byId4.getName());
            }
            tUserChange.setUserChangeDetails(list1);
        }

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

@@ -19,6 +19,7 @@
import oshi.driver.mac.net.NetStat;

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -232,7 +233,7 @@
        Long payCount = courseCount -courseFreeCount;
        Long recordsCount = generatedRecordsService.lambdaQuery().count();
        Long infoCount = informationService.lambdaQuery().count();
        Long infoFreeCount = informationService.lambdaQuery().count();
        Long infoFreeCount = informationService.lambdaQuery().eq(TInformation::getInformationPrice,new BigDecimal(0)).count();
        Long infoPayCount = infoCount-infoFreeCount;
        ManageCountDto manageCountDto = new ManageCountDto();
        manageCountDto.setUserCount(userCount);
@@ -242,6 +243,7 @@
        manageCountDto.setRecordsCount(recordsCount);
        manageCountDto.setInfoFreeCount(infoFreeCount);
        manageCountDto.setInfoPayCount(infoPayCount);
        manageCountDto.setInfoCount(infoCount);
        return R.ok(manageCountDto);
    }


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

@@ -6,6 +6,7 @@
import com.ruoyi.system.service.TInfoConfigService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -32,7 +33,7 @@
    @ApiOperation(value = "修改",tags = "后台-系统设置-关于我们，其他设置")

    @PostMapping("/updateInfoConfig")
    public R<Boolean> updateInfoConfig(TInfoConfig tInfoConfig){
    public R<Boolean> updateInfoConfig(@RequestBody TInfoConfig tInfoConfig){
        return R.ok(tInfoConfigService.updateById(tInfoConfig));
    }


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

@@ -55,6 +55,8 @@
    @Resource
    private TTitleMajorService majorService;
    @Resource
    private TLevelService levelService;
    @Resource
    private TokenService tokenService;
    @Resource
    private TOrderService orderService;
@@ -176,7 +178,7 @@
        record.setRegionName(byId.getProvinceName()+"-"+byId.getName());
        TTechnicalTitle byId1 = tTechnicalTitleService.getById(record.getTechnicalId());
        TTitleMajor byId2 = majorService.getById(record.getMajorId());
        record.setTechnicalName(byId1.getTitileName()+"-"+byId2.getMajorName());
        record.setTechnicalName(byId1.getTitileName()+"-"+byId2.getMajorName()+"-"+record.getLevel());
        if (cacheSet!=null){
            if (cacheSet.contains(record.getId())){
                record.setIsCollect(1);

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

@@ -25,6 +25,7 @@
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -193,7 +194,7 @@
            if (failMsg.size()==0){
                tTitleMajorService.saveBatch(tTechnicalTitles);
            }else {
                return R.fail(failMsg);
                return R.fail(failMsg.stream().collect(Collectors.joining(",")));
            }

        } catch (Exception e) {

 ruoyi-system/src/main/java/com/ruoyi/system/domain/TGeneratedRecords.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -95,17 +96,18 @@
    private Long createBy;

    @TableField("create_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;


    @TableField("price")
    private BigDecimal price;
    @TableField("name")
    private String name="工作生成总结";
    private String name="工作总结生成";

@TableLogic
@TableField("is_delete")
private Integer isDelete;
    @TableLogic
    @TableField("is_delete")
    private Integer isDelete;


    @ApiModelProperty(value = "用户头像")

 ruoyi-system/src/main/java/com/ruoyi/system/domain/TTechnicalTitle.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -44,6 +45,7 @@
    private Long createBy;

    @TableField("create_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;

@TableLogic

 ruoyi-system/src/main/java/com/ruoyi/system/domain/TTitleMajor.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -57,6 +58,7 @@
    private Long createBy;

    @TableField("create_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;

@TableLogic

 ruoyi-system/src/main/java/com/ruoyi/system/domain/TUserChangeDetail.java

@@ -62,6 +62,8 @@

    @TableField(exist = false)
    private String majorName;
    @TableField(exist = false)
    private String levelName;




 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TIndexMenuServiceImpl.java

@@ -14,9 +14,7 @@
import org.springframework.stereotype.Service;

import java.time.LocalDate;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * <p>
@@ -34,7 +32,11 @@

    @Override
    public List<AllertTitleDto> allert(List<String> cityCode) {
        List<AllertTitleDto> allert = this.baseMapper.allert(cityCode);
        List<AllertTitleDto> allert = new ArrayList<>();
        for (String s : cityCode) {
            List<AllertTitleDto> allert1 = this.baseMapper.allert(Collections.singletonList(s));
            allert.addAll(allert1);
        }
        for (AllertTitleDto allertTitleDto : allert) {
            List<TTitleMajor> tTitleMajors = titleMajorMapper.selectList(Wrappers.lambdaQuery(TTitleMajor.class)
                    .eq(TTitleMajor::getTechnicalId, allertTitleDto.getId()));

 ruoyi-system/src/main/resources/mapper/system/TGeneratedRecordsMapper.xml

@@ -44,10 +44,10 @@
            AND ta.phone LIKE concat('%',#{generatedQuery.userPhone},'%')
        </if>
        <if test="generatedQuery.createTime1 != null">
            AND tg.create_time >= #{generatedQuery.createTime1}
            AND tg.create_time >= CONCAT(#{generatedQuery.createTime1},' 00:00:00')
        </if>
        <if test="generatedQuery.createTime2 != null">
            AND tg.create_time &lt;= #{generatedQuery.createTime2}
            AND tg.create_time &lt;= CONCAT(#{generatedQuery.createTime2},' 23:59:59')
        </if>
    </select>


 ruoyi-system/src/main/resources/mapper/system/TIndexMenuMapper.xml

@@ -39,7 +39,7 @@
        WHERE 1=1 and tt.is_delete = 0
        <if test="cityCode != null and cityCode.size() > 0">
            <foreach collection="cityCode" item="id"  separator=",">
                and   FIND_IN_SET(#{id}, tt.region_ids)
                or   FIND_IN_SET(#{id}, tt.region_ids)
            </foreach>
        </if>
    </select>
@@ -208,6 +208,7 @@
        select  sum(payment_amount),count(1)
            from t_order
        <where>
            is_delete = 0
            <if test="dayType == 1">
               and  DATE(create_time ) = CURDATE()
            </if>

 ruoyi-system/src/main/resources/mapper/system/TOrderMapper.xml

@@ -31,6 +31,7 @@
        t1.*,
        t2.NAME AS name,
        t2.phone AS phone,
        t2.avatar AS avatar,
        CONCAT( t2.NAME, ' ', t2.phone ) AS user_search,
        COALESCE ( t_course.course_name, t_information.information_name,t_generated_records.recordsName ) AS good_name,
        COALESCE ( t_course.course_cover, t_information.information_cover ) AS cover,