d

xggsve-invoice/app/base/api/impl/op/action.js

@@ -48,6 +48,9 @@ class ActionAPI extends APIBase {
             case "processDics":    // 查询业务进度
             case "processDics":    // 查询业务进度
                 opResult = await this.iprocessSve.allNames(action_body);
                 opResult = await this.iprocessSve.allNames(action_body);
                 break;
                 break;
+            case "invoice":    // 查询发票详细信息
+                opResult = await this.iinvoiceSve.queryInvoice(action_body);
+                break;
             
             
             // case "verificationAndCalculation":          // 发票试算接口
             // case "verificationAndCalculation":          // 发票试算接口
             //     opResult = await rule.dispatcher(action_body);
             //     opResult = await rule.dispatcher(action_body);

xggsve-invoice/app/base/service/impl/invoice/iinvoiceSve.js

@@ -299,5 +299,43 @@ class IInvoiceService extends ServiceBase {
     return invoiceProcessList;
     return invoiceProcessList;
   }
   }
 
 
+  /**
+   * 根据ID查询发票详细信息
+   * @param {*} params 
+   */
+  async queryInvoice(params){
+    if(!params.id){
+      return system.getResult(null,`参数错误 ID不能为空`)
+    }
+    try {
+      let _invoice = await this.dao.findById(this.trim(params.id));
+      if(!_invoice){
+        return system.getResult(null,`发票不存在`);
+      }
+      this.handleDate(_invoice, ['invoice_time','apply_time','updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
+
+      let _invoiceinforeg = await this.iinvoiceinforegDao.findById(this.trim(params.id)) || {};
+      this.handleDate(_invoiceinforeg, ['updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
+      let _invoicedeliver =  await this.iinvoicedeliverDao.model.findOne({
+        where:{
+          invoice_id:_invoice.id
+        }
+      }) || {};
+      this.handleDate(_invoicedeliver, ['updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
+
+      let _invoicesummaryinfo = await this.iinvoicesummaryinfoDao.findById(this.trim(params.id));
+      _invoicesummaryinfo.summary = JSON.parse(_invoicesummaryinfo.summary);
+      this.handleDate(_invoicesummaryinfo, ['invoice_time','updated_at', 'created_at'], 'YYYY-MM-DD HH:mm:ss');
+
+      _invoice.dataValues.invoiceinforeg= _invoiceinforeg;
+      _invoice.dataValues.invoicedeliver= _invoicedeliver;
+      _invoice.dataValues.invoicesummaryinfo= _invoicesummaryinfo;
+      return system.getResult(_invoice);
+    } catch (error) {
+      console.log(error);
+      return system.getResult(null,`系统错误 错误信息${error}`);
+    }
+  }
+
 }
 }
 module.exports = IInvoiceService;
 module.exports = IInvoiceService;

xggsve-invoice/app/base/service/impl/invoice/iinvoicestatusSve.js

@@ -178,10 +178,10 @@ class IinvoicestatusService extends ServiceBase {
 
 
         //更新iinvoice发票记录
         //更新iinvoice发票记录
         await self.dao.update({
         await self.dao.update({
-          deliver_id: _iinvoicedeliver.id,
+          deliver_id:self.trim(params.deliver_id),
           id: self.trim(params.invoice_id),
           id: self.trim(params.invoice_id),
           status: self.trim(params.status),
           status: self.trim(params.status),
-          invoice_deliver_id:self.trim(params.deliver_id)
+          invoice_deliver_id:_iinvoicedeliver.id
         }, t);
         }, t);
       });
       });
       return system.getResultSuccess();
       return system.getResultSuccess();
@@ -395,7 +395,7 @@ class IinvoicestatusService extends ServiceBase {
    * 订单完成
    * 订单完成
    * @param {*} params 
    * @param {*} params 
    */
    */
-  async orderComplete(params) {
+  async completed(params) {
     let _invoice = params._invoice;
     let _invoice = params._invoice;
     _invoice.status = this.trim(params.status);
     _invoice.status = this.trim(params.status);
     try {
     try {
@@ -545,7 +545,8 @@ class IinvoicestatusService extends ServiceBase {
    */
    */
   async deliverReject(params) {
   async deliverReject(params) {
     try {
     try {
-      await this.delivered(params);
+      await this.invoiced(params);
+      return system.getResultSuccess();
     } catch (error) {
     } catch (error) {
       console.log(error);
       console.log(error);
       return system.getResult(null,`系统错误 错误信息${error}`);
       return system.getResult(null,`系统错误 错误信息${error}`);