Commit 842c7e80 by 蒋勇

pull from ali

parent 3ac7aa40
...@@ -586,8 +586,12 @@ async writecommunicationlog2(obj) { ...@@ -586,8 +586,12 @@ async writecommunicationlog2(obj) {
40:"交易成功" 40:"交易成功"
41:"交易失败" 41:"交易失败"
*/ */
//BUYER_PROVIDE_MATERIAL理解为确认买家已经提供了资料(阿里那边应该是审核中了)
//"MATERIALS_TO_BE_SUBMITTED":"待服务商重新提交资料"-26,
//"PASS_ALIYUN_VERIFY":"阿里云审核通过"-25,
async uppaymentstatus() { async uppaymentstatus() {
var selsql = "select * from trade_transfer where transfer_status='PROVIDE_MATERIAL' or transfer_status='BUYER_EXPRESS'"; var selsql = "select * from trade_transfer where transfer_status='PROVIDE_MATERIAL' or transfer_status='BUYER_EXPRESS' or transfer_status='BUYER_PROVIDE_MATERIAL'";
var transferinfos = await this.dao.customQuery(selsql); var transferinfos = await this.dao.customQuery(selsql);
var obj = { var obj = {
action: "QueryTradeProduceList" action: "QueryTradeProduceList"
...@@ -618,6 +622,18 @@ async writecommunicationlog2(obj) { ...@@ -618,6 +622,18 @@ async writecommunicationlog2(obj) {
faillist.push(transferinfo.ali_bizid); faillist.push(transferinfo.ali_bizid);
} }
} }
if (aliorderindex > -1 && aliorder[aliorderindex].BuyerStatus == 26) {
var upd = await this.dao.model.update({ transfer_status: "MATERIALS_TO_BE_SUBMITTED" }, { where: { ali_bizid: transferinfo.ali_bizid } });
if (!upd) {
faillist.push(transferinfo.ali_bizid);
}
}
if (aliorderindex > -1 && aliorder[aliorderindex].BuyerStatus == 25) {
var upd = await this.dao.model.update({ transfer_status: "MATERIALS_TO_BE_SUBMITTED" }, { where: { ali_bizid: transferinfo.ali_bizid } });
if (!upd) {
faillist.push(transferinfo.ali_bizid);
}
}
} }
} }
return { return {
...@@ -627,6 +643,19 @@ async writecommunicationlog2(obj) { ...@@ -627,6 +643,19 @@ async writecommunicationlog2(obj) {
} }
} }
//阿里调用测试
async queryAuditStateFromAli(){
var obj = {
action: "QueryTradeProduceList",
reqbody:{
pageSize:100,
BuyerStatus:30
}
}
var tradeinfo = await this.aliclient(obj);
return tradeinfo
}
} }
function buildurl(url){ function buildurl(url){
if (url && url.indexOf("com/") > -1){ if (url && url.indexOf("com/") > -1){
...@@ -634,4 +663,9 @@ function buildurl(url){ ...@@ -634,4 +663,9 @@ function buildurl(url){
} }
return url return url
} }
module.exports = TradetransferService; module.exports = TradetransferService;
\ No newline at end of file
// (async ()=>{
// let rs=await new TradetransferService().queryAuditStateFromAli()
// console.log(JSON.stringify(rs.Data.TradeProduces))
// })()
\ No newline at end of file
console.log(new Date().toLocaleDateString()) // console.log(new Date().toLocaleDateString())
console.log(new Date().toLocaleTimeString()) // console.log(new Date().toLocaleTimeString())
10023--月更新/周更新 10023全备份 // 10023--月更新/周更新 10023全备份
tm_history // tm_history
tm_week // tm_week
tm_month // tm_month
tm_week_all 备份 // tm_week_all 备份
tm_month_all 备份 // tm_month_all 备份
10022 // 10022
// function fibo(n){
// if(n<=1){
// return n
// }else{
// let x=fibo(n-2)+fibo(n-1)
// return x
// }
// }
// for(let i=0;i<15;i++){
// console.log(fibo(i))
// }
//迭代的方法
function fiboite(n){
let fiboarray=[]
for(let i=0;i<n;i++){
if(i>=2){
//重点是找出递推关系
let next=fiboarray[i-2]+fiboarray[i-1]
fiboarray.push(next)
console.log(next)
}else{
fiboarray.push(i)
console.log(i)
}
}
}
fiboite(10)
// function adjustbase(n){
// for(let i=0;i++;i<n){
// }
// }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment