Merge branch 'xgg-deliver-ali' of gitlab.gongsibao.com:jiangyong/zhichan into xgg-deliver-ali

xgg-deliver/app/base/controller/impl/common/deliverCtl.js

@@ -114,5 +114,49 @@ class DeliverCtl extends CtlBase {
     }
   }
 
+
+  async provinceList(pobj, pobj2, req) {
+    try {
+      return system.getResultSuccess([
+        {"id": 1100, "name":"北京市"},
+        {"id": 1200, "name":"天津市"},
+        {"id": 1300, "name":"河北省"},
+        {"id": 1400, "name":"山西省"},
+        {"id": 1500, "name":"内蒙古自治区"},
+        {"id": 2100, "name":"辽宁省"},
+        {"id": 2200, "name":"吉林省"},
+        {"id": 2300, "name":"黑龙江省"},
+        {"id": 3100, "name":"上海市"},
+        {"id": 3200, "name":"江苏省"},
+        {"id": 3300, "name":"浙江省"},
+        {"id": 3400, "name":"安徽省"},
+        {"id": 3500, "name":"福建省"},
+        {"id": 3600, "name":"江西省"},
+        {"id": 3700, "name":"山东省"},
+        {"id": 4100, "name":"河南省"},
+        {"id": 4200, "name":"湖北省"},
+        {"id": 4300, "name":"湖南省"},
+        {"id": 4400, "name":"广东省"},
+        {"id": 4500, "name":"广西壮族自治区"},
+        {"id": 5000, "name":"重庆市"},
+        {"id": 5100, "name":"四川省"},
+        {"id": 5200, "name":"贵州省"},
+        {"id": 5300, "name":"云南省"},
+        {"id": 5400, "name":"西藏自治区"},
+        {"id": 6100, "name":"陕西省"},
+        {"id": 6200, "name":"甘肃省"},
+        {"id": 6300, "name":"青海省"},
+        {"id": 6400, "name":"宁夏回族自治区"},
+        {"id": 6500, "name":"新疆维吾尔自治区"},
+        {"id": 7100, "name":"台湾省"},
+        {"id": 8100, "name":"香港特别行政区"},
+        {"id": 8200, "name":"澳门特别行政区"},
+      ]);
+    } catch (e) {
+      console.log(e);
+      return system.getResultFail(500, "接口错误");
+    }
+  }
+
 }
 module.exports = DeliverCtl;
\ No newline at end of file

xgg-deliver/app/base/controller/impl/invoice/invoiceCtl.js

@@ -74,5 +74,24 @@ class InvoiceCtl extends CtlBase {
     }
   }
 
+  /**
+   * 发票申请
+   * @param {*} pobj
+   */
+  async invoiceApply(pobj, pobj2, req) {
+    try {
+      pobj.invoice_amount = system.y2f(pobj.invoice_amount);
+      pobj.additional_tax = system.y2f(pobj.additional_tax);
+      pobj.value_added_tax = system.y2f(pobj.value_added_tax);
+      pobj.personal_invoice_tax = system.y2f(pobj.personal_invoice_tax);
+      pobj.invoice_content = system.y2f(pobj.invoice_content);
+
+      return await this.invoiceSve.invoiceApply(pobj);
+    } catch (error) {
+      console.log(error);
+      return system.getResultFail(500, `接口错误 错误信息 ${error}`);
+    }
+  }
+
 }
 module.exports = InvoiceCtl;
\ No newline at end of file

xgg-deliver/app/base/controller/impl/order/orderCtl.js

@@ -548,6 +548,7 @@ class OrderCtl extends CtlBase {
     if(!pobj.chooseItems.includes("10020200")){
       pobj.chooseItems.push("10020200");
     }
+    pobj.service_items =  pobj.chooseItems;
     pobj.source_id = pobj.source_id || '1003';
     pobj.notes = pobj.desc || "工商注册，刻章，银行卡户，税务报到，建账";
     if(!pobj.deliverId){

xgg-deliver/app/base/service/impl/invoice/invoiceSve.js

@@ -37,5 +37,9 @@ class InvoiceService extends ServiceBase {
     return rs;
   }
 
+  async invoiceApply(params) {
+    var rs = await this.callms("invoice", "invoiceApply", params);
+    return rs;
+  }
 }
 module.exports = InvoiceService;
\ No newline at end of file