Merge branch 'master' of http://192.168.89.173/rays/pcloud-common-parent.git

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/ProductTypeConstant.java

@@ -214,6 +214,12 @@ public class ProductTypeConstant {
             FORMAT, WORD, ARTICLE, LISTEN, SCHEDULE, PBMUSIC, TUTORIAL, VIDEO_SCHEDULE};
 
     /**
+     * 参与促销激励作品
+     */
+    public static final String[] PROMOTION_PRODUCT = {AUDIO, VIDEO, PDF, EBOOK, ALBUM, PRETEST, QANEWS,
+            FORMAT, WORD, ARTICLE, LISTEN, PBMUSIC, TUTORIAL, COMMON, QA, BOOK, MATCH, NUMBER, REVIEW, TOOL, QS};
+
+    /**
      * 服务型作品（需要特殊操作方可完成使用）
      */
     public static final String[] SERVICE_PRODUCT = {COMMON, QA, BOOK, MATCH, NUMBER, MEMBER, REVIEW, TOOL, QS, THIRDPARTY};

pcloud-common/src/main/java/com/pcloud/common/page/PageBeanNew.java

@@ -5,6 +5,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.springframework.util.CollectionUtils;
+
+import com.pcloud.common.utils.BeanUtils;
+
 public class PageBeanNew<T> implements Serializable {
     private static final long serialVersionUID = -1698628566020108251L;
     // 指定的或是页面参数
@@ -185,7 +189,19 @@ public class PageBeanNew<T> implements Serializable {
     public void setCountResultMap(Map<String, Object> countResultMap) {
         this.countResultMap = countResultMap;
     }
-
+    
+    public static <T>  PageBeanNew<T> pegeBeanCopy(PageBeanNew<?> source,Class<T> clazz){
+    	PageBeanNew<T> pageBeanNew = new PageBeanNew<>();
+    	if(null==source||CollectionUtils.isEmpty(source.getRecordList())){
+    		return pageBeanNew;
+    	}
+    	BeanUtils.copyProperties(source, pageBeanNew);
+    	List<T> arrayList = new ArrayList<>();
+    	BeanUtils.copyListProperties(source.getRecordList(), arrayList, clazz);
+    	pageBeanNew.setRecordList(arrayList);
+    	return pageBeanNew;	
+    }
+        
     @Override
     public String toString() {
         return "PageBeanNew [currentPage=" + currentPage + ", numPerPage=" + numPerPage + ", totalCount=" + totalCount + ", recordList=" + recordList + ", pageCount=" + pageCount + ", beginPageIndex="