统一 boot 和 cloud 代码

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/CommonStatusEnum.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.framework.common.enums;
 
+import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -34,4 +35,12 @@ public enum CommonStatusEnum implements IntArrayValuable {
         return ARRAYS;
     }
 
+    public static boolean isEnable(Integer status) {
+        return ObjUtil.equal(ENABLE.status, status);
+    }
+
+    public static boolean isDisable(Integer status) {
+        return ObjUtil.equal(DISABLE.status, status);
+    }
+
 }

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/api/api.ts.vm

@@ -1,4 +1,4 @@
-import { defHttp } from '@/utils/http/axios'
+import {defHttp} from '@/utils/http/axios'
 #set ($baseURL = "/${table.moduleName}/${simpleClassName_strikeCase}")
 
 // 查询${table.classComment}列表

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm

@@ -1,6 +1,6 @@
-import type { BasicColumn, FormSchema } from '@/components/Table'
+import type {BasicColumn, FormSchema} from '@/components/Table'
-import { useRender } from '@/components/Table'
+import {useRender} from '@/components/Table'
-import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import {DICT_TYPE, getDictOptions} from '@/utils/dict'
 
 export const columns: BasicColumn[] = [
 #foreach($column in $columns)
@@ -50,7 +50,7 @@ export const searchFormSchema: FormSchema[] = [
     field: '${javaField}',
   #if ($column.htmlType == "input")
     component: 'Input',
-  #elseif ($column.htmlType == "select" || $column.htmlType == "radio")
+  #elseif ($column.htmlType == "select")
     component: 'Select',
     componentProps: {
       #if ("" != $dictType)## 设置了 dictType 数据字典的情况
@@ -59,6 +59,15 @@ export const searchFormSchema: FormSchema[] = [
         options: [],
       #end
     },
+  #elseif ($column.htmlType == "radio")
+    component: 'Radio',
+    componentProps: {
+      #if ("" != $dictType)## 设置了 dictType 数据字典的情况
+        options: getDictOptions(DICT_TYPE.$dictType.toUpperCase()),
+      #else## 未设置 dictType 数据字典的情况
+        options: [],
+      #end
+    },
   #elseif($column.htmlType == "datetime")
     component: 'RangePicker',
     #end
@@ -181,7 +190,8 @@ export const updateFormSchema: FormSchema[] = [
       fileType: 'file',
       maxCount: 1,
     },
-    #elseif($column.htmlType == "editor")## 文本编辑器component: 'Editor',
+    #elseif($column.htmlType == "editor")## 文本编辑器
+    component: 'Editor',
     #elseif($column.htmlType == "select")## 下拉框
     component: 'Select',
     componentProps: {

yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/index.vue.vm

@@ -1,12 +1,10 @@
 <script lang="ts" setup>
-import ${ simpleClassName }Modal from './${simpleClassName}Modal.vue'
+  import {columns, searchFormSchema} from './'
-import { columns, searchFormSchema } from './${classNameVar}.data'
+  import {useI18n} from '@/hooks/web/useI18n'
-import { useI18n } from '@/hooks/web/useI18n'
+  import {useMessage} from '@/hooks/web/useMessage'
-import { useMessage } from '@/hooks/web/useMessage'
+  import {useModal} from '@/components/Modal'
-import { useModal } from '@/components/Modal'
+  import {useTable} from '@/components/Table'
-import { IconEnum } from '@/enums/appEnum'
+  import { delete${ simpleClassName }, export${ simpleClassName }, get${ simpleClassName } Page } from '@/api/${table.moduleName}/${classNameVar}'
-import { BasicTable, useTable, TableAction } from '@/components/Table'
-import { delete${ simpleClassName }, export${ simpleClassName }, get${ simpleClassName } Page } from '@/api/${table.moduleName}/${classNameVar}'
 
 defineOptions({ name: '${table.className}' })
 
@@ -62,7 +60,7 @@ async function handleDelete(record: Recordable) {
         <a-button type="primary" v-auth="['${permissionPrefix}:create']" :preIcon="IconEnum.ADD" @click="handleCreate">
           {{ t('action.create') }}
         </a-button>
-        <a-button type="warning" v-auth="['${permissionPrefix}:export']" :preIcon="IconEnum.EXPORT" @click="handleExport">
+        <a-button v-auth="['${permissionPrefix}:export']" :preIcon="IconEnum.EXPORT" @click="handleExport">
           {{ t('action.export') }}
         </a-button>
       </template>

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/banner/BannerController.java

@@ -23,7 +23,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - Banner 管理")
 @RestController
-@RequestMapping("/market/banner")
+@RequestMapping("/promotion/banner")
 @Validated
 public class BannerController {
 
@@ -32,14 +32,14 @@ public class BannerController {
 
     @PostMapping("/create")
     @Operation(summary = "创建 Banner")
-    @PreAuthorize("@ss.hasPermission('market:banner:create')")
+    @PreAuthorize("@ss.hasPermission('promotion:banner:create')")
     public CommonResult<Long> createBanner(@Valid @RequestBody BannerCreateReqVO createReqVO) {
         return success(bannerService.createBanner(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新 Banner")
-    @PreAuthorize("@ss.hasPermission('market:banner:update')")
+    @PreAuthorize("@ss.hasPermission('promotion:banner:update')")
     public CommonResult<Boolean> updateBanner(@Valid @RequestBody BannerUpdateReqVO updateReqVO) {
         bannerService.updateBanner(updateReqVO);
         return success(true);
@@ -48,7 +48,7 @@ public class BannerController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除 Banner")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('market:banner:delete')")
+    @PreAuthorize("@ss.hasPermission('promotion:banner:delete')")
     public CommonResult<Boolean> deleteBanner(@RequestParam("id") Long id) {
         bannerService.deleteBanner(id);
         return success(true);
@@ -57,7 +57,7 @@ public class BannerController {
     @GetMapping("/get")
     @Operation(summary = "获得 Banner")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('market:banner:query')")
+    @PreAuthorize("@ss.hasPermission('promotion:banner:query')")
     public CommonResult<BannerRespVO> getBanner(@RequestParam("id") Long id) {
         BannerDO banner = bannerService.getBanner(id);
         return success(BannerConvert.INSTANCE.convert(banner));
@@ -65,7 +65,7 @@ public class BannerController {
 
     @GetMapping("/page")
     @Operation(summary = "获得 Banner 分页")
-    @PreAuthorize("@ss.hasPermission('market:banner:query')")
+    @PreAuthorize("@ss.hasPermission('promotion:banner:query')")
     public CommonResult<PageResult<BannerRespVO>> getBannerPage(@Valid BannerPageReqVO pageVO) {
         PageResult<BannerDO> pageResult = bannerService.getBannerPage(pageVO);
         return success(BannerConvert.INSTANCE.convertPage(pageResult));

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/banner/vo/BannerBaseVO.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.promotion.controller.admin.banner.vo;
 
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.promotion.enums.banner.BannerPositionEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -29,6 +30,7 @@ public class BannerBaseVO {
 
     @Schema(description = "position", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "position 不能为空")
+    @InEnum(BannerPositionEnum.class)
     private Integer position;
 
     @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/banner/vo/BannerRespVO.java

@@ -4,6 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.ToString;
 
+import java.time.LocalDateTime;
+
 @Schema(description = "管理后台 - Banner Response VO")
 @Data
 @ToString(callSuper = true)
@@ -12,4 +14,7 @@ public class BannerRespVO  extends BannerBaseVO {
     @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long id;
 
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "2022-07-01 23:59:59")
+    private LocalDateTime createTime;
+
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/banner/AppBannerController.java

@@ -5,8 +5,6 @@ import cn.iocoder.yudao.module.promotion.controller.app.banner.vo.AppBannerRespV
 import cn.iocoder.yudao.module.promotion.convert.banner.BannerConvert;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.banner.BannerDO;
 import cn.iocoder.yudao.module.promotion.service.banner.BannerService;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -14,11 +12,9 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.time.Duration;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.cache.CacheUtils.buildAsyncReloadingCache;
 
 @RestController
 @RequestMapping("/promotion/banner")
@@ -26,20 +22,6 @@ import static cn.iocoder.yudao.framework.common.util.cache.CacheUtils.buildAsync
 @Validated
 public class AppBannerController {
 
-    // TODO @puhui999：这个目前不缓存，也没问题，因为首页没用到。
-    /**
-     * {@link AppBannerRespVO} 缓存，通过它异步刷新 {@link #getBannerList0(Integer)} 所要的首页数据
-     */
-    private final LoadingCache<Integer, List<AppBannerRespVO>> bannerListCache = buildAsyncReloadingCache(Duration.ofSeconds(10L),
-            new CacheLoader<Integer, List<AppBannerRespVO>>() {
-
-                @Override
-                public List<AppBannerRespVO> load(Integer position) {
-                    return getBannerList0(position);
-                }
-
-            });
-
     @Resource
     private BannerService bannerService;
 
@@ -47,12 +29,8 @@ public class AppBannerController {
     @Operation(summary = "获得 banner 列表")
     @Parameter(name = "position", description = "Banner position", example = "1")
     public CommonResult<List<AppBannerRespVO>> getBannerList(@RequestParam("position") Integer position) {
-        return success(bannerListCache.getUnchecked(position));
-    }
-
-    private List<AppBannerRespVO> getBannerList0(Integer position) {
         List<BannerDO> bannerList = bannerService.getBannerListByPosition(position);
-        return BannerConvert.INSTANCE.convertList01(bannerList);
+        return success(BannerConvert.INSTANCE.convertList01(bannerList));
     }
 
     @PutMapping("/add-browse-count")

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/coupon/CouponTemplateConvert.java

@@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.promotion.convert.coupon;
 
 import cn.hutool.core.map.MapUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponTemplateRespDTO;
 import cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.template.CouponTemplateCreateReqVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.template.CouponTemplatePageReqVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.template.CouponTemplateRespVO;
@@ -59,6 +58,4 @@ public interface CouponTemplateConvert {
         }
     }
 
-    List<CouponTemplateRespDTO> convertList(List<CouponTemplateDO> list);
-
 }

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/banner/BannerDO.java

@@ -6,13 +6,12 @@ import cn.iocoder.yudao.module.promotion.enums.banner.BannerPositionEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
-// TODO @puhui999：表名改成 promotion_banner，然后有序加下；另外，sql 给我下哈；还有那个 position 字典，嘿嘿。
 /**
  * banner DO
  *
  * @author xia
  */
-@TableName("market_banner")
+@TableName("promotion_banner")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java

@@ -147,8 +147,8 @@ public class DiscountActivityServiceImpl implements DiscountActivityService {
     @Override
     public void deleteDiscountActivity(Long id) {
         // 校验存在
-        DiscountActivityDO discountActivity = validateDiscountActivityExists(id);
+        DiscountActivityDO activity = validateDiscountActivityExists(id);
-        if (!discountActivity.getStatus().equals(CommonStatusEnum.ENABLE.getStatus())) { // 未关闭的活动，不能删除噢
+        if (CommonStatusEnum.isEnable(activity.getStatus())) { // 未关闭的活动，不能删除噢
             throw exception(DISCOUNT_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED);
         }
 

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java

@@ -12,8 +12,7 @@ import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
-import java.time.LocalDateTime;
+import java.util.Comparator;
-import java.time.temporal.ChronoUnit;
 import java.util.List;
 import java.util.Map;
 
@@ -44,31 +43,32 @@ public interface MemberSignInRecordConvert {
 
     AppMemberSignInRecordRespVO coverRecordToAppRecordVo(MemberSignInRecordDO memberSignInRecordDO);
 
-    default MemberSignInRecordDO convert(Long userId, MemberSignInRecordDO firstRecord, List<MemberSignInConfigDO> signInConfigs) {
+    default MemberSignInRecordDO convert(Long userId, MemberSignInRecordDO lastRecord, List<MemberSignInConfigDO> configs) {
-        // 1. 计算今天是第几天签到
+        // 1. 计算是第几天签到
-        long day = ChronoUnit.DAYS.between(firstRecord.getCreateTime(), LocalDateTime.now());
+        configs.sort(Comparator.comparing(MemberSignInConfigDO::getDay));
-        // 2. 初始化签到信息
+        MemberSignInConfigDO lastConfig = CollUtil.getLast(configs); // 最大签到天数配置
-        // TODO @puhui999：signInRecord=》record
+        // 1.2. 计算今天是第几天签到
-        MemberSignInRecordDO signInRecord = new MemberSignInRecordDO().setUserId(userId)
+        int day = 1;
-                .setDay(Integer.parseInt(Long.toString(day))) // 设置签到天数 TODO @puhui999：day 应该跟着第几天签到走；不是累加哈；另外 long 转 int，应该 (int) day 就可以了。。。
+        // TODO @puhui999：要判断是不是昨天签到的；是否是昨天的判断，可以抽个方法到 util 里
-                .setPoint(0)  // 设置签到积分默认为
+        if (lastRecord != null) {
-                .setExperience(0);  // 设置签到经验默认为 0
+            day = lastRecord.getDay() + 1;
-        // 3. 获取签到对应的积分数
-        MemberSignInConfigDO lastConfig = signInConfigs.get(signInConfigs.size() - 1); // 最大签到天数
-        if (day > lastConfig.getDay()) { // 超出范围按第一天的经验计算
-            // TODO @puhui999：不能直接取 0，万一它 day 不匹配哈。就是第一天没奖励。。。
-            signInRecord.setPoint(signInConfigs.get(0).getPoint());
-            signInRecord.setExperience(signInConfigs.get(0).getExperience());
-            return signInRecord;
         }
-        // TODO @puhui999：signInConfig 可以改成 config；
+        // 1.3 判断是否超出了最大签到配置
-        MemberSignInConfigDO signInConfig = CollUtil.findOne(signInConfigs, config -> ObjUtil.equal(config.getDay(), day));
+        if (day > lastConfig.getDay()) {
-        if (signInConfig == null) {
+            day = 1; // 超过最大配置的天数，重置到第一天。(也就是说开启下一轮签到)
-            return signInRecord;
         }
-        signInRecord.setPoint(signInConfig.getPoint());
+
-        signInRecord.setExperience(signInConfig.getExperience());
+        // 2.1 初始化签到信息
-        return signInRecord;
+        MemberSignInRecordDO record = new MemberSignInRecordDO().setUserId(userId)
+                .setDay(day).setPoint(0).setExperience(0);
+        // 2.2 获取签到对应的积分
+        MemberSignInConfigDO config = CollUtil.findOne(configs, item -> ObjUtil.equal(item.getDay(), record.getDay()));
+        if (config == null) {
+            return record;
+        }
+        record.setPoint(config.getPoint());
+        record.setExperience(config.getExperience());
+        return record;
     }
 
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java

@@ -35,50 +35,31 @@ public interface MemberSignInRecordMapper extends BaseMapperX<MemberSignInRecord
                 .orderByDesc(MemberSignInRecordDO::getId));
     }
 
-    // TODO @puhui999：这 2 个方法，是不是一个 first；一个 last 就可以了。。
     /**
      * 获取用户最近的签到记录信息，根据签到时间倒序
      *
      * @param userId 用户编号
      * @return 签到记录列表
      */
-    default MemberSignInRecordDO selectLastRecordByUserIdDesc(Long userId) {
+    default MemberSignInRecordDO selectLastRecordByUserId(Long userId) {
         return selectOne(new QueryWrapper<MemberSignInRecordDO>()
                 .eq("user_id", userId)
                 .orderByDesc("create_time")
                 .last("limit 1"));
     }
 
-    /**
-     * 获取用户最早的签到记录信息,根据签到时间倒序
-     *
-     * @param userId 用户编号
-     * @return 签到记录列表
-     */
-    default MemberSignInRecordDO selectLastRecordByUserIdAsc(Long userId) {
-        return selectOne(new QueryWrapper<MemberSignInRecordDO>()
-                .eq("user_id", userId)
-                .orderByAsc("create_time")
-                .last("limit 1"));
-    }
-
     default Long selectCountByUserId(Long userId) {
-        // TODO @puhui999：可以使用 selectCount 里面允许传递字段的方法
+        return selectCount(MemberSignInRecordDO::getUserId, userId);
-        return selectCount(new LambdaQueryWrapperX<MemberSignInRecordDO>()
-                .eq(MemberSignInRecordDO::getUserId, userId));
     }
 
     /**
-     * 获取用户的签到记录列表信息,根据签到时间倒序
+     * 获取用户的签到记录列表信息
      *
      * @param userId 用户编号
      * @return 签到记录信息
      */
-    // TODO @puhui999：这个排序，可以交给 service 哈；
     default List<MemberSignInRecordDO> selectListByUserId(Long userId) {
-        return selectList(new LambdaQueryWrapperX<MemberSignInRecordDO>()
+        return selectList(MemberSignInRecordDO::getUserId, userId);
-                .eq(MemberSignInRecordDO::getUserId, userId)
-                .orderByDesc(MemberSignInRecordDO::getCreateTime));
     }
 
 }

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java

@@ -58,36 +58,38 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
     @Override
     public AppMemberSignInRecordSummaryRespVO getSignInRecordSummary(Long userId) {
         // 1. 初始化默认返回信息
-        // TODO @puhui999：这里 vo 改成 summary 会更好理解；
+        AppMemberSignInRecordSummaryRespVO summary = new AppMemberSignInRecordSummaryRespVO();
-        AppMemberSignInRecordSummaryRespVO vo = new AppMemberSignInRecordSummaryRespVO();
+        summary.setTotalDay(0);
-        vo.setTotalDay(0);
+        summary.setContinuousDay(0);
-        vo.setContinuousDay(0);
+        summary.setTodaySignIn(false);
-        vo.setTodaySignIn(false);
 
         // 2. 获取用户签到的记录数
         Long signCount = signInRecordMapper.selectCountByUserId(userId);
         if (ObjUtil.equal(signCount, 0L)) {
-            return vo;
+            return summary;
         }
-        vo.setTotalDay(signCount.intValue()); // 设置总签到天数
+        summary.setTotalDay(signCount.intValue()); // 设置总签到天数
 
         // 3. 校验当天是否有签到
-        // TODO @puhui999：是不是 signInRecord 可以精简成 record 哈；另外，Desc 貌似可以去掉哈；最后一条了；
+        MemberSignInRecordDO lastRecord = signInRecordMapper.selectLastRecordByUserId(userId);
-        MemberSignInRecordDO signInRecord = signInRecordMapper.selectLastRecordByUserIdDesc(userId);
+        if (lastRecord == null) {
-        if (signInRecord == null) {
+            return summary;
-            return vo;
         }
-        vo.setTodaySignIn(DateUtils.isToday(signInRecord.getCreateTime()));
+        summary.setTodaySignIn(DateUtils.isToday(lastRecord.getCreateTime()));
 
         // 4. 校验今天是否签到，没有签到则直接返回
-        if (!vo.getTodaySignIn()) {
+        if (!summary.getTodaySignIn()) {
-            return vo;
+            return summary;
         }
         // 4.1. 判断连续签到天数
-        // TODO @puhui999：连续签到，可以基于 signInRecord 的 day 和当前时间判断呀？
+        // TODO @puhui999：连续签到，可以基于 lastRecord 的 day 和当前时间判断呀？按 day 统计连续签到天数可能不准确
+        //      1. day 只是记录第几天签到的有可能不连续，比如第一次签到是周一，第二次签到是周三这样 lastRecord 的 day 为 2 但是并不是连续的两天
+        //      2. day 超出签到规则的最大天数会重置到从第一天开始签到（我理解为开始下一轮，类似一周签到七天七天结束下周又从周一开始签到）
+        // 1. 回复：周三签到，day 要归 1 呀。连续签到哈；
         List<MemberSignInRecordDO> signInRecords = signInRecordMapper.selectListByUserId(userId);
-        vo.setContinuousDay(calculateConsecutiveDays(signInRecords));
+        signInRecords.sort(Comparator.comparing(MemberSignInRecordDO::getCreateTime).reversed()); // 根据签到时间倒序
-        return vo;
+        summary.setContinuousDay(calculateConsecutiveDays(signInRecords));
+        return summary;
     }
 
     /**
@@ -144,17 +146,14 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
     @Transactional(rollbackFor = Exception.class)
     public MemberSignInRecordDO createSignRecord(Long userId) {
         // 1. 获取当前用户最近的签到
-        MemberSignInRecordDO lastRecord = signInRecordMapper.selectLastRecordByUserIdDesc(userId);
+        MemberSignInRecordDO lastRecord = signInRecordMapper.selectLastRecordByUserId(userId);
         // 1.1. 判断是否重复签到
         validateSigned(lastRecord);
 
-        // 2. 获取当前用户最早的一次前端记录，用于计算今天是第几天签到
-        MemberSignInRecordDO firstRecord = signInRecordMapper.selectLastRecordByUserIdAsc(userId);
         // 2.1. 获取所有的签到规则
         List<MemberSignInConfigDO> signInConfigs = signInConfigService.getSignInConfigList(CommonStatusEnum.ENABLE.getStatus());
-        signInConfigs.sort(Comparator.comparing(MemberSignInConfigDO::getDay));
         // 2.2. 组合数据
-        MemberSignInRecordDO record = MemberSignInRecordConvert.INSTANCE.convert(userId, firstRecord, signInConfigs);
+        MemberSignInRecordDO record = MemberSignInRecordConvert.INSTANCE.convert(userId, lastRecord, signInConfigs);
 
         // 3. 插入签到记录
         signInRecordMapper.insert(record);

yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/refund/PayRefundApi.java

@@ -8,8 +8,10 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.validation.Valid;
 
@@ -23,9 +25,9 @@ public interface PayRefundApi {
     @Operation(summary = "创建退款单")
     CommonResult<Long> createRefund(@Valid @RequestBody PayRefundCreateReqDTO reqDTO);
 
-    @PostMapping(PREFIX + "/get")
+    @GetMapping(PREFIX + "/get")
     @Operation(summary = "获得退款单")
     @Parameter(name = "id", description = "退款单编号", example = "1", required = true)
-    CommonResult<PayRefundRespDTO> getRefund(Long id);
+    CommonResult<PayRefundRespDTO> getRefund(@RequestParam("id") Long id);
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java

@@ -23,10 +23,10 @@ import cn.iocoder.yudao.module.system.service.member.MemberService;
 import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService;
 import cn.iocoder.yudao.module.system.service.social.SocialUserService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import com.google.common.annotations.VisibleForTesting;
 import com.xingyuv.captcha.model.common.ResponseModel;
 import com.xingyuv.captcha.model.vo.CaptchaVO;
 import com.xingyuv.captcha.service.CaptchaService;
-import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -85,7 +85,7 @@ public class AdminAuthServiceImpl implements AdminAuthService {
             throw exception(AUTH_LOGIN_BAD_CREDENTIALS);
         }
         // 校验是否禁用
-        if (ObjectUtil.notEqual(user.getStatus(), CommonStatusEnum.ENABLE.getStatus())) {
+        if (CommonStatusEnum.isDisable(user.getStatus())) {
             createLoginLog(user.getId(), username, logTypeEnum, LoginResultEnum.USER_DISABLED);
             throw exception(AUTH_LOGIN_USER_DISABLED);
         }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java

@@ -119,7 +119,7 @@ public class OAuth2ClientServiceImpl implements OAuth2ClientService {
         if (client == null) {
             throw exception(OAUTH2_CLIENT_NOT_EXISTS);
         }
-        if (ObjectUtil.notEqual(client.getStatus(), CommonStatusEnum.ENABLE.getStatus())) {
+        if (CommonStatusEnum.isDisable(client.getStatus())) {
             throw exception(OAUTH2_CLIENT_DISABLE);
         }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java

@@ -26,7 +26,6 @@ import org.springframework.util.Assert;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.regex.Pattern;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -140,7 +139,7 @@ public class SmsTemplateServiceImpl implements SmsTemplateService {
         if (channelDO == null) {
             throw exception(SMS_CHANNEL_NOT_EXISTS);
         }
-        if (!Objects.equals(channelDO.getStatus(), CommonStatusEnum.ENABLE.getStatus())) {
+        if (CommonStatusEnum.isDisable(channelDO.getStatus())) {
             throw exception(SMS_CHANNEL_DISABLE);
         }
         return channelDO;