d

esign-admin/app/base/controller/impl/order/orderCtl.js

@@ -66,7 +66,7 @@ class OrderCtl extends CtlBase {
                 return system.getResult(null,`参数错误  产品名称不能为空`)
                 return system.getResult(null,`参数错误  产品名称不能为空`)
             }
             }
             // 需要去调用商户钱包 扣钱
             // 需要去调用商户钱包 扣钱
-            if(pobj.id){
+            if(!pobj.id){
                 let reduceAccountBalanceRes = await this.merchantaccountSve.addordelavailable({merchant_id: this.trim(pobj.merchant_id),amount:pobj.price*(-1)});
                 let reduceAccountBalanceRes = await this.merchantaccountSve.addordelavailable({merchant_id: this.trim(pobj.merchant_id),amount:pobj.price*(-1)});
                 if(reduceAccountBalanceRes.status!=0){
                 if(reduceAccountBalanceRes.status!=0){
                     return system.getResult(null, `扣款失败`);
                     return system.getResult(null, `扣款失败`);
@@ -132,10 +132,10 @@ class OrderCtl extends CtlBase {
             let res =await this.merchantaccountSve.reduceAccountBalance({merchant_id:orderBean.merchant_id,amount:orderBean.price});
             let res =await this.merchantaccountSve.reduceAccountBalance({merchant_id:orderBean.merchant_id,amount:orderBean.price});
             if(res.status==0){
             if(res.status==0){
                 console.log("扣除余额成功 返回结果：" + JSON.stringify(res));
                 console.log("扣除余额成功 返回结果：" + JSON.stringify(res));
-                let res = await this.merchanttradeSve.valetorder({merchant_id:orderBean.merchant_id,amount:orderBean.price,trade_data_id:orderBean.id});
-                if(res.status==0 && res.data && res.data.id){
-                    console.log('交易流水创建完成 结果：' + JSON.stringify(res));
-                    let r = await this.orderSve.updOrderSimple({id: orderBean.id, trade_id: res.data.id});
+                let _res = await this.merchanttradeSve.valetorder({merchant_id:orderBean.merchant_id,amount:orderBean.price,trade_data_id:orderBean.id,audit_status:"1"});
+                if(_res.status==0 && _res.data && _res.data.id){
+                    console.log('交易流水创建完成 结果：' + JSON.stringify(_res));
+                    let r = await this.orderSve.updOrderSimple({id: orderBean.id, trade_id: _res.data.id});
                     console.log("更新交易流水ID完成 结果："+JSON.stringify(r));
                     console.log("更新交易流水ID完成 结果："+JSON.stringify(r));
                 }
                 }
             }
             }