Merge branch 'customer_service_SZlu'

src/main/java/com/yaoyaozw/customer/controller/CustomerDelayGraphicsController.java

@@ -71,8 +71,9 @@ public class CustomerDelayGraphicsController {
     public BaseResult copy(@RequestParam String appId,
                            @RequestParam(required = false) String bookId,
                            @RequestParam(required = false) String bookName,
+                           @RequestParam(required = false) Integer chapterIdx,
                            @RequestBody List<String> targetAppList) {
-        return customerGraphicsDelayService.copy(appId, bookId, bookName, targetAppList);
+        return customerGraphicsDelayService.copy(appId, bookId, bookName, chapterIdx, targetAppList);
     }
 
     @ApiOperation("所有公众号")

src/main/java/com/yaoyaozw/customer/service/CustomerGraphicsDelayService.java

@@ -90,10 +90,11 @@ public interface CustomerGraphicsDelayService extends IService<CustomerGraphicsD
      * @param appId         应用程序id
      * @param bookId 选择目标书
      * @param bookName 书名
+     * @param chapterIdx 章节
      * @param targetAppList 目标应用程序列表
      * @return {@link BaseResult}
      */
-    BaseResult copy(String appId, String bookId, String bookName, List<String> targetAppList);
+    BaseResult copy(String appId, String bookId, String bookName, Integer chapterIdx, List<String> targetAppList);
 
     /**
      * 获得认证列表

src/main/java/com/yaoyaozw/customer/service/impl/CustomerGraphicsDelayServiceImpl.java

@@ -238,7 +238,7 @@ public class CustomerGraphicsDelayServiceImpl extends ServiceImpl<CustomerGraphi
     }
 
     @Override
-    public BaseResult copy(String appId, String bookId, String bookName, List<String> targetAppList) {
+    public BaseResult copy(String appId, String bookId, String bookName, Integer chapterIdx, List<String> targetAppList) {
         List<AuthorizerInfo> authorizerInfoList = authorizerInfoService.list();
         Map<String, AuthorizerInfo> authMap = authorizerInfoList.stream().collect(Collectors.toMap(AuthorizerInfo::getAppid, Function.identity()));
 
@@ -258,9 +258,13 @@ public class CustomerGraphicsDelayServiceImpl extends ServiceImpl<CustomerGraphi
         Stream<ReferralEntity> stream = referralEntityList.stream();
         if (StringUtil.isNotBlank(bookId)) {
             stream = stream.peek(item -> {
-                if (StringUtil.isNotBlank(item.getBookId())) {
+                // 选了书，将推广类型的链接书籍换成选择的书籍
+                if (StringUtil.isNotBlank(item.getBookId()) && CustomerCommonConstant.BOOK_NEWS_TYPE.equals(item.getNewsType())) {
                     item.setBookId(bookId);
                     item.setBookName(bookName);
+                    if (ObjectUtil.isNotNull(chapterIdx)) {
+                        item.setChapterIdx(chapterIdx);
+                    }
                 }
             });
         }

src/main/java/com/yaoyaozw/customer/vo/customer/CustomerMessageListVO.java

@@ -41,6 +41,9 @@ public class CustomerMessageListVO implements Serializable {
     @ApiModelProperty("人数")
     private Integer peopleNum;
 
+    @ApiModelProperty("人数")
+    private Integer sendNum;
+
     @ApiModelProperty("发送状态值")
     private Integer sendStatus;
 

src/main/resources/application-dev.yml

@@ -18,6 +18,7 @@ mybatis-plus:
     call-setters-on-nulls: true
     jdbc-type-for-null: 'null'
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
 logging:
   level:
     com.example.material.mapper: debug

src/main/resources/mapper/CustomerGraphicsMapper.xml

@@ -28,6 +28,7 @@
         cg.post_time as postTime,
         cg.extend_title as extendTitle,
         cg.send_status as sendStatus,
+        cg.send_num as sendNum,
         dic.dic_value as sendStatusStr,
         cpm.id as packId,
         cpm.package_name as packName,