Merge branch 'test6.9.2' of http://git.yoho.cn/ufo/ufo-platform into test6.9.2

@@ -129,16 +129,16 @@ public class TradeBillsServiceImpl implements ITradeBillsService {
 		for(ZhimaCert item : ls) {
 			StoredSellerRespVo resp = new StoredSellerRespVo();
 			resp.setUid(item.getUid());
-			resp.setCertName(item.getCertName());
+			resp.setCertName("-"); // 公司要求隐藏真实姓名 item.getCertName()
 			resp.setCertNo(KeyWordHiddenUtil.hiddenKeyWord(item.getCertNo(), 2, 2));
-			resp.setMobile(getMobileByUidFromCache(item.getUid()));
+			resp.setMobile("-");  // 公司要求隐藏卖家手机号 getMobileByUidFromCache(item.getUid())
 			// 身份等级
 			resp.setEntryType(item.getEntryType() == null ? SellerTypeEnum.COMMON.getCode() : item.getEntryType());
 			//卖家类型
 			resp.setSellerType(item.getEntryType() == null ? SellerTypeEnum.COMMON.getCode() : item.getEntryType());
 			//处理入驻商家的一些数据
 			setEnterInfo(item,resp,swsMap);
-			resp.setValidStatusDesc(Objects.equals(resp.getEntryType(), SellerTypeEnum.COMMON.getCode()) ? "未入驻" :StoredSellerStatusEnum.getDescriptionByCode(item.getsValidStatus()));
+			resp.setValidStatusDesc(Objects.equals(resp.getEntryType(), SellerTypeEnum.COMMON.getCode()) ? "未入驻" : StoredSellerStatusEnum.getDescriptionByCode(item.getsValidStatus()));
 			// 上架skuP
 			resp.setSelfSkuNum(sellerOrderGoodsMapper.selectCountCanCell(item.getUid()));
 			// 违约次数

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yoho.product.dal.SecondhandImagesMapper;
 import com.yoho.product.model.SecondhandImages;
+import com.yoho.ufo.util.ImagesHelper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +36,7 @@ public class SecondhandImagesService {
         Map<Integer, String> flawMap = secondhandFlawService.selectByIds(flawCodeList);
 
         secondhandImages.stream().forEach(item -> {   // 更新图片的相对路径   更新图片的说明
-            item.setImageUrl(item.getImageUrl());
+            item.setImageUrl(ImagesHelper.getImageAbsoluteUrl(item.getImageUrl(), "goodsimg"));
             item.setImageDesc(flawMap.get(item.getCode()));
         });
 

@@ -152,7 +152,10 @@ function getTradeBillsList(){
             title: "用户手机号",
             field: "mobile",
             width: 30,
-            align: "center"
+            align: "center",
+            formatter: function (value, rowData) {
+                return "-"  //公司要求隐藏卖家敏感信息
+            }
         } ,{
             title: "打款时间",
             field: "createTimeStr",

@@ -260,7 +260,7 @@
                 width: "750px",
                 height: "500px",
                 title: title,
-                href: contextPath + "/html/brandManage/editBrand.html",
+                href: contextPath + "/html/brandManage/editBrand.html?time_version=" + new Date().getTime(),
                 queryParams: {
                     id: id
                 },

@@ -245,7 +245,7 @@
                 width: "600px",
                 height: "380px",
                 title: title,
-                href: contextPath + "/html/brandManage/brandSeries/editBrandSeries.html",
+                href: contextPath + "/html/brandManage/brandSeries/editBrandSeries.html?time_version=" + new Date().getTime(),
                 queryParams: {
                     id: id
                 },

@@ -152,7 +152,7 @@
                 width: "800px",
                 height: "500px",
                 title: title,
-                href: contextPath + "/html/commodityBasicRules/color/productColorEdit.html",
+                href: contextPath + "/html/commodityBasicRules/color/productColorEdit.html?time_version=" + new Date().getTime(),
                 queryParams: {
                     id: id
                 },

@@ -272,7 +272,7 @@
                 width: "550px",
                 height: "400px",
                 title: title,
-                href: contextPath + "/html/commodityBasicRules/physicalCategory/addBind.html",
+                href: contextPath + "/html/commodityBasicRules/physicalCategory/addBind.html?time_version=" + new Date().getTime(),
                 queryParams: {
                     id: id
                 },

@@ -195,7 +195,7 @@
                 width: "850px",
                 height: "450px",
                 title: title,
-                href: contextPath + "/html/commodityBasicRules/physicalCategory/physicalCategoryManagementEdit.html",
+                href: contextPath + "/html/commodityBasicRules/physicalCategory/physicalCategoryManagementEdit.html?time_version=" + new Date().getTime(),
                 queryParams: {
                     id: id
                 },

@@ -161,7 +161,7 @@
                 width: "500px",
                 height: "250px",
                 title: title,
-                href: contextPath + "/html/commodityBasicRules/size/sizeEdit.html",
+                href: contextPath + "/html/commodityBasicRules/size/sizeEdit.html?time_version=" + new Date().getTime(),
                 queryParams: {
                     id: id
                 },

@@ -65,7 +65,7 @@
     	
         $('#returnList').linkbutton({
             onClick: function () {
-                location.href = contextPath + "/html/commodityManage/commodityPoolManage/commodityPoolManage.html";
+                location.href = contextPath + "/html/commodityManage/commodityPoolManage/commodityPoolManage.html?time_version=" + new Date().getTime();
             }
         });
         
@@ -248,7 +248,7 @@
     
     function addPage(poolId) {
         var div = $("<div id='addDiv'>").appendTo($(document.body));
-        var url = contextPath + "/html/commodityManage/commodityPoolManage/addProduct.html";
+        var url = contextPath + "/html/commodityManage/commodityPoolManage/addProduct.html?time_version=" + new Date().getTime();
         $(div).myDialog({
             width: "40%",
             height: "50%",

@@ -172,7 +172,7 @@
                 width: "750px",
                 height: "500px",
                 title: title,
-                href: contextPath + "/html/commodityManage/commodityPoolManage/editCommodityPool.html",
+                href: contextPath + "/html/commodityManage/commodityPoolManage/editCommodityPool.html?time_version=" + new Date().getTime(),
                 queryParams: {
                     id: id
                 },

@@ -71,7 +71,7 @@
 
         $('#returnList').linkbutton({
             onClick: function () {
-                location.href = contextPath + "/html/goods/storage/storageList.html";
+                location.href = contextPath + "/html/goods/storage/storageList.html?time_version=" + new Date().getTime();
             }
         });
         //

@@ -251,7 +251,7 @@
         // 返回列表页
         $('#returnList').linkbutton({
             onClick: function () {
-                location.href = contextPath + "/html/goods/storageLineShops/storageLineShopsList.html";
+                location.href = contextPath + "/html/goods/storageLineShops/storageLineShopsList.html?time_version=" + new Date().getTime();
             }
         });
 

@@ -310,7 +310,7 @@
 
         // 跳转编辑页
         function detailStorage(id, midSortId) {
-            this.location.href = contextPath + "/html/goods/storageLineShops/storageLineShopsDetail.html?productId=" + id + "&midSortId=" + midSortId;
+            this.location.href = contextPath + "/html/goods/storageLineShops/storageLineShopsDetail.html?productId=" + id + "&midSortId=" + midSortId + "&time_version=" + new Date().getTime();
         }
 
     }())

@@ -725,7 +725,7 @@ function  getTableColumn(platformWaybillShowFlag) {
 
 function viewExpressPage() {
     var div = $("<div id='viewExpressDiv'>").appendTo($(document.body));
-    var url = contextPath + "/html/judgeCenter/viewExpress.html";
+    var url = contextPath + "/html/judgeCenter/viewExpress.html?time_version=" + new Date().getTime();
     $(div).myDialog({
         width: "50%",
         height: "60%",
@@ -1118,7 +1118,7 @@ function addRecordPage(skup, order_code, id) {
                 var div = $("<div id='recordDiv'>").appendTo($(document.body));
                 $(div).myDialog({
                     width: "45%",  height: "35%", title: "选择摄像头",
-                    href: contextPath + "/html/judgeCenter/record.html",
+                    href: contextPath + "/html/judgeCenter/record.html?time_version=" + new Date().getTime(),
                     modal: true, collapsible: true, cache: false,
                     onClose : function() {$(this).dialog('destroy');},
                     buttons: [{

@@ -148,7 +148,8 @@
                 align: "center",
                 rowspan:2,
                 formatter: function (value, rowData) {
-                    return decodeURI(sysParam[1]);
+                    //return decodeURI(sysParam[1]); 公司要求隐藏卖家敏感信息
+                    return "-"
                 }
             }, {
                 title: "时间",

@@ -59,7 +59,10 @@
                 title: "商家名称",
                 field: "merchantName",
                 width: 80,
-                align: "center"
+                align: "center",
+                formatter: function (value) {
+                    return "-";
+                }
             }, {
                 title: "账户保证金",
                 field: "accountAmount",
@@ -98,7 +101,7 @@
                     onClick: function () {
                         var id = $(this).attr("dataId");
                         var userName=$(this).attr("dataName");
-                        window.location.href = contextPath + "/html/merchantManage/margin/marginDetailList.html?" + id+"&"+userName;
+                        window.location.href = contextPath + "/html/merchantManage/margin/marginDetailList.html?" + id+"&"+userName+"&" + new Date().getTime();
                     }
                 });
             }

@@ -69,7 +69,10 @@
                 title: "商家名称",
                 field: "merchantName",
                 width: 120,
-                align: "center"
+                align: "center",
+                formatter: function (value) {
+                    return "-";
+                }
             }, {
                 title: "违规时间",
                 field: "time",

@@ -204,7 +204,7 @@ $(function() {
 	$("#returnBtn").linkbutton({
         iconCls : "icon-search",
         onClick : function() {
-        	window.location.href = contextPath + "/html/orderManage/list.html";
+        	window.location.href = contextPath + "/html/orderManage/list.html?time_version=" + new Date().getTime();
         }
     });
 	$("#updateOrderInfoBtn").linkbutton({

@@ -653,7 +653,7 @@
 
 			$('#cancelBtn').linkbutton({
 				onClick: function() {
-					window.location.href = contextPath + "/html/product/productList.html";
+					window.location.href = contextPath + "/html/product/productList.html?time_version=" + new Date().getTime();
 				}
 			});
 
@@ -822,7 +822,7 @@
 
 							if (ret && ret.code == 200) {
 								$.messager.alert('操作提示', '提交成功！');
-								window.location.href = contextPath + "/html/product/productList.html";
+								window.location.href = contextPath + "/html/product/productList.html?time_version=" + new Date().getTime();
 							} else {
 								$.messager.alert('操作提示', ret.message || '提交失败');
 							}

@@ -273,7 +273,7 @@
         
         $('#addProduct').linkbutton({
 			onClick: function() {
-				window.location.href = contextPath + "/html/product/productEdit.html";
+				window.location.href = contextPath + "/html/product/productEdit.html?time_version=" + new Date().getTime();
 			}
 		});
 
@@ -286,7 +286,7 @@
                 title = "添加品牌系列";
                 message = "确认添加品牌系列信息吗？";
             } else {
-                window.open(contextPath + "/html/product/productEdit.html?id=" + id)
+                window.open(contextPath + "/html/product/productEdit.html?id=" + id + "&time_version=" + new Date().getTime())
             }
         }
 

@@ -86,7 +86,7 @@
                 }
             }],
             modal: true,
-            href: contextPath + "/html/productRecommend/productRecommendAddBatch.html",
+            href: contextPath + "/html/productRecommend/productRecommendAddBatch.html?time_version=" + new Date().getTime(),
             onOpen : function() {
                 window.setTimeout(function() {
                     $("#saveBtn").addClass("btn-success");
@@ -241,7 +241,7 @@
                 width: "600px",
                 height: "400px",
                 title: title,
-                href: contextPath + "/html/productRecommend/editProductRecommend.html",
+                href: contextPath + "/html/productRecommend/editProductRecommend.html?time_version=" + new Date().getTime(),
                 queryParams: {
                     id: id
                 },

@@ -230,7 +230,7 @@
             width: "850px",
             height: "450px",
             title: title,
-            href: contextPath + "/html/saleCategory/addOrEdit.html",
+            href: contextPath + "/html/saleCategory/addOrEdit.html?time_version=" + new Date().getTime(),
             queryParams: {
                 saleCategoryParentId:saleCategoryParentId,
                 id: id
@@ -300,7 +300,7 @@
             width: "850px",
             height: "500px",
             title: title,
-            href: contextPath + "/html/saleCategory/addOrEditThirdLevel.html",
+            href: contextPath + "/html/saleCategory/addOrEditThirdLevel.html?time_version=" + new Date().getTime(),
             queryParams: {
                 saleCategoryParentId:saleCategoryParentId,
                 id: id

@@ -218,7 +218,7 @@
                 width: "600px",
                 height: "380px",
                 title: title,
-                href: contextPath + "/html/searchWordManage/editSearchWord.html",
+                href: contextPath + "/html/searchWordManage/editSearchWord.html?time_version=" + new Date().getTime(),
                 queryParams: {
                     id: id
                 },

@@ -240,7 +240,7 @@
                 width: "600px",
                 height: "800px",
                 title: title,
-                href: contextPath + "/html/yoho2ufoproduct/editYoho2UfoProduct.html",
+                href: contextPath + "/html/yoho2ufoproduct/editYoho2UfoProduct.html?time_version=" + new Date().getTime(),
                 queryParams: {
                     id: id
                 },
@@ -376,7 +376,7 @@
                     }
                 }],
                 modal: true,
-                href: contextPath + "/html/yoho2ufoproduct/yoho2UfoProductBatchDel.html",
+                href: contextPath + "/html/yoho2ufoproduct/yoho2UfoProductBatchDel.html?time_version=" + new Date().getTime(),
                 onOpen : function() {
                     window.setTimeout(function() {
                         $("#saveBtnAdd").addClass("btn-success");