1.
phpcjl
2024-12-10 417adaa72f4ab9e5df724d9ef598faad674c9cd8
1.
2个文件已修改
25 ■■■■■ 已修改文件
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -19,8 +19,10 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.PointSetting;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.domain.VipSetting;
import com.ruoyi.other.api.feignClient.PointSettingClient;
import com.ruoyi.other.api.feignClient.ShopClient;
import com.ruoyi.other.api.feignClient.VipSettingClient;
import com.ruoyi.system.api.domain.SysUser;
@@ -69,10 +71,13 @@
    
    @Resource
    private VipSettingClient vipSettingClient;
    @Resource
    private PointSettingClient pointSettingClient;
    
    @Resource
    private UserChangeLogService userChangeLogService;
    @Value("${file.upload.location}")
    private String filePath;
    
@@ -286,7 +291,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);