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

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

@@ -77,6 +77,9 @@ class OrderAPI extends APIBase {
             case "delOrder"://删除订单
                 opResult = await this.orderinfoSve.delOrder(pobj, pobj.actionBody);
                 break;
+            case "delENameOrder"://删除易名订单
+                opResult = await this.orderinfoSve.delENameOrder(pobj, pobj.actionBody);
+                break;
             case "queryVOrderByOrderStatusAndItemCode":// 2020 0918 lin 新增 根据OrderStatus查询订单
                 opResult = await this.orderinfoSve.queryVOrderByOrderStatusAndItemCode(pobj, pobj.actionBody);
                 break;

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

@@ -131,10 +131,13 @@ class QcAPI extends APIBase {
             case "addIcpSalesmanInfo"://添加业务员信息，用于直接下单的icp订单
                 opResult = await this.baiduqcSve.addIcpSalesmanInfo(pobj);
                 break;
-
             case "tmFeedbackSubmit"://商标用户反馈
                 opResult = await this.aliyunqcSve.tmFeedbackSubmit(pobj);
                 break;
+            // case "eNameCloseOrder"://易名退款
+            //     opResult = await this.baiduqcSve.eNameCloseOrder(pobj);
+            //     break;
+                
             default:
                 opResult = system.getResult(null, "action_type参数错误");
                 break;

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

@@ -1019,6 +1019,12 @@ class OrderInfoService extends ServiceBase {
         await this.dao.delOrderByOrderNo(actionBody.orderNo, pobj.appInfo.uapp_id, pobj.userInfo.channel_userid);
         return system.getResultSuccess();
     }
+
+    async delENameOrder(pobj, actionBody) {//删除易名订单
+        let res = await this.dao.delOrderByOrderNo(actionBody.orderNo, pobj.appInfo.uapp_id, pobj.userInfo.channel_userid);
+        console.log("delENameOrder res----",system.getResultSuccess(res))
+        return system.getResultSuccess(res);
+    }
     //baidureg关闭订单 2020-12-20
     async delOrders(pobj, actionBody) {//删除订单
         var i;

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

@@ -277,5 +277,29 @@ class BaiduQcService {
     return system.getResultSuccess(solutionContent);
   }
   
+  // //易名退款2021-3-23
+  // async eNameCloseOrder(pobj){
+  //   console.log('order----eNameCloseOrder',pobj)
+  //   let orderNo
+  //   let note 
+  //   orderNo = pobj.actionBody.orderNo
+  //   note = pobj.actionBody.note
+  //   if(!orderNo){
+  //     return system.getResultFail(-1011, "订单号不能为空");
+  //   }
+  //   if(!note){
+  //     return system.getResultFail(-1012, "订单关闭理由不能为空");
+  //   }
+  //   let orderInfo = await this.orderinfoDao.model.findOne({
+  //     where: { channelOrderNo: orderNo }, raw: true
+  //   });
+
+  //   let UpdateObj = {
+  //     id: orderInfo.id, 
+  //     orderStatus: 16,
+  //     orderStatusName:"已退款"
+  //   }
+  //   let res = await this.orderinfoDao.update(UpdateObj);//更新订单
+  // }
 }
 module.exports = BaiduQcService;

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

@@ -250,9 +250,9 @@ class BaseQcService {
 			} else if (needinfo.channelTypeCode == "5") {//icp
 				ab.solutionContent.solution.IcpType = 1;
 			} else if (needinfo.channelTypeCode == "icpnb") {//icpnb
-				ab.solutionContent.solution.IcpType = 4;
-			} else if (needinfo.channelTypeCode == "edinb") {//edinb
 				ab.solutionContent.solution.IcpType = 3;
+			} else if (needinfo.channelTypeCode == "edinb") {//edinb
+				ab.solutionContent.solution.IcpType = 4;
 			} else {
 				return system.getResultFail(-208, "需求业务类型有误");
 			}