合并代码

puzhibing

2024-12-10 1ccd22706067b95141c83110c142c4a66306dd27

合并代码

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppUserClientFallbackFactory.java

@@ -6,6 +6,7 @@
import com.ruoyi.common.core.domain.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;

import java.util.List;
@@ -41,6 +42,7 @@
                throw new RuntimeException("获取优惠券数量失败");
            }

            @GetMapping("/appUserShop/shop/{userId}")
            @Override
            public R<List<AppUserShop>> getAppUserShop(Long userId) {
                log.error("获取用户门店信息失败：{}", cause.getMessage());

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

@@ -157,12 +157,7 @@
        Long userId = tokenService.getLoginUserApplet().getUserid();
        AppUser user = appUserService.getById(userId);

        List<UserSignRecord> list = userSignRecordService.lambdaQuery().eq(UserSignRecord::getSignDay, LocalDate.now()).list();
        if (!list.isEmpty()){
            user.setIsSign(1);
        }else {
            user.setIsSign(0);
        }


        return R.ok(user);
    }
@@ -283,6 +278,13 @@
        user.setCount5(count5);
        user.setCount6(count6);
        user.setCount7(count7);

        List<UserSignRecord> list = userSignRecordService.lambdaQuery().eq(UserSignRecord::getSignDay, LocalDate.now()).list();
        if (!list.isEmpty()){
            user.setIsSign(1);
        }else {
            user.setIsSign(0);
        }
        return R.ok(user);



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

@@ -69,6 +69,7 @@
        SignBackRDto signBackRDto = new SignBackRDto();
        signBackRDto.setPoint(userSignRecord.getPoint());
        signBackRDto.setRedAmount(userSignRecord.getRedAmount());
        userSignRecordService.save(userSignRecord);
        return R.ok(signBackRDto);
    }


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

@@ -300,7 +300,7 @@
        }
        LoginVo loginVo = new LoginVo();
        loginVo.setSkipPage(1);
        loginVo.setFirstTime(null == appUser1 ? true : false);
        loginVo.setFirstTime(null == appUser1);
        loginVo.setPhone(appUser.getPhone());
        //构建token
        LoginUser loginUser = new LoginUser();
@@ -342,7 +342,7 @@
        //使用地图获取省市区数据
        String longitude = nearbyReferrer.getLongitude();
        String latitude = nearbyReferrer.getLatitude();
        String cityCode = ""; // TODO 待完善
        String cityCode = "510100"; // TODO 待完善
        List<NearbyReferrerVo> list = this.baseMapper.getNearbyReferrer(cityCode, nearbyReferrer);
        return list;
    }

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -172,7 +172,9 @@
        orderDetailVO.setLatitude(shop.getLatitude());
        orderDetailVO.setShopId(shop.getId());
        orderDetailVO.setTechnicianName(technician.getName());
        if(null != subscribe){
        orderDetailVO.setTechnicianSubscribeId(String.valueOf(subscribe.getId()));
        }
        return orderDetailVO;
    }