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);
@@ -303,7 +303,7 @@ class UtilsOrderService extends AppServiceBase {
     var payStatus = await this.restPostUrl(pobj, this.centerAppPayUrl);
     var payStatus = await this.restPostUrl(pobj, this.centerAppPayUrl);
 
 
     if (payStatus.data && payStatus.data.trxstatus == "0000") {
     if (payStatus.data && payStatus.data.trxstatus == "0000") {
-      //TODO:处理支付成功的业务逻辑      
+      //TODO:处理支付成功的业务逻辑
       payStatus.data.out_trade_no = receiptVoucher.sourceOrderNo;
       payStatus.data.out_trade_no = receiptVoucher.sourceOrderNo;
       this.opPayStatusSuccess(payStatus.data, pobj.appInfo, null);
       this.opPayStatusSuccess(payStatus.data, pobj.appInfo, null);
       // return system.getResultFail(-100130,'订单已支付，请勿重复付款，100130')
       // return system.getResultFail(-100130,'订单已支付，请勿重复付款，100130')
@@ -688,7 +688,7 @@ class UtilsOrderService extends AppServiceBase {
       // 模拟验签结果
       // 模拟验签结果
       var outTradeInfo = parmas.out_trade_no.split('-');
       var outTradeInfo = parmas.out_trade_no.split('-');
       console.log("模拟验签结果--------------", outTradeInfo)
       console.log("模拟验签结果--------------", outTradeInfo)
-      // 
+      //
       var opResult = {}
       var opResult = {}
       opResult.data = {
       opResult.data = {
         orderNo: outTradeInfo[0],
         orderNo: outTradeInfo[0],
@@ -740,7 +740,7 @@ class UtilsOrderService extends AppServiceBase {
         channel_nickname: opOrderResult.data.order_info.channelUserId
         channel_nickname: opOrderResult.data.order_info.channelUserId
       };
       };
       opOrderResult.data.orderNo = opResult.data.orderNo;
       opOrderResult.data.orderNo = opResult.data.orderNo;
-      opOrderResult.data.order_info.pay_flow_no = parmas.trade_no;// 2020 0704 lin 新增 推送fq必填字段 
+      opOrderResult.data.order_info.pay_flow_no = parmas.trade_no;// 2020 0704 lin 新增 推送fq必填字段
       opOrderResult.data.order_info.pay_channel = "支付宝";//付款方式
       opOrderResult.data.order_info.pay_channel = "支付宝";//付款方式
       opOrderResult.data.order_info.pay_time = parmas.gmt_payment;//付款时间
       opOrderResult.data.order_info.pay_time = parmas.gmt_payment;//付款时间
       opOrderResult.data.order_info.pay_payer_bank_no = parmas.buyer_email;//付款账号
       opOrderResult.data.order_info.pay_payer_bank_no = parmas.buyer_email;//付款账号
@@ -805,7 +805,7 @@ class UtilsOrderService extends AppServiceBase {
       // }
       // }
       // 模拟验签结果
       // 模拟验签结果
       var outTradeInfo = parmas.out_trade_no.split('-');
       var outTradeInfo = parmas.out_trade_no.split('-');
-      // 
+      //
       var opResult = {}
       var opResult = {}
       opResult.data = {
       opResult.data = {
         orderNo: outTradeInfo[0],
         orderNo: outTradeInfo[0],