From ef69122c69858ed738f016ee760fa1da03df20d6 Mon Sep 17 00:00:00 2001 From: "lisai17@sina.com" Date: Thu, 4 Mar 2021 14:57:05 +0800 Subject: [PATCH] . --- .../order/ordertemp/OrderTempController.java | 22 ++++++++++++++++++- .../order/ordertemp/OrderTempSyncService.java | 4 ++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java index b56a53d..6ad570a 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempController.java @@ -40,7 +40,7 @@ public class OrderTempController extends BaseController { Integer supermarket_id = getInt("supermarket_id"); Integer isprepaid = getInt("isprepaid"); String invoice_code = get("invoice_code"); - String ticket_code = get("ticket_code"); + String ticket_code = get("ticket_code"); Integer invoice_type = getInt("invoice_type"); Integer customer_id = getInt("customer_id"); Boolean invoice_code_is_null = getBoolean("invoice_code_is_null"); @@ -159,6 +159,26 @@ public class OrderTempController extends BaseController { } + @Before(SnValidator.class) + public void ticket() { + Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); + + if (tokenuser == null) { + renderJson(Result.noauth()); + return; + } + + String sn = get("sn"); + String ticket_code = get("ticket_code"); + String printer = get("printer", Enums.PrinterIdEnum.printer1.name()); + + if (Integer.parseInt(sn.substring(10, 12)) != OrderTypeEnum.TEMP.getTypeid()) { + renderJson(Result.failed("sn 不能为 null")); + } else { + renderJson(OrderTempSyncService.me.ticket(sn, ticket_code, printer, tokenuser)); + } + } + @Before(SnValidator.class) public void print() { Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java index e78667b..ab442ce 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java @@ -1165,6 +1165,10 @@ public class OrderTempSyncService { return Result.failedstr("按订单号【%s】未找到记录", sn); } + if(order.getInvoiceType() != 2){ + return Result.failed("需要专票的订单才用结算单"); + } + int orderstate = order.getState(); if (orderstate == OrderStateEnum.INVALID.getStateid()) {