Merge branch 'fixbug-rsy' into 'master'

配置资源自动上架

See merge request rays/pcloud-book!242

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java

@@ -2175,6 +2175,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, "参数错误！");
         }
         AccountSettingDto accountSettingDto = qrcodeSceneConsr.getWechatInfo(dto.getChannelId());
+        List<Long> productIds = new ArrayList<>();
         for (BookGroupServe bookGroupServe : bookGroupServes) {
             if ("APP".equalsIgnoreCase(bookGroupServe.getServeType())) {
                 AppDto appDto = appConsr.getBaseById(bookGroupServe.getServeId());
@@ -2189,8 +2190,15 @@ public class BookGroupBizImpl implements BookGroupBiz {
             String resultUrl=UrlUtils.getShortUrl4Own(linkUrl);
             bookGroupServe.setShortUrl(resultUrl);
             bookGroupServe.setCreateUser(partyId);
+            if ("PRODUCT".equalsIgnoreCase(bookGroupServe.getServeType())) {
+                productIds.add(bookGroupServe.getServeId());
+            }
         }
         bookGroupServeDao.batchInsert(bookGroupServes);
+        if (!ListUtils.isEmpty(productIds)){
+            //自动上架
+            productConsr.productAutoOnShelves(dto.getChannelId(), productIds);
+        }
     }
 
     @ParamLog("删除资源配置")