Merge branch 'xggsve-invoice' into xggsve-invoice-dev

.gitignore

+
+xggsve-invoice/node_modules/
+.idea/
+xggsve-invoice/npm-debug.log
+xggsve-invoice/dump.rdb
+xggsve-invoice/.DS_Store
+xggsve-invoice/.project
+xggsve-invoice/.package-lock.json
+xggsve-invoice/*.csv
+xggsve-invoice/.vscode/launch.json
+

Dockerfile

 #!/bin/bash
 #!/bin/bash
-FROM registry.cn-beijing.aliyuncs.com/hantang/node105:v2
+FROM registry.cn-beijing.aliyuncs.com/hantang2/node105:v2
 MAINTAINER jy "jiangyong@gongsibao.com"
 MAINTAINER jy "jiangyong@gongsibao.com"
 ADD xggsve-invoice /apps/xggsve-invoice/
 ADD xggsve-invoice /apps/xggsve-invoice/
 WORKDIR   /apps/xggsve-invoice/
 WORKDIR   /apps/xggsve-invoice/

release-note.txt

@@ -22,25 +22,7 @@
 5、利用k8s上线镜像为运行容器（这一步后续会实现为自动化）
 5、利用k8s上线镜像为运行容器（这一步后续会实现为自动化）
 
 
 项目版本号段分配
 项目版本号段分配
-0、bigdata  release-v0.x.x
-1、igirl-web   release-v1.x.x
-2、igirl-zcapi release-v2.x.x
-3、igirl-channel-web release-v3.x.x
-4、igirl-channel release-v4.x.x
-5、scratch-web release-v5.x.x
-6、ipself-web release-v6.x.x
-7.  ipop-web release-v7.x.x
-
-8.  bpo-web  release-v8.x.x
-9.  bpo-admin  release-v9.x.x
-10. laowubao  release-v10.x.x
-11. xggsve-common  release-v11.x.x
-12. xggsve-merchant  release-v12.x.x
-13. xggsve-order  release-v13.x.x
 14. xggsve-invoice  release-v14.x.x
 14. xggsve-invoice  release-v14.x.x
-15. xggpc  release-v15.x.x
-16. xggadmin  release-v16.x.x
-17. xggweb  release-v17.x.x
 
 
 后续号端请继续补充
 后续号端请继续补充
 查看自己项目号段到达的数字，执行git tag | grep v【号段前缀】
 查看自己项目号段到达的数字，执行git tag | grep v【号段前缀】

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

@@ -178,7 +178,7 @@ class ApplyService extends ServiceBase {
       //试算
       //试算
       let val = await rule.dispatcher(params);
       let val = await rule.dispatcher(params);
       if(val.data==-1){
       if(val.data==-1){
-        return getResult(-1,`系统错误 ${val.msg}`);
+        return system.getResult(-1,`系统错误 ${val.msg}`);
       }
       }
       params.personalIncomeTax = this.trim(val.personalIncomeTax);
       params.personalIncomeTax = this.trim(val.personalIncomeTax);
       params.additionalTax = this.trim(val.additionalTax);
       params.additionalTax = this.trim(val.additionalTax);
@@ -781,6 +781,9 @@ class ApplyService extends ServiceBase {
     if (this.trim(params.applyNo)) {
     if (this.trim(params.applyNo)) {
       where.applyNo = this.trim(params.applyNo);
       where.applyNo = this.trim(params.applyNo);
     }
     }
+    if (this.trim(params.businessmenCreditCode)) {
+      where.businessmenCreditCode = this.trim(params.businessmenCreditCode);
+    }
     if (this.trim(params.invoiceTime)) {
     if (this.trim(params.invoiceTime)) {
       where.invoiceTime = {
       where.invoiceTime = {
         [this.db.Op.gte]: this.trim(params.invoiceTime)
         [this.db.Op.gte]: this.trim(params.invoiceTime)
@@ -827,13 +830,14 @@ class ApplyService extends ServiceBase {
           where: {
           where: {
             id: item.id
             id: item.id
           },
           },
-          attributes: ['status']
+          attributes: ['status', 'invoiceImg']
         });
         });
         if (_invoice.status) {
         if (_invoice.status) {
           this.dao.setRowCodeName(_invoice, "status");
           this.dao.setRowCodeName(_invoice, "status");
         } else {
         } else {
           _invoice.status = "";
           _invoice.status = "";
         }
         }
+        item.invoiceImg = this.trim(_invoice.invoiceImg);
         item.delivererStatus = _invoice.statusName;
         item.delivererStatus = _invoice.statusName;
         //处理时间
         //处理时间
         this.handleDate(item, ["invoiceTime"], null, -8);
         this.handleDate(item, ["invoiceTime"], null, -8);

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

@@ -7,8 +7,11 @@ const moment = require('moment');
 class DelivererService extends ServiceBase {
 class DelivererService extends ServiceBase {
   constructor() {
   constructor() {
     super("invoice", ServiceBase.getDaoName(DelivererService));
     super("invoice", ServiceBase.getDaoName(DelivererService));
-    // this.invoiceDao = system.getObject("db.invoice.invoiceDao");
+    this.invoiceDao = system.getObject("db.invoice.invoiceDao");
     this.applyDao = system.getObject("db.invoice.applyDao");
     this.applyDao = system.getObject("db.invoice.applyDao");
+
+    let is = system.getObject("util.invoiceStatus");
+    this.invoiceStatus = is.status;
   }
   }
 
 
   /**
   /**

xggsve-invoice/app/config/localsettings.js

@@ -10,10 +10,10 @@ var settings={
     user: "write",
     user: "write",
     password: "write",
     password: "write",
     config: {
     config: {
-      // host: '43.247.184.35',
-      // port: 8899,
-      host: '192.168.18.237',
-      port: 3306,
+      host: '43.247.184.35',
+      port: 8899,
+      // host: '192.168.18.237',
+      // port: 3306,
 
 
       dialect: 'mysql',
       dialect: 'mysql',
         operatorsAliases: false,
         operatorsAliases: false,