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

center-channel/app/base/api/impl/action/tmQuery.js

@@ -30,6 +30,9 @@ class TmQueryAPI extends WEBBase {
             case "test"://测试
             case "test"://测试
                 opResult = system.getResultSuccess(null, "测试成功");
                 opResult = system.getResultSuccess(null, "测试成功");
                 break;
                 break;
+            case "tmTest":
+                opResult = await this.tmquerySve.test(pobj);
+                break;
             case "findTrademarkNameAccurate"://商标精确检索（相同商标检索）
             case "findTrademarkNameAccurate"://商标精确检索（相同商标检索）
                 opResult = await this.tmquerySve.findTrademarkNameAccurate(action_body, req);
                 opResult = await this.tmquerySve.findTrademarkNameAccurate(action_body, req);
                 break;
                 break;

center-channel/app/base/service/impl/trademark/tmquerySve.js

@@ -150,5 +150,12 @@ class TmqueryService {
     return data;
     return data;
   }
   }
 
 
+
+  async test(pobj){
+    let url = settings.centerOrderUrl() + 'notifyaction/internalCallsNotify/updateTmStatus';
+    let result = await this.execClient.execPost(pobj.actionBody,url);
+    return result;
+  }
+
 }
 }
 module.exports = TmqueryService;
 module.exports = TmqueryService;

center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js

@@ -48,9 +48,9 @@ class UtilsOrderService extends AppServiceBase {
     }
     }
     console.log("buyTotalSum", buyTotalSum)
     console.log("buyTotalSum", buyTotalSum)
     console.log("totalSum", totalSum)
     console.log("totalSum", totalSum)
-    // if (buyTotalSum < totalSum) {
-    //   return system.getResult(null, "订单金额有误，100060");
-    // }
+    if (buyTotalSum < totalSum) {
+      return system.getResult(null, "订单金额有误，100060");
+    }
     let tmpPriceList = [];
     let tmpPriceList = [];
     pobj.actionBody.product_info.price_item = price_list[productIndex];
     pobj.actionBody.product_info.price_item = price_list[productIndex];
     tmpPriceList.push(pobj.actionBody.product_info.price_item);
     tmpPriceList.push(pobj.actionBody.product_info.price_item);