Merge branch 'dev-mysql-1227' of ssh://10.10.100.21/source/platform-b2c into dev-mysql-1227

src/main/java/com/uas/platform/b2c/prod/commodity/dao/ReleaseProductByBatchDao.java

@@ -71,7 +71,7 @@ public interface ReleaseProductByBatchDao
      * @param publisherUu the publisher uu 发布人
      * @param batchid     the batchid 批次号
      */
-    @Procedure(procedureName = "PRODUCT_RELEASE_VALID_TEST")
+    @Procedure(procedureName = "PRODUCT_RELEASE_VALID_V1")
 	public void callValidProcedure(Long publisherUu, String batchid);
 
     /**

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

@@ -159,7 +159,7 @@ public class ProductServiceImpl implements ProductService {
 
     @Override
     public Page<Product> getAllProducts(final PageInfo page, String keyword, String type) {
-        page.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+        page.expression(PredicateUtils.eq("enUU", SystemSession.getUser().getEnterprise().getUu(), true));
         if (StringUtils.isEmpty(type)) {
             type = "nStandard";
         }
@@ -636,7 +636,7 @@ public class ProductServiceImpl implements ProductService {
         int success = 0;
         int fail = 0;
 
-        String sql = "/*#mycat:db_type=master*/ call PRODUCT_MATCHES_TEST(%s, %s, @out); select @out";
+        String sql = "/*#mycat:db_type=master*/ call PRODUCT_MATCHES_V1(%s, %s, @out); select @out";
         final String formatSql = String.format(sql, enUU, uu);
         success = jdbcTemplate.execute(new StatementCallback<Integer>() {
             @Override

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

@@ -952,7 +952,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 	public String publishByBatch(String batch) {
 		Enterprise enterprise = SystemSession.getUser().getEnterprise();
 		final Object[] obj = new Object[]{enterprise.getUu(), enterprise.getEnName(), batch};
-		String sql = "/*#mycat:db_type=master*/ set @enuu = %s; set @enName = '%s'; set @batch = '%s'; call RELEASE_TO_PRODUCT_TEST(@enuu, @enName, @batch, @out); select @out";
+		String sql = "/*#mycat:db_type=master*/ set @enuu = %s; set @enName = '%s'; set @batch = '%s'; call RELEASE_TO_PRODUCT_V1(@enuu, @enName, @batch, @out); select @out";
 		final String updateSql = String.format(sql, obj);
 		String num = jdbcTemplate.execute(new StatementCallback<String>() {