bug修改

无关风月

2025-01-10 3cad62fb2e427a721da31f8afbbe3248655ff479

bug修改

 applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java

@@ -52,6 +52,7 @@
    public ApiResult add(@Validated @RequestBody TLineUp dto) {
        // 获取当天该门店的排号
        long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class)
                .likeRight(TLineUp::getCreateTime, LocalDate.now())
                .eq(TLineUp::getStoreId, dto.getStoreId()));
        dto.setStatus(1);
        dto.setUserId(loginInfoUtil.getUserId());

 manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java

@@ -104,7 +104,9 @@
        if (optometrist!=null){
            res.setOptometristName(optometrist.getName());
        }
        res.setSalesUser(sysUser.getNickName());
        if (sysUser!=null){
            res.setSalesUser(sysUser.getNickName());
        }
        res.setOrderTime(TimeUtils.localDateTimeToString(order.getCreateTime()));
        res.setAfterSalesTime(TimeUtils.localDateTimeToString(orderAftersales.getCreateTime()));
        List<TOrderGoods> list = goodsService.lambdaQuery().eq(TOrderGoods::getOrderId, order.getId()).list();

 manage/src/main/java/com/jilongda/manage/controller/TOrderController.java

@@ -213,10 +213,10 @@
                }else {
                    split = orderGood.getLLens().split(",");
                }
                TBrand one1 = brandService.lambdaQuery().eq(TBrand::getName, orderGood.getBrandName())
                TBrand brand = brandService.lambdaQuery().eq(TBrand::getName, orderGood.getBrandName())
                        .eq(TBrand::getType, 2).one();
                TLensSeries lensSeries = lensSeriesService.lambdaQuery().eq(TLensSeries::getName, orderGood.getSeriesName())
                        .eq(TLensSeries::getBrandId, one1.getId()).one();
                        .eq(TLensSeries::getBrandId, brand.getId()).one();
                TLensGoods one = lensGoodsService.lambdaQuery()
                        .eq(StringUtils.hasLength(orderGood.getSeriesName()),TLensGoods::getSeriesId, lensSeries.getId())
                        .eq(StringUtils.hasLength(orderGood.getRefractiveIndex()),TLensGoods::getRefractiveIndex, orderGood.getRefractiveIndex())
@@ -325,7 +325,7 @@
                    return ApiResult.failed("优惠券不存在");
                }
                List<TCouponReceive> couponReceives = couponReceiveService.lambdaQuery()
                        .eq(TCouponReceive::getId, dto.getUserId())
                        .eq(TCouponReceive::getUserId, dto.getUserId())
                        .eq(TCouponReceive::getCouponId, couponReceive.getCouponId())
                        .orderByDesc(TCouponReceive::getCreateTime).list();
                if (couponReceives.isEmpty())return ApiResult.failed("优惠券不存在");

 optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java

@@ -123,7 +123,7 @@
        // 获取凌晨00：00：00和23：59：59
        LocalDateTime startTime = nowTime.withHour(0).withMinute(0).withSecond(0);
        LocalDateTime endTime = nowTime.withHour(23).withMinute(59).withSecond(59);
        int size = optometryService.lambdaQuery().eq(TOptometry::getStoreId, optometrist.getId())
        int size = optometryService.lambdaQuery().eq(TOptometry::getStoreId, store.getId())
                .between(TOptometry::getCreateTime, startTime, endTime)
                .eq(TOptometry::getStatus, 3).list().size();
        tOptometristVO.setOptometryCount(size);
@@ -182,6 +182,7 @@
    public ApiResult startOptometry(Integer id) {
        Integer userId = loginInfoUtil.getUserId();
        List<TLineUp> list = tLineUpService.lambdaQuery().eq(TLineUp::getStatus, 2)
                .ne(TLineUp::getId,id)
                .eq(TLineUp::getOptometristId, userId).list();
        if (!list.isEmpty()){
            return ApiResult.failed("当前还有未结束的验光单");
@@ -197,6 +198,7 @@
        end.setMinutes(59);
        end.setSeconds(59);
        List<TLineUp> lineUps = tLineUpService.lambdaQuery().eq(TLineUp::getStoreId, lineUp.getStoreId())
                .eq(TLineUp::getStatus,1)
                .between(TLineUp::getCreateTime, start, end).list();
        for (TLineUp up : lineUps) {
            if (Integer.parseInt(up.getCode())<Integer.parseInt(lineUp.getCode())){
@@ -226,22 +228,22 @@
    @ApiOperation(value = "填写验光信息完成")
    @PostMapping(value = "/add")
    public ApiResult<String> add(@RequestBody TAddOptometryVO dto) {
        TLineUp byId = tLineUpService.getById(dto.getId());
        TAppUser byId1 = appUserService.getById(byId.getUserId());
        TLineUp lineUp = tLineUpService.getById(dto.getId());
        TAppUser app = appUserService.getById(lineUp.getUserId());
        TOptometry tOptometry = new TOptometry();
        tOptometry.setUserId(byId.getUserId());
        tOptometry.setAge(byId.getAge());
        tOptometry.setGender(byId.getGender());
        if (byId1!=null){
            tOptometry.setPhone(byId1.getPhone());
        tOptometry.setUserId(lineUp.getUserId());
        tOptometry.setAge(lineUp.getAge());
        tOptometry.setGender(lineUp.getGender());
        if (app!=null){
            tOptometry.setPhone(app.getPhone());
        }
        tOptometry.setLineUpId(dto.getId());
        Integer userId = loginInfoUtil.getUserId();
        TOptometrist byId2 = optometristService.getById(userId);
        tOptometry.setRealName(byId.getUserName());
        TOptometrist optometrist = optometristService.getById(userId);
        tOptometry.setRealName(lineUp.getUserName());
        tOptometry.setLineUpId(dto.getId());
        tOptometry.setOptometristId(userId);
        tOptometry.setStoreId(byId2.getStoreId());
        tOptometry.setStoreId(optometrist.getStoreId());
        tOptometry.setStatus(3);
        optometryService.save(tOptometry);
        List<TOptometryDetail> tOptometryDetails = new ArrayList<>();
@@ -257,14 +259,14 @@
            tOptometryDetail.setPupilHeight(optometryDetailVO.getPupilHeight());
            tOptometryDetail.setPupilDistance(optometryDetailVO.getPupilDistance());
            tOptometryDetail.setCorrect(optometryDetailVO.getCorrect());
            tOptometryDetail.setStoreId(byId2.getStoreId());
            tOptometryDetail.setStoreId(optometrist.getStoreId());
            tOptometryDetail.setStatus(optometryDetailVO.getStatus());
            tOptometryDetails.add(tOptometryDetail);
        }
        optometryDetailService.saveBatch(tOptometryDetails);
        // 验光完成
        byId.setStatus(3);
        tLineUpService.updateById(byId);
        lineUp.setStatus(3);
        tLineUpService.updateById(lineUp);
        return ApiResult.success();
    }