Merge remote-tracking branch 'origin/master'

xuhy

2024-08-24 07be5a3d0b290623c877713854c5174cf37cec17

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/PointsQueryDto.java

@@ -2,10 +2,12 @@

import com.ruoyi.common.core.web.domain.BasePojo;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("积分明细查询")
public class PointsQueryDto extends BasePage {
    @ApiModelProperty("用户id")
   private   Long userId;

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java

@@ -32,6 +32,8 @@
    @ApiModelProperty(value = "主键")
    @TableId("id")
    private Long id;
    @TableField(exist = false)
    private String uid;

    @ApiModelProperty(value = "app用户id")
    @TableField("app_user_id")

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/IntegralRuleClient.java

@@ -19,6 +19,6 @@
     * 获取积分设置
     * @return
     */
    @PostMapping("/integral/getSet")
    @GetMapping("/integral/getSet")
    R<TIntegralRule> getSet();
}

 ruoyi-common/ruoyi-common-core/pom.xml

@@ -16,6 +16,7 @@
    </description>

    <dependencies>
        

        <!-- SpringCloud Openfeign -->
        <dependency>

 ruoyi-service/ruoyi-account/pom.xml

@@ -15,6 +15,7 @@
    </description>

    <dependencies>

        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-api-order</artifactId>
@@ -140,9 +141,14 @@
            <version>4.38.10.ALL</version>
        </dependency>
        <dependency>
            <groupId>com.huaweicloud</groupId>
            <artifactId>esdk-obs-java-bundle</artifactId>
            <version>3.23.9.1</version>
        </dependency>
        <dependency>
            <groupId>org.openeuler</groupId>
            <artifactId>bgmprovider</artifactId>
            <version>1.1.2</version>
            <version>1.0.4</version>
            <scope>compile</scope>
        </dependency>


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

@@ -405,6 +405,9 @@
    @ApiOperation(value = "用户详情积分明细", tags = {"后台-用户管理-用户列表","小程序-个人中心"})
    @PostMapping(value = "/user/points/page")
    public R<Page<TAppUserIntegralChange>> pointsDetail(@RequestBody PointsQueryDto pointsQueryDto) {
        if (pointsQueryDto.getUserId()==null){
            pointsQueryDto.setUserId(tokenService.getLoginUserApplet().getUserId());
        }
        List<Integer> types = new ArrayList<>();
        if (pointsQueryDto.getType()!=null){
            types.add(1);
@@ -494,6 +497,9 @@
        appUserInfoDto.setCouponNum(Math.toIntExact(coupons));
        //当前绑定的车辆
        List<TAppUserCar> list = carService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).list();
        for (TAppUserCar tAppUserCar : list) {
            tAppUserCar.setUid(tAppUserCar.getId().toString());
        }
        appUserInfoDto.setUserCars(list);
        return R.ok(appUserInfoDto);

@@ -761,7 +767,7 @@
        LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
        Long userId = loginUserApplet.getUserId();
        TAppUser byId = appUserService.getById(userId);

        appUserCar.setAppUserId(userId);

        //如果是第一次添加车辆，增加积分
        Long count = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).count();
@@ -802,6 +808,12 @@

        return R.ok();
    }
    @ApiOperation(value = "车辆详情", tags = {"小程序-个人中心-车辆"})
    @GetMapping(value = "/user/car/detail")
    public R<TAppUserCar> carDetail(String id) {
        TAppUserCar byId = appUserCarService.getById(id);
        return R.ok(byId);
    }

    @ApiOperation(value = "获取车辆品牌", tags = {"小程序-个人中心-车辆"})
    @GetMapping(value = "/user/car/getBrands")
@@ -817,7 +829,15 @@
    @GetMapping(value = "/user/car/getModel")
    public R getModel(String id) throws Exception {
        String modelById = CarBrandUtil.getModelById(id);
        return R.ok(modelById);
        JSONObject jsonObject = JSON.parseObject(modelById);
        JSONArray data = jsonObject.getJSONArray("data");
        JSONArray backList = new JSONArray();
        for (Object datum : data) {
            JSONObject jsonObject1 = JSON.parseObject(datum.toString());
            JSONArray list = jsonObject1.getJSONArray("list");
            backList.addAll(list);
        }
        return R.ok(backList);
    }
}