Skip to content

Z
zhichan
Commit cb4c349c by 宋毅
Options

gMerge branch 'center-channel' of gitlab.gongsibao.com:jiangyong/zhichan into center-channel

parents e794e78f c1365561
Showing with 65 additions and 24 deletions
center-channel/app/base/api/impl/opaction/opOrder.js
...@@ -32,6 +32,9 @@ class ProductAPI extends WEBBase { ...@@ -32,6 +32,9 @@ class ProductAPI extends WEBBase {
case "updateTmOrder"://修改商标订单信息 case "updateTmOrder"://修改商标订单信息
opResult = await this.utilsOpOrderSve.updateTmOrder(pobj, pobj.actionBody); opResult = await this.utilsOpOrderSve.updateTmOrder(pobj, pobj.actionBody);
break; break;
case "tmConfirm"://商标方案确认
opResult = await this.utilsOpOrderSve.tmConfirm(pobj,pobj.actionBody);
break;
default: default:
opResult = system.getResult(null, "action_type参数错误"); opResult = system.getResult(null, "action_type参数错误");
break; break;
...@@ -40,4 +43,4 @@ class ProductAPI extends WEBBase { ...@@ -40,4 +43,4 @@ class ProductAPI extends WEBBase {
} }
} }
module.exports = ProductAPI; module.exports = ProductAPI;
\ No newline at end of file
center-channel/app/base/api/impl/opaction/order.js
...@@ -61,4 +61,4 @@ class ProductAPI extends WEBBase { ...@@ -61,4 +61,4 @@ class ProductAPI extends WEBBase {
} }
} }
module.exports = ProductAPI; module.exports = ProductAPI;
\ No newline at end of file
center-channel/app/base/service/impl/utilsSve/utilsOpOrderSve.js
...@@ -49,5 +49,15 @@ class UtilsOpOrderService extends AppServiceBase { ...@@ -49,5 +49,15 @@ class UtilsOpOrderService extends AppServiceBase {
this.utilsPushSve.pushBusInfo(tmpPobj, opType, 1); this.utilsPushSve.pushBusInfo(tmpPobj, opType, 1);
} }
} }
async tmConfirm(pobj,actionBody){//商标方案确认
if (!actionBody.orderNo) {
return system.getResult(null, "actionBody.orderNo can not be empty，100025");
}
var reqUrl = this.centerOrderUrl + "action/order/springBoard";
var result = await this.restPostUrl(pobj, reqUrl);
return result;
}
} }
module.exports = UtilsOpOrderService; module.exports = UtilsOpOrderService;
center-channel/app/base/service/impl/utilsSve/utilsOrderSve.js
...@@ -54,7 +54,7 @@ class UtilsOrderService extends AppServiceBase { ...@@ -54,7 +54,7 @@ class UtilsOrderService extends AppServiceBase {
} }
/** /**
* 创建订单 * 创建订单
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody {channelItemCode:渠道产品的编码，id:定价id,quantity:订单数量,totalSum:300} * @param {*} actionBody {channelItemCode:渠道产品的编码，id:定价id,quantity:订单数量,totalSum:300}
*/ */
async addOrder(pobj, actionBody) { async addOrder(pobj, actionBody) {
...@@ -153,8 +153,8 @@ class UtilsOrderService extends AppServiceBase { ...@@ -153,8 +153,8 @@ class UtilsOrderService extends AppServiceBase {
} }
/** /**
* 获取H5支付地址 * 获取H5支付地址
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody * @param {*} actionBody
*/ */
async getH5PayUrl(pobj, actionBody) { async getH5PayUrl(pobj, actionBody) {
if (!actionBody.orderNo) { if (!actionBody.orderNo) {
...@@ -182,7 +182,7 @@ class UtilsOrderService extends AppServiceBase { ...@@ -182,7 +182,7 @@ class UtilsOrderService extends AppServiceBase {
} }
/** /**
* 获取二维码 * 获取二维码
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody {orderNo:XXXX,opType:"wx"}---"wx":"微信","alipay":"支付宝" * @param {*} actionBody {orderNo:XXXX,opType:"wx"}---"wx":"微信","alipay":"支付宝"
*/ */
async getOrderQrCode(pobj, actionBody) { async getOrderQrCode(pobj, actionBody) {
...@@ -260,7 +260,7 @@ class UtilsOrderService extends AppServiceBase { ...@@ -260,7 +260,7 @@ class UtilsOrderService extends AppServiceBase {
} }
/** /**
* 查询订单状态 * 查询订单状态
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody {orderNo:XXXX,opType:"wx"}---"wx":"微信","alipay":"支付宝" * @param {*} actionBody {orderNo:XXXX,opType:"wx"}---"wx":"微信","alipay":"支付宝"
*/ */
async queryOrderStatus(pobj, actionBody) { async queryOrderStatus(pobj, actionBody) {
...@@ -308,8 +308,8 @@ class UtilsOrderService extends AppServiceBase { ...@@ -308,8 +308,8 @@ class UtilsOrderService extends AppServiceBase {
} }
/** /**
* 获取pc端支付二维码--不跟订单关联 * 获取pc端支付二维码--不跟订单关联
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody * @param {*} actionBody
* "actionBody": { * "actionBody": {
"order_num": order.orderNo, "order_num": order.orderNo,
"total_fee": Number(order.totalSum) * 100, "total_fee": Number(order.totalSum) * 100,
...@@ -338,7 +338,7 @@ class UtilsOrderService extends AppServiceBase { ...@@ -338,7 +338,7 @@ class UtilsOrderService extends AppServiceBase {
} }
/** /**
* 只是检查支付状态--不跟订单关联 * 只是检查支付状态--不跟订单关联
* @param {*} pobj * @param {*} pobj
* @param {*} actionBody { "trxid": payTrxid 支付流水号} * @param {*} actionBody { "trxid": payTrxid 支付流水号}
*/ */
async queryOrder(pobj, actionBody) { async queryOrder(pobj, actionBody) {
...@@ -426,7 +426,7 @@ class UtilsOrderService extends AppServiceBase { ...@@ -426,7 +426,7 @@ class UtilsOrderService extends AppServiceBase {
} }
parmas.appInfo = appInfo; parmas.appInfo = appInfo;
parmas.orderNo = parmas.out_trade_no; parmas.orderNo = parmas.out_trade_no;
//修改并返回订单支付状态，创建收款单 //修改并返回订单支付状态，创建收款单
var url = this.centerOrderUrl + "opaction/opPayOrder/receivePayCallBackNotify"; var url = this.centerOrderUrl + "opaction/opPayOrder/receivePayCallBackNotify";
var opResult = await this.restPostUrl(parmas, url); var opResult = await this.restPostUrl(parmas, url);
if (opResult.status == 0) { if (opResult.status == 0) {
...@@ -462,5 +462,6 @@ class UtilsOrderService extends AppServiceBase { ...@@ -462,5 +462,6 @@ class UtilsOrderService extends AppServiceBase {
return system.getResultFail(-200, e.stack); return system.getResultFail(-200, e.stack);
} }
} }
} }
module.exports = UtilsOrderService; module.exports = UtilsOrderService;
center-channel/app/config/routes/api.js
...@@ -109,7 +109,7 @@ module.exports = function (app) { ...@@ -109,7 +109,7 @@ module.exports = function (app) {
} }
req.body.appInfo = result.data; req.body.appInfo = result.data;
req.body.actionProcess = result.data.app_code; req.body.actionProcess = result.data.app_code;
var lst = [ var lst = ["tmConfirm",
"addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo", "getOrderDeliveryInfo", "getOrderDetails", "addOrder", "getH5PayUrl", "getOrderQrCode", "queryOrderStatus", "getOrderInfo", "getOrderDeliveryInfo", "getOrderDetails",
"getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo", "updateContacts", "updateTmOrder", "delOrder", "getOrderDeliveryFlowInfo", "getOrderDeliveryFlowList", "getOrderLogInfo", "updateContacts", "updateTmOrder", "delOrder",
"submitProgramme", "getProgrammeListByUser", "getProgrammeInfoByNeedNo", "abolishProgramme", "getAliPayInfo" "submitProgramme", "getProgrammeListByUser", "getProgrammeInfoByNeedNo", "abolishProgramme", "getAliPayInfo"
......
center-channel/app/config/settings.js
...@@ -57,7 +57,7 @@ var settings = { ...@@ -57,7 +57,7 @@ var settings = {
}, },
centerOrderUrl: function () { centerOrderUrl: function () {
if (this.env == "dev") { if (this.env == "dev") {
return "http://centerapp.apps.com:4011/"; return "http://centerorder.apps.com:4011/";
} else { } else {
return "http://center-order-service/"; return "http://center-order-service/";
} }
......
center-channel/app/front/entry/public/apidoc/platform/order.md
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
"channelItemCode":"fzsbzc",// Y 产品的渠道编码 "channelItemCode":"fzsbzc",// Y 产品的渠道编码
"payCode": "fzsbzc-1", // Y 支付价格code "payCode": "fzsbzc-1", // Y 支付价格code
"quantity":1,// Y 购买数量 "quantity":1,// Y 购买数量
"totalSum":699,// Y 订单总金额 "totalSum":699,// Y 订单总金额
"payTotalSum":699, // Y 订单付款总金额 "payTotalSum":699, // Y 订单付款总金额
"notes": "订单备注信息",// N 订单备注 "notes": "订单备注信息",// N 订单备注
"orderContact":{ // N 订单联系人信息，没有则填写{} "orderContact":{ // N 订单联系人信息，没有则填写{}
...@@ -233,9 +233,9 @@ ...@@ -233,9 +233,9 @@
"channelItemCode": "FW_GOODS-582221-1", "channelItemCode": "FW_GOODS-582221-1",
"channelItemName": "京东云PLUS公司注册（北京市）", "channelItemName": "京东云PLUS公司注册（北京市）",
"channelItemAppendName": "", "channelItemAppendName": "",
"price":"10.00", "price":"10.00",
"priceTypeName":"件", "priceTypeName":"件",
"priceDesc":"海淀区内资一般人", "priceDesc":"海淀区内资一般人",
"serviceItemCode": null, "serviceItemCode": null,
"picUrl": null, "picUrl": null,
"created_at":"" "created_at":""
...@@ -362,4 +362,4 @@ ...@@ -362,4 +362,4 @@
"requestId": "f21446617c5e46ad889f3fab7bb69456" "requestId": "f21446617c5e46ad889f3fab7bb69456"
} }
``` ```
\ No newline at end of file
center-channel/app/front/entry/public/apidoc/platform/tmOrder.md
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
1. [商标订单修改-商标尼斯信息修改](#updateNclInfo) 1. [商标订单修改-商标尼斯信息修改](#updateNclInfo)
1. [商标订单修改-修改申请人信息](#updateCustomerInfo) 1. [商标订单修改-修改申请人信息](#updateCustomerInfo)
1. [商标订单修改-修改交官材料](#updateOfficial) 1. [商标订单修改-修改交官材料](#updateOfficial)
1. [商标方案确认](#tmConfirm)
## **<a name="getTmOrderDeliveryInfo"> 获取商标订单交付信息</a>** ## **<a name="getTmOrderDeliveryInfo"> 获取商标订单交付信息</a>**
[返回到目录](#menu) [返回到目录](#menu)
...@@ -270,7 +271,7 @@ ...@@ -270,7 +271,7 @@
] ]
} }
] ]
} }
``` ```
...@@ -358,4 +359,34 @@ ...@@ -358,4 +359,34 @@
"requestId":"ab3dbb7dce5b4b44bc1d1c83e887ffee" "requestId":"ab3dbb7dce5b4b44bc1d1c83e887ffee"
} }
``` ```
\ No newline at end of file
## **<a name="tmConfirm"> 商标方案确认</a>**
[返回到目录](#menu)
##### URL
[/web/opaction/opOrder/springBoard]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
#### 请求头中需要增加userpin（用户登录后的凭证）的值
#### 渠道执行的类型 actionType：tmConfirm
``` javascript
{
"orderNo ":"346c3091684e4e0eef",
"isConfirm ":"1",
"notes ":"",
}
```
#### 返回结果
```javascript
{
"status":0,
"data":null,
"msg":"商标方案确认成功",
"requestId":"0c14f04dc187486b829e392dc87c70c6"
}
```
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