Commit a1da6518 by 蒋勇

d

parent 0cf145f8
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
12491071-uppershelf-25
38035593-uppershelf-25
57031246-uppershelf-19
57171435-uppershelf-18
55446524-uppershelf-3
55887198-uppershelf-3
57492588-uppershelf-20
39708396-uppershelf-30
39705082-uppershelf-32
39718421-uppershelf-35
55341509-uppershelf-17
55335507-uppershelf-19
55355250-uppershelf-37
52863997-uppershelf-19
52864000-uppershelf-21
56970546-uppershelf-3
56957121-uppershelf-5
49694808-uppershelf-9
49694797-uppershelf-11
49681482-uppershelf-21
38858451-uppershelf-14
38860210-uppershelf-20
55298414-uppershelf-45
52452203-uppershelf-37
52441081-uppershelf-45
38835886-uppershelf-3
38840993-uppershelf-5
38855148-uppershelf-9
38860177-uppershelf-25
38164694-uppershelf-31
38095250-uppershelf-9
38094906-uppershelf-29
38101037-uppershelf-5
38119193-uppershelf-11
38102782-uppershelf-29
38110608-uppershelf-28
55298499-uppershelf-8
38115042-uppershelf-26
38121809-uppershelf-5
38095220-uppershelf-9
38121762-uppershelf-26
39636887-uppershelf-9
38904373-uppershelf-35
38928366-uppershelf-42
47478363-uppershelf-30
38103062-uppershelf-11
39342033-uppershelf-35
39348941-uppershelf-44
39323276-uppershelf-30
39283976-uppershelf-35
39280832-uppershelf-35
40777813-uppershelf-5
52447344-uppershelf-30
46151694-uppershelf-7
55139576-uppershelf-7
47538332-uppershelf-7
41687062-uppershelf-7
39752321-uppershelf-20
51325482-uppershelf-7
38102782-uppershelf-29
24724026-uppershelf-25
39482820-uppershelf-9
39348006-uppershelf-12
54907812-uppershelf-42
55850622-uppershelf-45
54904493-uppershelf-36
54898060-uppershelf-3
54912879-uppershelf-20
54931814-uppershelf-6
54913839-uppershelf-16
55089646-uppershelf-11
54930380-uppershelf-21
54923801-uppershelf-24
54906796-uppershelf-29
54920870-uppershelf-30
54912189-uppershelf-28
40486091-uppershelf-28
45619381-uppershelf-35
51963979-uppershelf-37
50889025-uppershelf-20
52862464-uppershelf-30
38466043-uppershelf-11
52744688-uppershelf-20
52576235-uppershelf-20
53342679-uppershelf-16
52431157-uppershelf-14
52732097-uppershelf-14
38862704-uppershelf-12
52378889-uppershelf-14
47956856-uppershelf-9
50884817-uppershelf-9
43327499-uppershelf-35
42366506-uppershelf-21
35386595-uppershelf-20
53608230-uppershelf-31
48411998-uppershelf-31
48366827-uppershelf-31
48281174-uppershelf-31
46696154-uppershelf-26
55951112-uppershelf-9
40156955-uppershelf-41
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
1
2
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
48793865-1-25
39388765-1-03
39384475-1-05
52539561-1-31
54520975-1-32
54586392-1-33
54531231-1-32
54517192-1-32
54519041-1-32
53620505-1-20
53588510-1-20
41502916-1-07
41498408-1-07
41501762-1-07
41478825-1-07
41485105-1-07
41495316-1-07
41487695-1-07
41482392-1-07
41482439-1-07
50396194-1-05
52677070-1-35
52772902-1-35
53609679-1-09
39649772-1-11
44185074-1-30
44182723-1-29
39648459-1-29
46874819-1-21
42527847-1-05
49724088-1-03
53306444-1-28
53315080-1-35
10380835-1-09
47156330-1-21
51665582-1-31
44622201-1-21
49779749-1-09
35979455-1-09
40876140-1-25
49711722-1-11
49715761-1-15
49712182-1-16
49711814-1-21
45874853-1-26
46855656-1-33
46840273-1-28
46850306-1-27
46854960-1-24
28629846-1-35
28618586-1-35
28624714-1-28
28618180-1-28
29791023-1-28
28615385-1-25
30869931-1-25
29514789-1-19
28624321-1-18
28626092-1-18
28612444-1-18
28786756-1-18
29517570-1-18
29527854-1-18
29517120-1-14
28617485-1-12
29510217-1-12
29517100-1-11
28775190-1-10
30869313-1-09
30870112-1-09
29527867-1-08
28615107-1-05
29525652-1-05
29525674-1-05
29512799-1-05
28624270-1-03
30869194-1-03
29528988-1-02
29518770-1-02
29517586-1-43
28779938-1-12
28625173-1-09
28621946-1-03
29795417-1-03
30868243-1-44
30869206-1-44
29529100-1-43
29790947-1-43
29782856-1-43
28622149-1-42
28624508-1-42
28628392-1-39
28609373-1-39
28617665-1-39
28617655-1-39
28619038-1-39
46293026-1-03
39671448-1-28
52061389-1-31
52491844-1-44
52860224-1-11
52863987-1-21
52866770-1-19
52505502-1-01
53012881-1-24
53006492-1-03
53890331-1-11
53884057-1-20
37835231-1-35
39369188-1-24
39361905-1-44
39359949-1-18
39411385-1-35
39404285-1-44
39367386-1-36
39359899-1-44
39359802-1-18
39356116-1-41
39354928-1-37
39354811-1-27
39481673-1-35
39481667-1-03
39378549-1-35
39378472-1-05
39400214-1-44
39400185-1-03
39388808-1-43
39476110-1-12
48951374-1-25
48007563-1-03
47208760-1-24
47228086-1-29
43120473-1-30
48725350-1-11
37413482-1-39
49148008-1-24
36192318-1-07
48109877-1-25
45963163-1-25
39394104-1-44
39385588-1-35
39400278-1-35
42120736-1-29
49714989-1-10
44946591-1-10
46445096-1-35
40830355-uppershelf-5
46503634-uppershelf-9
49276678-uppershelf-30
55054803-uppershelf-9
function x(tkname){
return new Promise((res,rej)=>{
setTimeout(()=>{
console.log(tkname)
res(tkname)
},5000*Math.random())
})
}
let ps=[]
for(let n=0;n<100;n++){
ps.push(x("t"+n))
}
Promise.all(ps).then((v)=>{
console.log(v)
})
\ No newline at end of file
......@@ -5,16 +5,17 @@ var RPCClient = require('@alicloud/pop-core').RPCClient;
var OSS = require('ali-oss');
const crypto = require('crypto');
var moment = require("moment");
class TradetransferService extends ServiceBase {
constructor() {
super("transfer", ServiceBase.getDaoName(TradetransferService));
this.dingClient = system.getObject("util.dingClient");
}
async updatePhone(id,mobile){
async updatePhone(id, mobile) {
var self = this;
return await this.db.transaction(async function (t) {
var updateRes = await self.dao.model.update({"mobile":mobile},{where:{id:id},transaction:t});
var updateRes = await self.dao.model.update({ "mobile": mobile }, { where: { id: id }, transaction: t });
return updateRes;
});
}
......@@ -162,7 +163,7 @@ class TradetransferService extends ServiceBase {
返回20位业务订单号
prefix:业务前缀
*/
async getBusUid(prefix) {
async getBusUid(prefix) {
prefix = (prefix || "");
if (prefix) {
prefix = prefix.toUpperCase();
......@@ -278,15 +279,15 @@ class TradetransferService extends ServiceBase {
//补充材料
async supplymaterail(obj) {
obj.buyer_businesslicense =buildurl(obj.buyer_businesslicense)
obj.buyer_idcard =buildurl(obj.buyer_idcard)
obj.seller_businesslicense =buildurl(obj.seller_businesslicense)
obj.seller_idcard =buildurl(obj.seller_idcard)
obj.seller_proxy =buildurl(obj.seller_proxy)
obj.tm_cert_url =buildurl(obj.tm_cert_url)
obj.seller_apply =buildurl(obj.seller_apply)
obj.transfer_cert_url =buildurl(obj.transfer_cert_url)
obj.notarization_url =buildurl(obj.notarization_url)
obj.buyer_businesslicense = buildurl(obj.buyer_businesslicense)
obj.buyer_idcard = buildurl(obj.buyer_idcard)
obj.seller_businesslicense = buildurl(obj.seller_businesslicense)
obj.seller_idcard = buildurl(obj.seller_idcard)
obj.seller_proxy = buildurl(obj.seller_proxy)
obj.tm_cert_url = buildurl(obj.tm_cert_url)
obj.seller_apply = buildurl(obj.seller_apply)
obj.transfer_cert_url = buildurl(obj.transfer_cert_url)
obj.notarization_url = buildurl(obj.notarization_url)
obj.user_type = obj.user_type == "person" ? 2 : 1;
var sobj = {
action: "SupplyMaterail",
......@@ -315,45 +316,45 @@ class TradetransferService extends ServiceBase {
return result;
}
//服务商修改资料后重新提交
async modifySubmitTransferMaterail(obj) {
obj.buyer_businesslicense =buildurl(obj.buyer_businesslicense)
obj.buyer_idcard =buildurl(obj.buyer_idcard)
obj.seller_businesslicense =buildurl(obj.seller_businesslicense)
obj.seller_idcard =buildurl(obj.seller_idcard)
obj.seller_proxy =buildurl(obj.seller_proxy)
obj.tm_cert_url =buildurl(obj.tm_cert_url)
obj.seller_apply =buildurl(obj.seller_apply)
obj.transfer_cert_url =buildurl(obj.transfer_cert_url)
obj.notarization_url =buildurl(obj.notarization_url)
obj.user_type = obj.user_type == "person" ? 2 : 1;
var sobj = {
action: "ModifySubmitTransferMaterail",
reqbody: {
BizId: obj.ali_bizid,
BuyerBusinessLicense: obj.buyer_businesslicense,
BuyerIdCard: obj.buyer_idcard,
RegistrationCert: obj.tm_cert_url,
Notarization: obj.notarization_url + "," + obj.transfer_cert_url,
SellerBusinessLicense: obj.seller_businesslicense,
SellerIdCard: obj.seller_idcard,
SellerProxy: obj.seller_proxy,
SellerApply: obj.seller_apply,
Complete: true,
Name: obj.buyer_name,
Addr: obj.buyer_address,
CardType: obj.user_type,
CardNo: obj.cardno,
ContactName: obj.contact_name,
ContactMobile: parseInt(obj.contact_mobile),
ContactEmail: obj.contact_email
//服务商修改资料后重新提交
async modifySubmitTransferMaterail(obj) {
obj.buyer_businesslicense = buildurl(obj.buyer_businesslicense)
obj.buyer_idcard = buildurl(obj.buyer_idcard)
obj.seller_businesslicense = buildurl(obj.seller_businesslicense)
obj.seller_idcard = buildurl(obj.seller_idcard)
obj.seller_proxy = buildurl(obj.seller_proxy)
obj.tm_cert_url = buildurl(obj.tm_cert_url)
obj.seller_apply = buildurl(obj.seller_apply)
obj.transfer_cert_url = buildurl(obj.transfer_cert_url)
obj.notarization_url = buildurl(obj.notarization_url)
obj.user_type = obj.user_type == "person" ? 2 : 1;
var sobj = {
action: "ModifySubmitTransferMaterail",
reqbody: {
BizId: obj.ali_bizid,
BuyerBusinessLicense: obj.buyer_businesslicense,
BuyerIdCard: obj.buyer_idcard,
RegistrationCert: obj.tm_cert_url,
Notarization: obj.notarization_url + "," + obj.transfer_cert_url,
SellerBusinessLicense: obj.seller_businesslicense,
SellerIdCard: obj.seller_idcard,
SellerProxy: obj.seller_proxy,
SellerApply: obj.seller_apply,
Complete: true,
Name: obj.buyer_name,
Addr: obj.buyer_address,
CardType: obj.user_type,
CardNo: obj.cardno,
ContactName: obj.contact_name,
ContactMobile: parseInt(obj.contact_mobile),
ContactEmail: obj.contact_email
}
}
var result = await this.aliclient(sobj, 'POST')
console.log(result);
return result;
// return {Success:false,msg:""}
}
var result = await this.aliclient(sobj,'POST')
console.log(result);
return result;
// return {Success:false,msg:""}
}
//尾款支付---调取阿里云查询后修改订单
async querytradeproducelist(obj) {
......@@ -415,22 +416,22 @@ async modifySubmitTransferMaterail(obj) {
action: "ReceivedTransferMaterail",
reqbody: {
BizId: BizId,
Note:!obj.remark?"":obj.remark,
BuyerBusinessLicense:buildurl(obj.buyer_businesslicense),
BuyerIdCard:buildurl(obj.buyer_idcard),
RegistrationCert:buildurl(obj.tm_cert_url),
Notarization:buildurl(obj.notarization_url),
SellerBusinessLicense:buildurl(obj.seller_businesslicense),
SellerIdCard:buildurl(obj.seller_idcard),
SellerProxy:buildurl(obj.seller_proxy),
BuyersCardType:obj.user_type=="ent"?"1":"2",
SellerBusinessLicenseTranslation:buildurl(obj.buyer_businesslicense_en),
BuyerBusinessLicenseTranslation:buildurl(obj.seller_businesslicense_en),
AssigneeProxy:buildurl(obj.buyer_proxy),
CardType:obj.seller_type=="ent"?"1":"2",
}
}
var rtn = await this.aliclient(obj,"POST")
Note: !obj.remark ? "" : obj.remark,
BuyerBusinessLicense: buildurl(obj.buyer_businesslicense),
BuyerIdCard: buildurl(obj.buyer_idcard),
RegistrationCert: buildurl(obj.tm_cert_url),
Notarization: buildurl(obj.notarization_url),
SellerBusinessLicense: buildurl(obj.seller_businesslicense),
SellerIdCard: buildurl(obj.seller_idcard),
SellerProxy: buildurl(obj.seller_proxy),
BuyersCardType: obj.user_type == "ent" ? "1" : "2",
SellerBusinessLicenseTranslation: buildurl(obj.buyer_businesslicense_en),
BuyerBusinessLicenseTranslation: buildurl(obj.seller_businesslicense_en),
AssigneeProxy: buildurl(obj.buyer_proxy),
CardType: obj.seller_type == "ent" ? "1" : "2",
}
}
var rtn = await this.aliclient(obj, "POST")
console.log(obj)
console.log(rtn)
return rtn;
......@@ -445,7 +446,7 @@ async modifySubmitTransferMaterail(obj) {
}
}
if(!obj.transfer_receive_ack){
if (!obj.transfer_receive_ack) {
return {
status: "-1",
msg: "参数异常:商标局回执不能为空"
......@@ -461,7 +462,7 @@ async modifySubmitTransferMaterail(obj) {
const entity = await this.findById(obj.id);
// 只有当前流程状态等于 阿里云审核通过 时,才允许提交官方
if(entity.transfer_status != 'PASS_ALIYUN_VERIFY'){
if (entity.transfer_status != 'PASS_ALIYUN_VERIFY') {
return {
status: "-1",
msg: "流程状态等于 阿里云审核通过 时,才允许提交官方"
......@@ -469,7 +470,7 @@ async modifySubmitTransferMaterail(obj) {
}
const transfer_receive_ack = buildurl(obj.transfer_receive_ack)
// const seller_proxy = buildurl(obj.seller_proxy)
// const seller_proxy = buildurl(obj.seller_proxy)
var BizId = obj.ali_bizid;
var obj = {
......@@ -477,10 +478,10 @@ async modifySubmitTransferMaterail(obj) {
reqbody: {
BizId: BizId,
TransferOsskey: transfer_receive_ack, // 商标局回执 add
// AssigneeProxy: seller_proxy, // 受让人委托书 add
// AssigneeProxy: seller_proxy, // 受让人委托书 add
}
}
var rtn = await this.aliclient(obj);
var rtn = await this.aliclient(obj);
console.log(rtn);
return rtn;
}
......@@ -579,50 +580,50 @@ async modifySubmitTransferMaterail(obj) {
console.log(rtn)
return rtn;
}
//买卖家沟通记录
async writecommunicationlog2(obj) {
var obj = {
action: "WriteCommunicationLog",
reqbody: {
BizId: obj.ali_bizid,
note: obj.note
//买卖家沟通记录
async writecommunicationlog2(obj) {
var obj = {
action: "WriteCommunicationLog",
reqbody: {
BizId: obj.ali_bizid,
note: obj.note
}
}
var rtn = await this.aliclient(obj)
console.log(rtn)
return rtn;
}
var rtn = await this.aliclient(obj)
console.log(rtn)
return rtn;
}
// {
// "dateStr":"",
// "timeStr":"",
// "yw":"",
// "content":""
// }
async addTrackLog(obj){
var self=this;
let tid=obj.tid;//如果是来自租户界面的修改
let log=obj.log;
let strlog=JSON.stringify(log)
return this.db.transaction(async function (t) {
let logupdate=await self.dao.model.findOne({where:{id:tid},transaction:t});
if(logupdate.tracklog!=""){
strlog+="|"+logupdate.tracklog
}
await self.dao.model.update({"tracklog":strlog},{where:{id:tid},transaction:t});
async addTrackLog(obj) {
var self = this;
let tid = obj.tid;//如果是来自租户界面的修改
let log = obj.log;
let strlog = JSON.stringify(log)
return this.db.transaction(async function (t) {
let logupdate = await self.dao.model.findOne({ where: { id: tid }, transaction: t });
if (logupdate.tracklog != "") {
strlog += "|" + logupdate.tracklog
}
await self.dao.model.update({ "tracklog": strlog }, { where: { id: tid }, transaction: t });
//调用阿里的接口进行交易记录的上传
let obj={
let obj = {
ali_bizid: logupdate.ali_bizid,
note: log.content
}
let rn =await self.writecommunicationlog2(obj)
if(!rn){
console.log(logupdate.ali_bizid,"日志到阿里出错....")
let rn = await self.writecommunicationlog2(obj)
if (!rn) {
console.log(logupdate.ali_bizid, "日志到阿里出错....")
throw new Error("阿里上传日志错误")
}else{
} else {
console.log(rn)
}
logupdate=await self.dao.model.findOne({where:{id:tid},transaction:t});
logupdate = await self.dao.model.findOne({ where: { id: tid }, transaction: t });
return logupdate;
});
......@@ -684,7 +685,7 @@ async writecommunicationlog2(obj) {
action: "QueryTradeProduceList"
}
var tradeinfo = await this.aliclient(obj);
if (!tradeinfo && tradeinfo.Data.TradeProduces.length > 0) {
if (!tradeinfo && tradeinfo.Data.TradeProduces.length > 0) {
return {
status: -1,
msg: "阿里订单查询失败",
......@@ -710,13 +711,13 @@ async writecommunicationlog2(obj) {
}
}
if (aliorderindex > -1 && aliorder[aliorderindex].BuyerStatus == 26) {
var upd = await this.dao.model.update({ transfer_status: "MATERIALS_TO_BE_SUBMITTED",aliorder_status:26 }, { where: { ali_bizid: transferinfo.ali_bizid } });
var upd = await this.dao.model.update({ transfer_status: "MATERIALS_TO_BE_SUBMITTED", aliorder_status: 26 }, { 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: "PASS_ALIYUN_VERIFY",aliorder_status:25 }, { where: { ali_bizid: transferinfo.ali_bizid } });
var upd = await this.dao.model.update({ transfer_status: "PASS_ALIYUN_VERIFY", aliorder_status: 25 }, { where: { ali_bizid: transferinfo.ali_bizid } });
if (!upd) {
faillist.push(transferinfo.ali_bizid);
}
......@@ -731,31 +732,266 @@ async writecommunicationlog2(obj) {
}
//阿里调用测试
async queryAuditStateFromAli(){
async queryAuditStateFromAli() {
var obj = {
action: "QueryTradeProduceList",
reqbody:{
pageSize:100,
BuyerStatus:25
reqbody: {
pageSize: 100,
RegisterNumber: "54164584"
}
}
var tradeinfo = await this.aliclient(obj);
return tradeinfo
}
facOnSaleFunc(code) {
return async()=>{
var obj = {
action: "QueryTrademarkOnSale",
reqbody: {
PageNum: 1,
PageSize: 50,
RegisterCode: code
}
}
var tradeinfo = await this.aliclient(obj, "POST");
return tradeinfo
}
}
facOnSalePageFunc(pageNo) {
return async()=>{
var obj = {
action: "QueryTrademarkOnSale",
reqbody: {
PageNum: pageNo,
PageSize: 500
}
}
var tradeinfo = await this.aliclient(obj, "POST");
return tradeinfo
}
}
async queryTrademarkOnSale(code) {
var obj = {
action: "QueryTrademarkOnSale",
reqbody: {
PageNum: 1,
PageSize: 50,
RegisterCode: code
}
}
var tradeinfo = await this.aliclient(obj, "POST");
return tradeinfo
}
}
function buildurl(url){
if (url && url.indexOf("com/") > -1){
function buildurl(url) {
if (url && url.indexOf("com/") > -1) {
return url.split("com/")[1]
}
if(!url){
url=""
if (!url) {
url = ""
}
return url
}
module.exports = TradetransferService;
// (async () => {
// let fs = require("fs")
// let alis=fs.readFileSync("./ali2.txt","utf8")
// let straliArray=alis.split("\n")
// let gsbstr=fs.readFileSync("./gsbonline.txt","utf8")
// let gsbArray=gsbstr.split("\n")
// straliArray.forEach((aliItem)=>{
// let aliitems=aliItem.split("-")
// let code=aliitems[0]
// let status='uppershelf'
// let nclcode=aliitems[2]
// if(nclcode && nclcode.indexOf("0")==0){
// nclcode=nclcode.substring(1)
// }
// let result=code+"-"+status+"-"+nclcode
// console.log(result)
// if(gsbArray.indexOf(result)<0){
// fs.appendFileSync("./notfoundingsb.txt",result+"\n","utf-8")
// }
// })
// })()
// (async () => {
// let fs = require("fs")
// let alis=fs.readFileSync("./ali2.txt","utf8")
// let straliArray=alis.split("\n")
// let gsbstr=fs.readFileSync("./gsbonline.txt","utf8")
// let gsbArray=gsbstr.split("\n")
// gsbArray.forEach((gsbItem)=>{
// let gsbitems=gsbItem.split("-")
// let code=gsbitems[0]
// let status=1
// let nclcode=gsbitems[2]
// if(nclcode.length==1){
// nclcode="0"+nclcode
// }
// let result=code+"-"+status+"-"+nclcode
// console.log(result)
// if(straliArray.indexOf(result)<0){
// fs.appendFileSync("./notfoundinali.txt",result+"\n","utf-8")
// }
// })
// })()
// (async () => {
// let fs = require("fs")
// let alis=fs.readFileSync("./ali.txt","utf8")
// let straliArray=alis.split("\n")
// straliArray.forEach((aliItem)=>{
// let aliitems=aliItem.split("-")
// let code=aliitems[0]
// let status=aliitems[1]
// let nclcode=aliitems[2]
// let result=code+"-"+status+"-"+nclcode+"\n"
// console.log(result)
// fs.appendFileSync("./ali2.txt",result,"utf-8")
// })
// })()
// (async () => {
// function wait(second) {
// // execSync 属于同步方法;异步方式请根据需要自行查询 node.js 的 child_process 相关方法;
// let ChildProcess_ExecSync = require('child_process').execSync;
// ChildProcess_ExecSync('sleep ' + second);
// };
// var fs=require("fs")
// var ts = new TradetransferService()
// function subTask(pageNo){
// return()=>{
// return new Promise(async (resv,rej)=>{
// try{
// let st=6*Math.random()
// wait(Math.round(st))
// let rs = await ts.facOnSalePageFunc(pageNo)()
// console.log("xxxxxxxxxxxxxxxx==================="+pageNo)
// if (rs && rs.Trademarks && rs.Trademarks.length > 0) {
// rs.Trademarks.forEach((item) => {
// fs.appendFileSync("./ali.txt",item.RegistrationNumber+"-"+item.Status+"-"
// +item.Classification+"-"+item.TmType+"-"+item.OrderPrice+"\n")
// })
// } else {
// fs.appendFileSync("./notfoundpage.txt", pageNo + "\n")
// }
// resv(pageNo)
// }catch(e){
// fs.appendFileSync("./error2.txt", pageNo+ "\n")
// return rej(e)
// }
// })
// }
// }
// for(let i=1;i<=73;i++){
// try{
// let ps=await subTask(i)()
// console.log(ps)
// }catch(e){
// console.log(e)
// }
// }
// })()
// (async () => {
// let ts = new TradetransferService()
// let fs = require("fs")
// let k = {
// "audit": "2",//5
// "uppershelf": "1",//1
// "lowershelf": "2",//2
// "oversales": "3",//3
// "addbaseinfo": "2",
// "fail": "6"//6
// }
// function subTask(row){
// return()=>{
// return new Promise(async (resv,rej)=>{
// try{
// let ds = row.split("-")
// let code = ds[0]
// let status = k[ds[1]]
// let nclcode = ds[2]
// if(nclcode.length==1){
// nclcode="0"+nclcode
// }
// console.log("xxxxxxxxxxxxxxxx==================="+code)
// let st=6*Math.random()
// wait(Math.round(st))
// let rs = await ts.facOnSaleFunc(code)()
// console.log(rs,"xxxxxxxxxxxxxxxxxxxxxxxxxx",code)
// if (rs && rs.Trademarks && rs.Trademarks.length > 0) {
// let isFind = false
// let statusEqual = false
// let alistatus = null
// rs.Trademarks.forEach((item) => {
// if (nclcode == item.Classification) {
// isFind = true
// if (status == "" + item.Status + "") {
// statusEqual = true
// } else {
// alistatus = item.Status
// }
// }
// //fs.appendFileSync("./a.txt",item.RegistrationNumber+"-"+item.Status+"-"+item.Classification+"\n")
// })
// if (isFind) {
// if (!statusEqual) {
// fs.appendFileSync("./statusnotequal.txt", row + "\n")
// }
// } else {
// fs.appendFileSync("./notfound.txt", row + "\n")
// }
// } else {
// console.log("query no result.....")
// fs.appendFileSync("./notfound.txt", row + "\n")
// }
// console.log(row,"over.....")
// resv(row)
// }catch(e){
// fs.appendFileSync("./error.txt", row+ "\n")
// console.log(row,"error...............")
// return rej(e)
// }
// })
// }
// }
// function wait(second) {
// // execSync 属于同步方法;异步方式请根据需要自行查询 node.js 的 child_process 相关方法;
// let ChildProcess_ExecSync = require('child_process').execSync;
// ChildProcess_ExecSync('sleep ' + second);
// };
// let strstr = fs.readFileSync("./a.txt", "utf8")
// let rows = strstr.split("\n")
// console.log(rows.length)
// //59570--596页
// function BatchHandlerFac(rows,start,offset){
// return async()=>{
// let tasks=[]
// for (let n = start; n < offset; n++) {
// let row=rows[n]
// tasks.push(subTask(row)())
// }
// return Promise.all(tasks)
// }
// }
// for(let i=1;i<=5035;i++){
// let start =(i-1)*10
// let offset=start+10
// try{
// let ps=await BatchHandlerFac(rows,start,offset)()
// console.log(ps)
// console.log("page.......................===="+i)
// }catch(e){
// console.log(e)
// }
// }
// })()
// (async ()=>{
// let rs=await new TradetransferService().queryAuditStateFromAli()
// console.log(JSON.stringify(rs.Data.TradeProduces))
// })()
\ No newline at end of file
......@@ -151,7 +151,6 @@ class ServiceBase {
var reqUrl = this.channelApiUrl + "/action/tradetransfer/aliclienttransfer";
console.log("------------rtn---------------------------")
var rtn = await this.execS.execPostTK(sobj, reqUrl, tokenInfo.data.token);
console.log(rtn);
//var rtn = await this.execS.execPostTK(sobj, reqUrl,"token");
return rtn;
}
......
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