代码提交

无关风月

2024-08-16 7c9380ec03f3a16b719eb2c21e2ffff8bf411178

代码提交

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/THtml.java

@@ -24,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_html")
@ApiModel(value="THtml对象", description="")
public class THtml extends BasePojo {
public class THtml  {

    private static final long serialVersionUID = 1L;


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java

@@ -63,16 +63,16 @@
        return AjaxResult.ok(res);
    }
    /**
     * 选择车辆列表
     * 选择车辆列表 远程调用
     * @return
     */
    @ApiOperation(value = "选择车辆列表", tags = {"小程序-扫一扫"})
    @PostMapping(value = "/scan/carList")
    public AjaxResult<List<TAppUserCar>> carList() {
    public R<List<TAppUserCar>> carList() {
        // todo 用户id
        List<TAppUserCar> appUserId = appUserCarService.list(new QueryWrapper<TAppUserCar>()
                .eq("app_user_id",tokenService.getLoginUserApplet().getUserid() ));
        return AjaxResult.ok(appUserId);
                .eq("app_user_id",tokenService.getLoginUserApplet().getUserid()));
        return R.ok(appUserId);
    }

    /**

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java

@@ -241,8 +241,8 @@
                    break;
            }
        }
        // 通过集合的money字段 将money从大到小排序
        data.sort(Comparator.comparing(CouponListVOVO::getMoney).reversed());
        // 通过集合的money、isUse字段 将money、isUse从大到小排序 将不可用的排在最后
        data.sort(Comparator.comparing(CouponListVOVO::getMoney).reversed().thenComparing(CouponListVOVO::getIsUse));
        pageInfo.setRecords(data);
        return pageInfo;
    }