lisai17@sina.com 2021-03-04 14:57:05 +08:00
parent 554fc601fa
commit ef69122c69
2 changed files with 25 additions and 1 deletions

View File

@ -40,7 +40,7 @@ public class OrderTempController extends BaseController {
Integer supermarket_id = getInt("supermarket_id"); Integer supermarket_id = getInt("supermarket_id");
Integer isprepaid = getInt("isprepaid"); Integer isprepaid = getInt("isprepaid");
String invoice_code = get("invoice_code"); 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 invoice_type = getInt("invoice_type");
Integer customer_id = getInt("customer_id"); Integer customer_id = getInt("customer_id");
Boolean invoice_code_is_null = getBoolean("invoice_code_is_null"); 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) @Before(SnValidator.class)
public void print() { public void print() {
Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token")); Sysuser tokenuser = SysuserSyncService.me.getSysuserByToken(get("token"));

View File

@ -1165,6 +1165,10 @@ public class OrderTempSyncService {
return Result.failedstr("按订单号【%s】未找到记录", sn); return Result.failedstr("按订单号【%s】未找到记录", sn);
} }
if(order.getInvoiceType() != 2){
return Result.failed("需要专票的订单才用结算单");
}
int orderstate = order.getState(); int orderstate = order.getState();
if (orderstate == OrderStateEnum.INVALID.getStateid()) { if (orderstate == OrderStateEnum.INVALID.getStateid()) {