Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

Pu Zhibing

2024-12-10 af495911ed2b8bbc65ca45e70e74681cad2e648b

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

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

@@ -45,9 +45,9 @@
    @TableField("red_amount")
    private BigDecimal redAmount;

    @ApiModelProperty(value = "红包金额")
    @ApiModelProperty(value = "积分")
    @TableField("point")
    private BigDecimal point;
    private Integer point;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")

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

@@ -92,6 +92,8 @@

    public void setId(Long id) {
        this.id = id;
        this.idStr = String.valueOf(id);
        if (id != null){
            this.idStr = String.valueOf(id);
        }
    }
}

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

@@ -60,7 +60,7 @@
        if (pointSetting.getData() != null) {
            userSignRecord.setPoint(pointSetting.getData().getSignPoint());
        }else {
            userSignRecord.setPoint(BigDecimal.ZERO);
            userSignRecord.setPoint(0);
        }
        R<BigDecimal> bigDecimalR = systemConfigClient.redPackegeSet();
        userSignRecord.setRedAmount(bigDecimalR.getData());

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/dto/SignBackRDto.java

@@ -7,6 +7,6 @@

@Data
public class SignBackRDto {
    private BigDecimal point;
    private Integer point;
    private BigDecimal redAmount;
}

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

@@ -74,19 +74,19 @@
    
    @Resource
    private VipSettingClient vipSettingClient;

    @Resource
    private PointSettingClient pointSettingClient;
    
    @Resource
    private UserChangeLogService userChangeLogService;
	

    @Value("${file.upload.location}")
    private String filePath;
    
    @Value("${file.upload.accessPath}")
    private String accessPath;
	
    @Resource
    private PointSettingClient pointSettingClient;
	

    @Resource
    private UserPointService userPointService;
    
@@ -297,7 +297,15 @@
            appUser.setTotalRedPacketAmount(BigDecimal.ZERO);
            appUser.setTotalDistributionAmount(BigDecimal.ZERO);
            appUser.setBalance(BigDecimal.ZERO);
            appUser.setLavePoint(0);
            R<PointSetting> pointSettingR = pointSettingClient.getPointSetting(1);
            if (R.isError(pointSettingR)){
                throw new RuntimeException("获取积分设置失败");
            }
            PointSetting pointSetting = pointSettingR.getData();
            if (pointSetting == null){
                throw new RuntimeException("积分设置不存在");
            }
            appUser.setLavePoint(pointSetting.getGetRegisPoint());
            appUser.setTotalPoint(0);
            //根据平台的配置未达标，则标注为可修改推广人
            appUser.setChangePromoter(0);

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java

@@ -55,6 +55,14 @@



    @PostMapping
    @ApiOperation(value = "新增门店", tags = {"后台管理-门店管理-新增门店"})
    public R<Void> add(@RequestBody Shop shop){
        shopService.save(shop);
        return R.ok();
    }


    @PostMapping("/getDetailById")
    public R<Shop> getDetailById(@RequestParam("id") Long id){
        Shop byId = shopService.getById(id);