Merge branch 'fixbug1016144' into 'master'

fixbug1016144社群码导出加类型

See merge request rays/pcloud-book!226

pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/impl/GroupTagBizImpl.java

@@ -480,7 +480,7 @@ public class GroupTagBizImpl implements GroupTagBiz {
             List<String[]> qrcodePicUrls = new ArrayList<String[]>();
             Integer noName = 0;
             for (GroupTagDTO tagDTO : list) {
-                String qrcodeUrl = tagDTO.getQrcodeUrl() == null ? null : tagDTO.getQrcodeUrl().replace("oss.5rs.me", "file.5rs.me");
+                String qrcodeUrl = tagDTO.getQrcodeUrl() == null ? null : tagDTO.getQrcodeUrl().replace("//oss", "//file");
                 String qrcodeName;//二维码命名
                 if (!StringUtil.isEmpty(tagDTO.getGroupName())) {
                     qrcodeName = tagDTO.getGroupName();
@@ -529,9 +529,9 @@ public class GroupTagBizImpl implements GroupTagBiz {
             objs[11] = dto.getAdvertisingSpaceNum() == null ? 0 : dto.getAdvertisingSpaceNum();
             String qrcodeUrl = "";
             if (Integer.valueOf(2).equals(dto.getJoinGroupType()) && !StringUtil.isEmpty(dto.getCodeUrl())) {
-                qrcodeUrl = dto.getCodeUrl().replace("oss.5rs.me", "file.5rs.me");
+                qrcodeUrl = dto.getCodeUrl().replace("//oss", "//file");
             } else if (!StringUtil.isEmpty(dto.getQrcodeUrl())) {
-                qrcodeUrl = dto.getQrcodeUrl().replace("oss.5rs.me", "file.5rs.me");
+                qrcodeUrl = dto.getQrcodeUrl().replace("//oss", "//file");
             }
             objs[12] = qrcodeUrl;
             String brandName = "";
@@ -578,7 +578,7 @@ public class GroupTagBizImpl implements GroupTagBiz {
             objs[7] = dto.getUserNumber();
             String qrcodeUrl = "";
             if (!StringUtil.isEmpty(dto.getQrcodeUrl())) {
-                qrcodeUrl = dto.getQrcodeUrl().replace("oss.5rs.me", "file.5rs.me");
+                qrcodeUrl = dto.getQrcodeUrl().replace("//oss", "//file");
             }
             objs[8] = qrcodeUrl;
             objs[9] = DateUtils.formatDate(dto.getCreateTime(), DateUtils.DATE_FORMAT_DATEONLY);

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

@@ -1151,7 +1151,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
                     if (StringUtil.isEmpty(bookDto.getGroupQrcodeUrl())) {
                         continue;
                     }
-                    String qrcodeUrl = bookDto.getGroupQrcodeUrl().replace("oss.5rs.me", "file.5rs.me");
+                    String qrcodeUrl = bookDto.getGroupQrcodeUrl().replace("//oss", "//file");
                     String qrcodeName;
                     if (!StringUtil.isEmpty(bookName)) {
                         qrcodeName = bookName;

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/BookGroupFacade.java

@@ -259,6 +259,7 @@ public interface BookGroupFacade {
             @ApiImplicitParam(name = "bookId", value = "书籍标识", dataType = "int", paramType = "query"),
             @ApiImplicitParam(name = "startDate", value = "开始时间", dataType = "string", paramType = "query"),
             @ApiImplicitParam(name = "endDate", value = "结束时间", dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "joinGroupType", value = "类型", dataType = "int", paramType = "query")
     })
     @RequestMapping(value = "exportGroupQrcode4Adviser", method = RequestMethod.GET)
     ResponseDto<?> exportGroupQrcode4Adviser(@RequestHeader("token") String token,
@@ -271,7 +272,8 @@ public interface BookGroupFacade {
                                                 @RequestParam(value = "isFundSupport", required = false) Integer isFundSupport,
                                                 @RequestParam(value = "bookId", required = false) Integer bookId,
                                                 @RequestParam(value = "startDate", required = false) String startDate,
-                                                @RequestParam(value = "endDate", required = false) String endDate)
+                                                @RequestParam(value = "endDate", required = false) String endDate,
+                                             @RequestParam(value = "joinGroupType", required = false) Integer joinGroupType)
             throws BizException, PermissionException;
 
     @ApiOperation("根据bookId获取社群书分类等统计")

pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/BookGroupFacadeImpl.java

@@ -8,18 +8,9 @@ import com.pcloud.book.group.entity.BookGroup;
 import com.pcloud.book.group.entity.BookGroupClassify;
 import com.pcloud.book.group.entity.BookGroupServe;
 import com.pcloud.book.group.facade.BookGroupFacade;
-import com.pcloud.book.group.vo.FriendsVO;
-import com.pcloud.book.group.vo.GroupIncomeStaticParamVO;
-import com.pcloud.book.group.vo.GroupScanTrendParamVO;
-import com.pcloud.book.group.vo.GroupScanTrendVO;
-import com.pcloud.book.group.vo.GroupStatisticVO;
-import com.pcloud.book.group.vo.ListBookGroup4ChannelParamVO;
-import com.pcloud.book.group.vo.ResourcesStatisticVO;
-import com.pcloud.book.group.vo.TotalRescourceDataVO;
-import com.pcloud.book.group.vo.UpdateRankTypeVO;
-import com.pcloud.book.group.vo.WxGroupStatisticVO;
 import com.pcloud.book.group.vo.BookGroupAnalysisParam;
 import com.pcloud.book.group.vo.BookGroupAnalysisVO;
+import com.pcloud.book.group.vo.FriendsVO;
 import com.pcloud.book.group.vo.GroupIncomeStaticParamVO;
 import com.pcloud.book.group.vo.GroupScanTrendParamVO;
 import com.pcloud.book.group.vo.GroupScanTrendVO;
@@ -38,7 +29,6 @@ import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.SessionUtil;
 import com.pcloud.common.utils.cookie.Cookie;
 import com.pcloud.common.utils.string.StringUtil;
-
 import com.pcloud.wechatgroup.message.enums.IsSystem;
 
 import org.codehaus.jackson.JsonParseException;
@@ -351,8 +341,9 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
                                                     @RequestParam(value = "isFundSupport", required = false) Integer isFundSupport,
                                                     @RequestParam(value = "bookId", required = false) Integer bookId,
                                                     @RequestParam(value = "startDate", required = false) String startDate,
-                                                    @RequestParam(value = "endDate", required = false) String endDate)
-            throws BizException, PermissionException{
+                                                    @RequestParam(value = "endDate", required = false) String endDate,
+                                                    @RequestParam(value = "joinGroupType", required = false) Integer joinGroupType)
+            throws BizException, PermissionException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("adviserId", adviserId);
@@ -368,6 +359,7 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
             paramMap.put("startDate", startDate + " 00:00:00");
             paramMap.put("endDate", endDate + " 23:59:59");
         }
+        paramMap.put("joinGroupType", joinGroupType);
         bookGroupBiz.exportGroupQrcode4Adviser(paramMap, adviserId);
         return new ResponseDto<>();
     }

pcloud-service-book/src/main/java/com/pcloud/book/group/set/GroupSet.java

@@ -315,7 +315,7 @@ public class GroupSet {
             objs[20] = analysisVO.getSaleAmount();
             objs[21] = analysisVO.getAvgSaleAmount();
             objs[22] = analysisVO.getIsCopyright() ? "是" : "否";
-            objs[23] = analysisVO.getGroupQrcodeUrl().replace("oss.5rs.me", "file.5rs.me");
+            objs[23] = analysisVO.getGroupQrcodeUrl().replace("//oss", "//file");
             dataList.add(objs);
         }
         String fileUrl = exportConsr.exportExcel(fileName, rowsName, dataList);

pcloud-service-book/src/main/java/com/pcloud/book/group/tools/QrcodeTools.java

@@ -145,7 +145,7 @@ public class QrcodeTools {
      */
     public static String ossToFile(String newUrl) {
         if(!StringUtil.isEmpty(newUrl)){
-            newUrl = newUrl.replace("oss.5rs.me","file.5rs.me");
+            newUrl = newUrl.replace("//oss","//file");
         }
         return newUrl;
     }