Merge remote-tracking branch 'origin/hotfix-0626-yuj' into dev

# Conflicts:
#	src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

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

@@ -1581,9 +1581,15 @@ public class ProductServiceImpl implements ProductService {
             throw new IllegalOperatorException("店铺信息丢失，请刷新后重试");
         }
         int standard,nStandard;
+        long l = System.currentTimeMillis();
         if (null != isPerson && isPerson.intValue() == IntegerConstant.YES_SHORT.intValue()){
+
             standard = v_productPersonDao.getCountByEnuuAndUserUUAndStatusAndEnabled(enUU, userUU, ShortConstant.YES_SHORT, IntegerConstant.YES_SHORT);
+            long l1 = System.currentTimeMillis();
+            System.err.println((l1 - l) + "-----------------获取标准时间");
             nStandard = v_productPersonDao.getCountByEnuuAndUserUUAndStatusAndEnabled(enUU, userUU, ShortConstant.NO_SHORT, IntegerConstant.YES_SHORT);
+            long l2 = System.currentTimeMillis();
+            System.err.println((l2 - l1) + "-----------------获取非标准时间");
         } else {
             // 数据量大时，从数据库查询数量也变得很慢，所以改用查索引获取 dongbw 2018年5月28日 11:24:17
             standard = (int) searchService.getProducts(enUU, null, 1, 10, "standard").getTotalElement();