Commit 0d8424f9 by 庄冰

tj

parent 37c8d905
...@@ -624,7 +624,7 @@ class OrderInfoService extends ServiceBase { ...@@ -624,7 +624,7 @@ class OrderInfoService extends ServiceBase {
priceName: p priceName: p
} }
var sql = "select product_code goodsSubType,pid,price_code billingcode from tx_product_price where product_name=:pathCode"; var sql = "select product_code goodsSubType,pid,price_code billingcode,categoryid from tx_product_price where product_name=:pathCode";
if (priceName) { if (priceName) {
sql += " and price_name like :priceName;"; sql += " and price_name like :priceName;";
} }
...@@ -709,6 +709,7 @@ class OrderInfoService extends ServiceBase { ...@@ -709,6 +709,7 @@ class OrderInfoService extends ServiceBase {
totalCost: rtn.data.data[0].totalCost, totalCost: rtn.data.data[0].totalCost,
realTotalCost: rtn.data.data[0].realTotalCost, realTotalCost: rtn.data.data[0].realTotalCost,
product: { product: {
categoryid:txprice[0].categoryid,
productIcon: txproductinfo.data.product_icon, productIcon: txproductinfo.data.product_icon,
productType: pobj.actionBody.PathCode, productType: pobj.actionBody.PathCode,
productTypeName: txproductinfo.data.product_type_name, productTypeName: txproductinfo.data.product_type_name,
...@@ -739,7 +740,6 @@ class OrderInfoService extends ServiceBase { ...@@ -739,7 +740,6 @@ class OrderInfoService extends ServiceBase {
if (!pobj.actionBody.Info[0].showInfo) { if (!pobj.actionBody.Info[0].showInfo) {
return system.getResultFail(-101, "showInfo is empty"); return system.getResultFail(-101, "showInfo is empty");
} }
var goodsCategoryId = 101630;
// if (pobj.actionBody.Info[0].product.productType.indexOf("/ic/") < 0) { // if (pobj.actionBody.Info[0].product.productType.indexOf("/ic/") < 0) {
// goodsCategoryId = 100114; // goodsCategoryId = 100114;
// } // }
...@@ -750,7 +750,7 @@ class OrderInfoService extends ServiceBase { ...@@ -750,7 +750,7 @@ class OrderInfoService extends ServiceBase {
} }
} }
var goodsinfo = { var goodsinfo = {
goodsCategoryId: goodsCategoryId, //商品ID goodsCategoryId: pobj.actionBody.Info[0].product.categoryid, //商品ID
regionId: 1, //地域ID regionId: 1, //地域ID
projectId: 0, //项目ID projectId: 0, //项目ID
zoneId: 100001, //可用区ID zoneId: 100001, //可用区ID
...@@ -772,6 +772,7 @@ class OrderInfoService extends ServiceBase { ...@@ -772,6 +772,7 @@ class OrderInfoService extends ServiceBase {
so.itemDetails.raw_goodsData.push(goodsinfo); so.itemDetails.raw_goodsData.push(goodsinfo);
if (pobj.actionBody.Info.length >= 2) { if (pobj.actionBody.Info.length >= 2) {
var newgoodsinfo = JSON.parse(JSON.stringify(goodsinfo)); var newgoodsinfo = JSON.parse(JSON.stringify(goodsinfo));
newgoodsinfo.goodsCategoryId=pobj.actionBody.Info[1].product.categoryid;
newgoodsinfo.goodsDetail = pobj.actionBody.Info[1].productSnapshot; newgoodsinfo.goodsDetail = pobj.actionBody.Info[1].productSnapshot;
newgoodsinfo.goodsDetail.product = pobj.actionBody.Info[1].product; newgoodsinfo.goodsDetail.product = pobj.actionBody.Info[1].product;
newgoodsinfo.goodsDetail.productInfo = pobj.actionBody.Info[1].showInfo; newgoodsinfo.goodsDetail.productInfo = pobj.actionBody.Info[1].showInfo;
...@@ -780,6 +781,7 @@ class OrderInfoService extends ServiceBase { ...@@ -780,6 +781,7 @@ class OrderInfoService extends ServiceBase {
} }
if (pobj.actionBody.Info.length == 3) { if (pobj.actionBody.Info.length == 3) {
var newgoodsinfo1 = JSON.parse(JSON.stringify(goodsinfo)); var newgoodsinfo1 = JSON.parse(JSON.stringify(goodsinfo));
newgoodsinfo.goodsCategoryId=pobj.actionBody.Info[2].product.categoryid;
newgoodsinfo1.goodsDetail = pobj.actionBody.Info[2].productSnapshot; newgoodsinfo1.goodsDetail = pobj.actionBody.Info[2].productSnapshot;
newgoodsinfo1.goodsDetail.product = pobj.actionBody.Info[2].product; newgoodsinfo1.goodsDetail.product = pobj.actionBody.Info[2].product;
newgoodsinfo1.goodsDetail.productInfo = pobj.actionBody.Info[2].showInfo; newgoodsinfo1.goodsDetail.productInfo = pobj.actionBody.Info[2].showInfo;
......
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