发票使用修改
parent
ccc9d87f76
commit
846a168d79
|
|
@ -158,7 +158,7 @@ public class InvoiceLogController extends Controller {
|
||||||
String invoice_number = get("invoice_number");
|
String invoice_number = get("invoice_number");
|
||||||
String invoice_code = get("invoice_code");
|
String invoice_code = get("invoice_code");
|
||||||
String order_sns = get("order_sns");
|
String order_sns = get("order_sns");
|
||||||
|
Integer invoice_type = getInt("invoice_type");
|
||||||
renderJson(InvoiceLogSyncService.me.batchSave(invoice_number, invoice_code, order_sns, tokenuser));
|
renderJson(InvoiceLogSyncService.me.batchSave(invoice_number, invoice_code, order_sns, tokenuser,invoice_type));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ public class InvoiceLogSyncService extends BaseSyncService {
|
||||||
* @param sysuser
|
* @param sysuser
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public Result batchSave(String invoice_number, String invoice_code, String order_sns, Sysuser sysuser) {
|
public Result batchSave(String invoice_number, String invoice_code, String order_sns, Sysuser sysuser, Integer invoice_type) {
|
||||||
String[] snarr = order_sns.split(",");
|
String[] snarr = order_sns.split(",");
|
||||||
List<String> question = new ArrayList<>();
|
List<String> question = new ArrayList<>();
|
||||||
List<String> ordersnlist = new ArrayList<>();
|
List<String> ordersnlist = new ArrayList<>();
|
||||||
|
|
@ -74,14 +74,16 @@ public class InvoiceLogSyncService extends BaseSyncService {
|
||||||
invoiceLog.setState(OrderStateEnum.RECEIVED.getStateid());
|
invoiceLog.setState(OrderStateEnum.RECEIVED.getStateid());
|
||||||
invoiceLog.setCode(invoice_code);
|
invoiceLog.setCode(invoice_code);
|
||||||
invoiceLog.setInvoiceNumber(invoice_number);
|
invoiceLog.setInvoiceNumber(invoice_number);
|
||||||
invoiceLog.setInvoiceType(2);
|
// invoiceLog.setInvoiceType(2);
|
||||||
|
invoiceLog.setInvoiceType(invoice_type);
|
||||||
invoiceLog.setOrderSn(o.getSn());
|
invoiceLog.setOrderSn(o.getSn());
|
||||||
invoiceLog.setType(OrderTypeEnum.TEMP.getTypeid());
|
invoiceLog.setType(OrderTypeEnum.TEMP.getTypeid());
|
||||||
|
|
||||||
logs.add(invoiceLog);
|
logs.add(invoiceLog);
|
||||||
|
|
||||||
o.setInvoiceSite(2);
|
o.setInvoiceSite(2);
|
||||||
o.setInvoiceType(2);
|
// o.setInvoiceType(2);
|
||||||
|
o.setInvoiceType(invoice_type);
|
||||||
o.setInvoiceNumber(invoice_number);
|
o.setInvoiceNumber(invoice_number);
|
||||||
o.setInvoiceCode(invoice_code);
|
o.setInvoiceCode(invoice_code);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue