tj

center-order/app/base/service/impl/dbcorder/orderinfoSve.js

@@ -86,7 +86,8 @@ class OrderInfoService extends ServiceBase {
       channelItemName: actionBody.product_info.channel_item_name,//  渠道产品名称 
       channelItemAppendName: actionBody.channelItemAppendName || "",//服务商产品附加名称
       serviceItemCode: actionBody.product_info.service_item_code,//  服务商产品编码
-      payAfterJumpUrl: actionBody.product_info.pay_after_jump_url,
+      payAfterJumpH5Url: actionBody.product_info.pay_after_jump_h5url || "",
+      payAfterJumpPcUrl: actionBody.product_info.pay_after_jump_pcurl || "",
       picUrl: actionBody.product_info.pic_url,//  产品图片地址      
       price: actionBody.product_info.price_item.price,//定价
       priceDesc: actionBody.product_info.price_item.price_desc,//定价描述    
@@ -319,7 +320,7 @@ class OrderInfoService extends ServiceBase {
       });
     });
   }
-  
+
   async packagingLogoDeliveryData(pobj, actionBody) {//重新组装Logo交付信息
     if (!actionBody.deliveryData || Object.keys(actionBody.deliveryData).length == 0) {
       return system.getResult(null, "交付数据不能为空，20135");
@@ -348,21 +349,21 @@ class OrderInfoService extends ServiceBase {
     if (packagingTmResult.status != 0) {
       return packagingTmResult;
     }
-    if(pobj.actionBody.deliveryData.color_description){
-      pobj.actionBody.deliveryData.color_description = pobj.actionBody.deliveryData.color_description.replace(/\"/g,"\\\"");;
+    if (pobj.actionBody.deliveryData.color_description) {
+      pobj.actionBody.deliveryData.color_description = pobj.actionBody.deliveryData.color_description.replace(/\"/g, "\\\"");;
     }
-    if(pobj.actionBody.deliveryData.font_description){
-      pobj.actionBody.deliveryData.font_description = pobj.actionBody.deliveryData.font_description.replace(/\"/g,"\\\"");;
+    if (pobj.actionBody.deliveryData.font_description) {
+      pobj.actionBody.deliveryData.font_description = pobj.actionBody.deliveryData.font_description.replace(/\"/g, "\\\"");;
     }
-    pobj.actionBody.deliveryData.itemCode="znlogosjcp";
-    var sql = "SELECT *  FROM "+
-    "( SELECT sourceOrderNo FROM `c_order_delivery` WHERE deliveryContent -> '$.logo_id' = "+ pobj.actionBody.deliveryData.logo_id+
-    " or deliveryContent -> '$.logo_id' = '"+pobj.actionBody.deliveryData.logo_id+"' ) AS delivery "+
-    "LEFT JOIN "+
-    "( SELECT orderNo, orderStatus FROM `c_order_info` WHERE orderStatus = '2' or orderStatus='4' or orderStatus='8') AS orderinfo "+
-    " ON delivery.sourceOrderNo = orderinfo.orderNo";
+    pobj.actionBody.deliveryData.itemCode = "znlogosjcp";
+    var sql = "SELECT *  FROM " +
+      "( SELECT sourceOrderNo FROM `c_order_delivery` WHERE deliveryContent -> '$.logo_id' = " + pobj.actionBody.deliveryData.logo_id +
+      " or deliveryContent -> '$.logo_id' = '" + pobj.actionBody.deliveryData.logo_id + "' ) AS delivery " +
+      "LEFT JOIN " +
+      "( SELECT orderNo, orderStatus FROM `c_order_info` WHERE orderStatus = '2' or orderStatus='4' or orderStatus='8') AS orderinfo " +
+      " ON delivery.sourceOrderNo = orderinfo.orderNo";
     var deliveryList = await this.customQuery(sql);
-    if(deliveryList && deliveryList.length>0){
+    if (deliveryList && deliveryList.length > 0) {
       return system.getResult(null, "该品牌已售出，20200");
     }
     var self = this;