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

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

@@ -49,9 +49,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);
@@ -979,7 +979,7 @@ class UtilsOrderService extends AppServiceBase {
 
 
       if(pobj.appInfo.uapp_id == '50'){
       if(pobj.appInfo.uapp_id == '50'){
         pobj.actionBody.orderNo = params.orderNo;
         pobj.actionBody.orderNo = params.orderNo;
-        let ApplicationStatus = '';
+        let ApplicationStatus = 30;
         if(opOrderResult.data.product_info.channel_item_code == 'zzsbzc'){
         if(opOrderResult.data.product_info.channel_item_code == 'zzsbzc'){
           ApplicationStatus = 2;
           ApplicationStatus = 2;
         }
         }
@@ -1414,5 +1414,12 @@ class UtilsOrderService extends AppServiceBase {
     let result = await this.restPostUrl(pobj, url);
     let result = await this.restPostUrl(pobj, url);
     return result;
     return result;
   }
   }
+
+  //测试
+  async pushTest(pobj,actionBody){
+    let url = this.centerOrderUrl + "notifyaction/internalCallsNotify/updateTmStatus";
+    let result = await this.restPostUrl(actionBody,url);
+    return result
+  }
 }
 }
 module.exports = UtilsOrderService;
 module.exports = UtilsOrderService;