Skip to content

Z
zhichan
Commit 20df772f by 王栋源
Options

wdy

parent db265024
Showing with 79 additions and 60 deletions
jiaxiya/app/base/controller/impl/transfer/tradetransferCtl.js
...@@ -19,64 +19,69 @@ class TradetransferCtl extends CtlBase { ...@@ -19,64 +19,69 @@ class TradetransferCtl extends CtlBase {
p.codepath = req.codepath; p.codepath = req.codepath;
} }
var result = null; var result = null;
try {
if (p.transfer_status == "CONFIRM_ORDER") {
p.aliorder_status = "1",
result = await this.service.confirmorder(p);
console.log(result)
}
if (p.transfer_status == "CLOSE_ORDER_ONLY") {
p.aliorder_status = "11",
result = await this.service.refuseorder(p)
}
if (p.transfer_status == "PROVIDE_MATERIAL") {
p.aliorder_status = "3",
result = await this.service.supplymaterail(p)
}
if (p.transfer_status == "BUYER_EXPRESS") {
p.aliorder_status = "5",
result = await this.service.posttransfermatereial(p)
}
if (p.transfer_status == "BUYER_PROVIDE_MATERIAL") {
p.aliorder_status = "6",
result = await this.service.receivedtransfermaterail(p)
}
if (p.transfer_status == "SUBMIT_TO_SBJ") {
p.aliorder_status = "7",
result = await this.service.submittedtransfermaterail(p)
}
if (p.transfer_status == "SBJ_ACCEPT") {
p.aliorder_status = "8",
result = await this.service.acceptedtransfermaterail(p)
}
if (p.transfer_status == "CONFIRM_ORDER") { if (p.transfer_status == "SBJ_SUCCESS") {
p.aliorder_status = "1", p.aliorder_status = "8",
result = await this.service.confirmorder(p); result = await this.service.approvedtransfer(p)
console.log(result) }
} if (p.transfer_status == "SBJ_FAIL") {
if (p.transfer_status == "CLOSE_ORDER_ONLY") { p.aliorder_status = "８",
p.aliorder_status = "11", result = await this.service.refusetransfer(p)
result = await this.service.refuseorder(p) }
}
if (p.transfer_status == "PROVIDE_MATERIAL") {
p.aliorder_status = "3",
result = await this.service.supplymaterail(p)
}
if (p.transfer_status == "BUYER_EXPRESS") {
p.aliorder_status = "5",
result = await this.service.posttransfermatereial(p)
}
if (p.transfer_status == "BUYER_PROVIDE_MATERIAL") {
p.aliorder_status = "6",
result = await this.service.receivedtransfermaterail(p)
}
if (p.transfer_status == "SUBMIT_TO_SBJ") {
p.aliorder_status = "7",
result = await this.service.submittedtransfermaterail(p)
}
if (p.transfer_status == "SBJ_ACCEPT") {
p.aliorder_status = "8",
result = await this.service.acceptedtransfermaterail(p)
}
if (p.transfer_status == "SBJ_SUCCESS") { if (p.transfer_status == "TRANSFER_SUCCESS") {
p.aliorder_status = "8", p.aliorder_status = "12",
result = await this.service.approvedtransfer(p) result = await this.service.tradesuccess(p)
} }
if (p.transfer_status == "SBJ_FAIL") { if (p.transfer_status == "TRANSFER_FAIL") {
p.aliorder_status = "８", p.aliorder_status = "10",
result = await this.service.refusetransfer(p) result = await this.service.tradefail(p)
} }
if (p.transfer_status == "RefuseOrder") {
p.aliorder_status = "10",
result = await this.service.tradefail(p)
}
if (result && result.Success) {
var rd = await this.service.update(p);
return system.getResult(rd);
} else {
return system.getResult(null, "阿里请求失败");
}
if (p.transfer_status == "TRANSFER_SUCCESS") { } catch (error) {
p.aliorder_status = "12", return system.getResult(null, "请求异常");
result = await this.service.tradesuccess(p)
}
if (p.transfer_status == "TRANSFER_FAIL") {
p.aliorder_status = "10",
result = await this.service.tradefail(p)
}
if (p.transfer_status == "RefuseOrder") {
p.aliorder_status = "10",
result = await this.service.tradefail(p)
}
if (result && result.Success) {
var rd = await this.service.update(p);
return system.getResult(rd);
} else {
return system.getResult(null, "阿里请求失败");
} }
} }
async findone(p, q, req) { async findone(p, q, req) {
......
jiaxiya/app/base/db/metadata/apps/platform.js
...@@ -139,6 +139,21 @@ module.exports = { ...@@ -139,6 +139,21 @@ module.exports = {
"CLOSE_ORDER_REFUND":"订单关闭", "CLOSE_ORDER_REFUND":"订单关闭",
"REFUSE_ORDER":"取消订单" "REFUSE_ORDER":"取消订单"
}, },
"transfer_statusshow": {
"CONFIRM_ORDER": "确认订单",
"CLOSE_ORDER_ONLY": "拒绝订单",
"PAY_OVER": "尾款已支付",
"BUYER_EXPRESS": "邮寄资料",
"BUYER_PROVIDE_MATERIAL": "确认收件",
"SUBMIT_TO_SBJ": "提交官方",
"SBJ_ACCEPT": "商标局受理",
"SBJ_SUCCESS": "商标局核准",
"SBJ_FAIL": "商标局不核准",
"TRANSFER_FAIL": "交易失败",
"TRANSFER_SUCCESS": "交易成功",
"CLOSE_ORDER_REFUND":"订单关闭",
"REFUSE_ORDER":"取消订单"
},
"aliorder_status": { "aliorder_status": {
"1": "确认商标状态", "1": "确认商标状态",
"11": "订单关闭(不退款)", "11": "订单关闭(不退款)",
......
jiaxiya/app/base/db/metadata/bizs/bizjs/mytradetransferdiliver.js
...@@ -13,7 +13,7 @@ module.exports={ ...@@ -13,7 +13,7 @@ module.exports={
{ {
"title":"控制信息", "title":"控制信息",
ctls:[ ctls:[
{"type":"select","dicKey":"transfer_status","label":"转让状态","prop":"transfer_status","labelField":"label","valueField":"value","style":"","isButton":true}, {"type":"select","dicKey":"transfer_statusshow","label":"转让状态","prop":"transfer_status","labelField":"label","valueField":"value","style":"","isButton":true},
// {"type":"select","refModel":"pmproduct","isMulti":false,"label":"所属产品","prop":"pmproduct_id","labelField":"name","valueField":"id","style":""}, // {"type":"select","refModel":"pmproduct","isMulti":false,"label":"所属产品","prop":"pmproduct_id","labelField":"name","valueField":"id","style":""},
] ]
}, },
......
jiaxiya/app/base/service/impl/transfer/tmjsonfileSve.js
...@@ -13,15 +13,15 @@ class TmjsonfileService extends ServiceBase { ...@@ -13,15 +13,15 @@ class TmjsonfileService extends ServiceBase {
} }
async createjsonfile() { async createjsonfile() {
var sql = "select * from bi_trademarktransaction limit 1000"; var sql = "select * from bi_trademarktransaction wgere ncl_one_code is not null and ncl_one_code<>'' limit 1000";
var tminfos = await this.connectionigirl.query(sql); var tminfos = await this.connectionigirl.query(sql);
var sources = []; var sources = [];
if (tminfos[0]) { if (tminfos[0]) {
for (var i = 0; i < tminfos[0].length; i++) { for (var i = 0; i < tminfos[0].length; i++) {
var a = tminfos[0][i].tm_group; var tmg = tminfos[0][i].tm_group;
var strlist = null; var strlist = null;
if (a) { if (tmg) {
strlist = a.replace(/"/g, "").replace(/\[/g, "").replace(/\]/g, "").split(","); strlist = tmg.replace(/"/g, "").replace(/\[/g, "").replace(/\]/g, "").split(",");
if (!strlist) { if (!strlist) {
strlist.shift(); strlist.shift();
} }
...@@ -34,7 +34,6 @@ class TmjsonfileService extends ServiceBase { ...@@ -34,7 +34,6 @@ class TmjsonfileService extends ServiceBase {
endTime: 1668089537981, endTime: 1668089537981,
label: "商标标签", label: "商标标签",
originalPrice: 10, originalPrice: 10,
// originalPrice: parseInt(tminfos[0][i].platform_quoted_price),
ownerEnName: "", ownerEnName: "",
ownerName: tminfos[0][i].tm_applier, ownerName: tminfos[0][i].tm_applier,
partnerCode: "gong_si_bao", partnerCode: "gong_si_bao",
......
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