修改获取方案信息接口

center-order/app/base/service/impl/dbneed/needinfoSve.js

@@ -185,21 +185,41 @@ class NeedinfoService extends ServiceBase {
   }
   }
 
 
   async getItemByChannelSolutionNo(pobj) {
   async getItemByChannelSolutionNo(pobj) {
+    console.log('getItemByChannelSolutionNo+++pobj--',pobj)
     var solutionitem = await this.needsolutionDao.findOne({ channelSolutionNo: pobj.actionBody.bizId });
     var solutionitem = await this.needsolutionDao.findOne({ channelSolutionNo: pobj.actionBody.bizId });
     if (!solutionitem) {
     if (!solutionitem) {
       return system.getResult(null, "方案数据为空，30210");
       return system.getResult(null, "方案数据为空，30210");
     }
     }
     var item = await this.dao.getItemByNeedNo(solutionitem.needNo);
     var item = await this.dao.getItemByNeedNo(solutionitem.needNo);
+    console.log('ename---item---',item)
     if (!item) {
     if (!item) {
       return system.getResult(null, "需求数据为空，30210");
       return system.getResult(null, "需求数据为空，30210");
     }
     }
+    let  uappId;
+    if(item && item.uapp_id){
+      uappId  = item.uapp_id
+    }
+    let ActionType
     // fixme 阿里直购需要更改
     // fixme 阿里直购需要更改
     if (!pobj.actionBody.bizId.startsWith("TM_")) {//商标不需要
     if (!pobj.actionBody.bizId.startsWith("TM_")) {//商标不需要
-      item.solutionProvince = solutionitem.solutionContent.solution.Area || solutionitem.solutionContent.solution.area;
-      //item.solutionProvince = solutionitem.solutionContent.solution.Area + `（${solutionitem.solutionContent.solution.actionType}）`//北京（新办）;
-      item.solutionContent = solutionitem.solutionContent
-      item.channelSolutionNo = solutionitem.channelSolutionNo
+      if(uappId == '52'){//易名区分申请续期
+        ActionType = solutionitem.solutionContent.solution.ActionType
+        if(ActionType && ActionType == "新办"){
+          ActionType = "申请"
+        }
+        item.solutionProvince = solutionitem.solutionContent.solution.Area || solutionitem.solutionContent.solution.area;
+        item.solutionProvince = item.solutionProvince + "-" + ActionType
+        //item.solutionProvince = solutionitem.solutionContent.solution.Area + `（${solutionitem.solutionContent.solution.actionType}）`//北京（新办）;
+        item.solutionContent = solutionitem.solutionContent
+        item.channelSolutionNo = solutionitem.channelSolutionNo
+      }else{
+        item.solutionProvince = solutionitem.solutionContent.solution.Area || solutionitem.solutionContent.solution.area;
+        //item.solutionProvince = solutionitem.solutionContent.solution.Area + `（${solutionitem.solutionContent.solution.actionType}）`//北京（新办）;
+        item.solutionContent = solutionitem.solutionContent
+        item.channelSolutionNo = solutionitem.channelSolutionNo
+      }
     }
     }
+    console.log('item.solutionProvince---',item.solutionProvince)
     return system.getResultSuccess(item);
     return system.getResultSuccess(item);
   }
   }
 
 
@@ -415,7 +435,4 @@ class NeedinfoService extends ServiceBase {
 
 
 
 
 }
 }
-module.exports = NeedinfoService;
-
+module.exports = NeedinfoService;
\ No newline at end of file
-// var a=new NeedinfoService();
-// var b=a.getItemByChannelSolutionNo({actionBody:{bizId:"1593141330846"}});
\ No newline at end of file