Merge remote-tracking branch 'origin/release-201839-wangcz' into release-201839-wangcz

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -200,6 +200,13 @@ public class GoodsServiceImpl implements GoodsService {
      */
     private final BoundedExecutor executor;
 
+    private static List<String> pcbStore = new ArrayList<String>();
+
+    static {
+        pcbStore.add("shengfang");
+        pcbStore.add("9612c0a894894c1aabbfe9192749bbfa");
+    }
+
     @Autowired
     private PCBDao pcbDao;
 
@@ -2227,7 +2234,12 @@ public class GoodsServiceImpl implements GoodsService {
             return null;
         }
         // pageInfo.expression(PredicateUtils.or(new SimpleExpression[]{PredicateUtils.eq("status", 601, true), PredicateUtils.eq("status", 602, true)}));
-        pageInfo.expression(PredicateUtils.in("status", new Integer[]{601, 602, 613}, true));
+        if (pcbStore.contains(storeid)) {
+            pageInfo.expression(PredicateUtils.eq("status", 601, true));
+        } else {
+            pageInfo.expression(PredicateUtils.in("status", new Integer[]{601, 602, 613}, true));
+        }
+
         pageInfo.sorting(Sort.Direction.DESC, "updateDate");
         pageInfo.expression(PredicateUtils.eq("storeid", storeid, false));
         if (StringUtils.hasText(kindUuid)) {
@@ -4206,8 +4218,6 @@ public class GoodsServiceImpl implements GoodsService {
     @Override
     public void exportKindProductsCount(Date startTime, Date endTime, HttpServletResponse response) throws Exception {
         logger.info("批量导出类目", System.currentTimeMillis() + "开始时间");
-        jdbcTemplate.execute("drop temporary table temp_kind");
-
         StringBuffer where = new StringBuffer(" from products where pr_kind is not null");
         if (null != startTime) {
             where.append(" and pr_create_time >= '").append(new java.sql.Date(startTime.getTime())).append("' ");
@@ -4254,6 +4264,7 @@ public class GoodsServiceImpl implements GoodsService {
                 }
             }
         });
+        jdbcTemplate.execute("drop temporary table temp_kind");
 
         logger.info("批量导出类目", System.currentTimeMillis() + "结束时间");
     }

src/main/resources/dev/sys.properties

@@ -39,7 +39,7 @@ recommendPort=20102
 # upload file
 uploadFileUrl = http://10.10.100.200:9999
 # search file
-searchUrl = http://10.10.100.191:8092
+searchUrl = http://192.168.253.6:8092
 # message ip
 messageServiceIp=http://message.ubtob.com/
 # product public ip

src/main/resources/test/sys.properties

@@ -39,7 +39,7 @@ recommendPort=20102
 # upload file
 uploadFileUrl = http://10.10.100.200:9999
 # search file
-searchUrl = http://10.10.100.191:8092
+searchUrl = http://192.168.253.6:8092
 
 # message ip
 messageServiceIp=http://message.ubtob.com/

src/main/webapp/resources/js/admin/controllers/product/productManageCtrl.js

@@ -131,7 +131,7 @@ define(['app/app'], function(app) {
             601 : '已上架',
             602 : '已上架',
             612 : '已下架',
-            613 : '新品未上架'
+            613 : '已上架'
         };
 
         // 获取分页Goods数据

src/main/webapp/resources/js/admin/controllers/product/saleProductManageCtrl.js

@@ -130,7 +130,7 @@ define(['app/app'], function(app) {
             601 : '已上架',
             602 : '已上架',
             612 : '已下架',
-            613 : '新品未上架'
+            613 : '已上架'
         };
 
         // 获取分页Goods数据

src/main/webapp/resources/js/vendor/controllers/forstore/purchase_detail.js

@@ -37,7 +37,7 @@ define(['app/app'], function(app) {
                 {invoiceid: enIdFilter($scope.ChooseItem)}, {},
                 function (data) {
                     var params = {};
-                    $scope.purchase.status = data.status;
+                    // $scope.purchase.status = data.status;
                     var _data = data.invoiceDetails;
                     var _details = $scope.purchase.purchaseDetails;
                     $scope.purchase.logistics = data.logistics;
@@ -438,7 +438,7 @@ define(['app/app'], function(app) {
 				$scope.steps.time1 = $scope.getTimeOfStatus(501);
 				$scope.steps.time2 = $scope.getTime2OfStatus();
 				$scope.steps.time3 = $scope.getTimeOfStatus(404);
-				$scope.steps.time4 = $scope.getTimeOfStatus(514);
+				$scope.steps.time4 = $scope.getTimeOfStatus(405) || $scope.getTimeOfStatus(503) || $scope.getTimeOfStatus(514) || $scope.getTimeOfStatus(506);
 				$scope.steps.time5 = $scope.getTimeOfStatus(status);
 			}
 		};

src/main/webapp/resources/view/common/site-nav.html

@@ -56,7 +56,7 @@
         border: 1px solid #999999;
         border-top: none;
         font-size: 12px;
-        z-index: 80;
+        z-index: 111111;
         -webkit-box-shadow: none;
         -moz-box-shadow: none;
         box-shadow: none;