From 2f8e70ad2884d2b6b7443dfae0af11ae9cfc8b99 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:44:10 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/controller/TTicketController.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TTicketController.java b/manage/src/main/java/com/jilongda/manage/controller/TTicketController.java
index 14dd5d6..58d47e7 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TTicketController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TTicketController.java
@@ -1,20 +1,20 @@
package com.jilongda.manage.controller;
+import com.alibaba.fastjson.JSONObject;
+import com.jilongda.common.Ticket.TicketUtil;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
+import com.jilongda.manage.model.TStore;
import com.jilongda.manage.model.TTicket;
-import com.jilongda.manage.query.TWarehousingDetailQuery;
import com.jilongda.manage.query.TicketQuery;
+import com.jilongda.manage.service.TStoreService;
import com.jilongda.manage.service.TTicketService;
-import com.jilongda.manage.vo.TFrameWarehousingDetailVO;
import com.jilongda.manage.vo.TTicketVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import sun.security.krb5.internal.Ticket;
/**
* <p>
@@ -30,8 +30,11 @@
public class TTicketController {
+
@Autowired
private TTicketService tTicketService;
+ @Autowired
+ private TStoreService storeService;
@ApiOperation(value = "小票机列表")
@PostMapping(value = "/pageList")
@@ -43,13 +46,29 @@
@ApiOperation(value = "小票机添加")
@PostMapping(value = "/add")
public ApiResult<String> add(@RequestBody TTicket dto) {
+ TStore store = storeService.getById(dto.getStoreId());
+ String res = TicketUtil.addprinter(dto.getCloudId() + "#" + dto.getSecret() + "#" + store.getName());
+ JSONObject result = JSONObject.parseObject(res);
+ if (!result.getString("msg").equals("ok")){
+ return ApiResult.failed(result.getString("msg"));
+ }
tTicketService.save(dto);
return ApiResult.success();
}
-
+ @ApiOperation(value = "小票机详情")
+ @GetMapping(value = "/detail")
+ public ApiResult<TTicket> detail(Integer id) {
+ return ApiResult.success(tTicketService.getById(id));
+ }
@ApiOperation(value = "小票机编辑")
@PostMapping(value = "/update")
public ApiResult<String> update(@RequestBody TTicket dto) {
+ TStore store = storeService.getById(dto.getStoreId());
+ String res = TicketUtil.editprinter(dto.getCloudId()+"",store.getName());
+ JSONObject result = JSONObject.parseObject(res);
+ if (!result.getString("msg").equals("ok")){
+ return ApiResult.failed(result.getString("msg"));
+ }
tTicketService.updateById(dto);
return ApiResult.success();
}
--
Gitblit v1.7.1