From 18bdff5e42bc010f71d4a0820707e29b4c8500f9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 一月 2025 11:32:31 +0800
Subject: [PATCH] bug修改
---
optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
index 92d624e..48787e6 100644
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
+++ b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
@@ -1,20 +1,19 @@
package com.jilongda.optometrist.controller;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.jilongda.common.Ticket.TAddOptometryVO;
+import com.jilongda.common.Ticket.TOptometryDetailVO;
+import com.jilongda.common.Ticket.TicketUtil;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
-import com.jilongda.optometrist.authority.model.SecUser;
import com.jilongda.optometrist.authority.service.SecUserService;
import com.jilongda.optometrist.model.*;
-import com.jilongda.optometrist.query.TOptometristQuery;
import com.jilongda.optometrist.query.TOptometryQuery;
-import com.jilongda.optometrist.query.TicketQuery;
import com.jilongda.optometrist.service.*;
import com.jilongda.optometrist.utils.LoginInfoUtil;
import com.jilongda.optometrist.vo.*;
-import com.sun.org.apache.bcel.internal.generic.NEW;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -22,6 +21,7 @@
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
@@ -57,6 +57,8 @@
private TOrderService orderService;
@Autowired
private TOptometryDetailService optometryDetailService;
+ @Autowired
+ private TTicketService tTicketService;
@ApiOperation(value = "获取验光单分页列表",tags = "验光单")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TOptometryVO>> pageList(@RequestBody TOptometryQuery query) {
@@ -267,6 +269,25 @@
// 验光完成
lineUp.setStatus(3);
tLineUpService.updateById(lineUp);
+ dto.setOptometristName(optometrist.getName());
+ TStore store = storeService.getById(lineUp.getStoreId());
+ dto.setShopName(store.getName());
+ TAppUser appUser = appUserService.getById(lineUp.getUserId());
+ dto.setPhone(appUser.getPhone());
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String format = simpleDateFormat.format(new Date());
+ dto.setTime(format);
+ TTicket tTicket = tTicketService.lambdaQuery().eq(TTicket::getStoreId, lineUp.getStoreId())
+ .eq(TTicket::getStatus, 1).list().stream().findFirst().orElse(null);
+ if (tTicket==null){
+ return ApiResult.failed("当前门店未绑定小票机");
+ }
+ dto.setSn(tTicket.getCloudId()+"");
+ String print = TicketUtil.print(dto);
+ JSONObject jsonObject = JSONObject.parseObject(print);
+ if (!jsonObject.getString("msg").equals("0")){
+ return ApiResult.failed(jsonObject.getString("msg"));
+ }
return ApiResult.success();
}
--
Gitblit v1.7.1