Merge branch 'center-order' of http://gitlab.gongsibao.com/jiangyong/zhichan into center-order

center-order/app/base/api/impl/action/order.js

@@ -55,6 +55,9 @@ class OrderAPI extends APIBase {
             case "updateOrderStatusById":// 2020 0923 lin 新增 根据id修改orderStatus，目前用来商标交易更新订单状态
                 opResult = await this.orderinfoSve.updateOrderStatusById(pobj, pobj.actionBody);
                 break;
+            case "updateOrder":
+                opResult = await this.orderinfoSve.updateOrderById(pobj,pobj.actionBody);
+                break;
             case "channeldelOrder"://阿里工商注册退款
                 opResult = await this.orderinfoSve.channeldelOrder(pobj, pobj.actionBody);
                 break;

center-order/app/base/service/impl/dbcorder/orderinfoSve.js

@@ -338,20 +338,22 @@ class OrderInfoService extends ServiceBase {
     if (!deliveryData.tm.picUrl) {
       return system.getResult(null, "商标图样不能为空，20210");
     }
-    if (!deliveryData.apply) {
-      return system.getResult(null, "申请信息不能为空，20230");
-    }
-    if (!deliveryData.apply.code) {
-      return system.getResult(null, "申请统一社会信用代码不能为空，20250");
-    }
-    if (!deliveryData.apply.zipCode) {
-      return system.getResult(null, "申请邮编不能为空，20280");
-    }
-    if (!deliveryData.apply.customerType) {
-      return system.getResult(null, "申请人类型不能为空，20310");
-    }
-    if (deliveryData.apply.customerType != "ent" && deliveryData.apply.customerType != "person") {
-      return system.getResult(null, "申请人类型错误，20330");
+    if(pobj.appInfo.uapp_id != 22 ){
+      if (!deliveryData.apply) {
+        return system.getResult(null, "申请信息不能为空，20230");
+      }
+      if (!deliveryData.apply.code) {
+        return system.getResult(null, "申请统一社会信用代码不能为空，20250");
+      }
+      if (!deliveryData.apply.zipCode) {
+        return system.getResult(null, "申请邮编不能为空，20280");
+      }
+      if (!deliveryData.apply.customerType) {
+        return system.getResult(null, "申请人类型不能为空，20310");
+      }
+      if (deliveryData.apply.customerType != "ent" && deliveryData.apply.customerType != "person") {
+        return system.getResult(null, "申请人类型错误，20330");
+      }
     }
     var deliveryStatus = "dsccl";
     var deliveryStatusName = "待上传材料";
@@ -1892,5 +1894,21 @@ class OrderInfoService extends ServiceBase {
     })
     return system.getResult(ret);
   }
+
+  //修改订单信息 更新IC订单号
+  async updateOrderById(pobj,actionBody){
+    if(!actionBody.orderNo){
+      return system.getResultFail(-1,'订单号不能为空');
+    }
+    let sql = `update c_order_info set orderServiceNo = :orderServiceNo,channelOrderNo = :channelOrderNo,channelServiceNo=:channelServiceNo where orderNo = :orderNo`
+    let updateParams = {
+      orderNo:actionBody.orderNo,
+      orderServiceNo:actionBody.orderServiceNo,
+      channelOrderNo:actionBody.channelOrderNo,
+      channelServiceNo :actionBody.channelServiceNo
+    }
+    let result = await this.customQuery(sql,updateParams)
+    return system.getResult(result);
+  }
 }
 module.exports = OrderInfoService;
\ No newline at end of file

center-order/app/base/service/impl/dbcorder/usuallycontactsSve.js

@@ -58,6 +58,16 @@ class UsuallyContactsService extends ServiceBase {
     if(Object.keys(actionBody.contacts).length<0){
       return system.getResultFail(-1,'信息不能为空');
     }
+    let params = {
+      channel_user_id:actionBody.channel_user_id,
+      uapp_id:pobj.appInfo.uapp_id,
+      type:actionBody.type,
+      contact_name:actionBody.contact_name
+    }
+    let item = await this.findOne(params);
+    if(item){
+      return system.getResultFail(-1,'联系人已存在，请勿重复添加')
+    }
     let obj = {
       id:actionBody.id,
       uapp_id:pobj.appInfo.uapp_id,

center-order/app/base/service/impl/qcutils/aliyunqcSve.js

@@ -683,11 +683,17 @@ class AliyunQcService {
     //方案流程列表
     var solutionFlowList = solutionContent.solutionFlowList || [];
     if (ab.status == "1") {//⽤户已支付
-      solutionFlowList.push({
-        status: "PAID", statusName: this.icpSolutionStatusReference.PAID, updated_at: new Date()
-      });
-      solutionContent.status = "PAID";
-      solutionContent.statusName = this.icpSolutionStatusReference.PAID;
+      var afterStatusList=[//用户支付后的流程状态
+        "USER_UPLOADED", "MATERIAL_UNCONFIRM", "USER_CONFIRMED", "ACCOUNT_REGISTERED",
+        "MATERIAL_SUBMITTED","GXB_ACCEPT","GXB_REFUSE","GXB_FAIL","GXB_SUCCESS","CLOSE"
+      ];
+      if(!solutionContent.status || afterStatusList.indexOf(solutionContent.status)<0){
+        solutionFlowList.push({
+          status: "PAID", statusName: this.icpSolutionStatusReference.PAID, updated_at: new Date()
+        });
+        solutionContent.status = "PAID";
+        solutionContent.statusName = this.icpSolutionStatusReference.PAID;
+      }
       // 2020 0826 lin修改 n_need_info status为ycd 已成单
       let needObj = {
         id: needinfo.id, status: "ycd"