Merge branch 'igirl-channel-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-web

igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js

@@ -571,7 +571,7 @@ class tmqueryCtl extends CtlBase {
       if (["FW_GOODS-582206-1", "FW_GOODS-582208-1", "FW_GOODS-582207-1"].indexOf(pushData.skuId) >= 0) {
         param.actionType = pushData.skuId == "FW_GOODS-582206-1" ? "updateOrderPayStatus" : "addOrderAndDelivery";
       }//商标的产品订单
-      else {
+      else {        
         param.actionBody.channelItemCode = pushData.serviceCode;
         param.actionType = "jdAddQifuOrder";
       }//工商产品订单

igirl-channel-web/app/config/routes/web.js

@@ -40,7 +40,8 @@ module.exports = function (app) {
 	});
 	app.get("/jd/orderNotify", async function (req, res) {
 		req.query.actionProcess = "jd";
-		var result = await tmqueryCtl.pushJdPayOrder(req.query, req);
+		var pushData = req.query;
+		var result = await tmqueryCtl.pushJdPayOrder(pushData, req);
 		if (result.status != 0) {
 			res.end(JSON.stringify(result));
 			return;
@@ -53,6 +54,10 @@ module.exports = function (app) {
 				adminUrl: "https://tm.plus.jdcloud.com"
 			}
 		};
+		if (["FW_GOODS-582206-1", "FW_GOODS-582208-1", "FW_GOODS-582207-1"].indexOf(pushData.skuId) < 0) {
+			params.appInfo.authUrl = "https://gs.plus.jdcloud.com/jd/skipPage?channelUserId=" + req.query.jdPin;
+			params.appInfo.adminUrl = "https://gs.plus.jdcloud.com";
+		}//为工商产品
 		res.end(JSON.stringify(params));
 		return;
 	});