Merge branch 'feat-rsy' into 'master'

修改广告设置bug

See merge request rays/pcloud-book!188

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

@@ -100,7 +100,7 @@ public interface AdvertisingSpaceBiz {
      * @param adviserPermission 广告位编辑权限实体
      * @throws BizException
      */
-    void setAdviserPermission(AdvertisingAdviserPermission adviserPermission) throws BizException;
+    void setAdviserPermission(AdvertisingAdviserPermission adviserPermission, Long adviserId) throws BizException;
 
     /**
      * 编辑端获取书刊列表

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

@@ -832,13 +832,13 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
     @Override
     @Transactional(rollbackFor = Exception.class)
     @ParamLog(value = "设置编辑书刊权限", isAfterReturn = false)
-    public void setAdviserPermission(AdvertisingAdviserPermission adviserPermission) throws BizException {
+    public void setAdviserPermission(AdvertisingAdviserPermission adviserPermission, Long adviserId) throws BizException {
         if (null == adviserPermission.getAdviserId() || null == adviserPermission.getIsOpen()
                 || (!adviserPermission.getIsBatchOperation() && (null == adviserPermission.getBookId() || null == adviserPermission.getChannelId()))) {
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, "参数有误！");
         }
         Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("adviserId", adviserPermission.getAdviserId());
+        paramMap.put("adviserId", adviserId);
         if (!adviserPermission.getIsBatchOperation()) {
             paramMap.put("bookId", adviserPermission.getBookId());
             paramMap.put("channelId", adviserPermission.getChannelId());
@@ -860,9 +860,13 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                         if (null == permission) {
                             adviserPermission.setBookId(bookAndChannelDTO.getBookId());
                             adviserPermission.setChannelId(bookAndChannelDTO.getChannelId());
+                            adviserPermission.setAdviserId(adviserId);
                             advertisingAdviserPermissionDao.insert(adviserPermission);
                         } else {
                             adviserPermission.setId(permission.getId());
+                            adviserPermission.setChannelId(null);
+                            adviserPermission.setBookId(null);
+                            adviserPermission.setAdviserId(null);
                             advertisingAdviserPermissionDao.update(adviserPermission);
                         }
                     }

pcloud-service-book/src/main/java/com/pcloud/book/advertising/facade/impl/AdvertisingSpaceFacadeImpl.java

@@ -216,7 +216,7 @@ public class AdvertisingSpaceFacadeImpl implements AdvertisingSpaceFacade {
         if (null == advertisingAdviserPermission.getIsBatchOperation()) {
             advertisingAdviserPermission.setIsBatchOperation(false);
         }
-        advertisingSpaceBiz.setAdviserPermission(advertisingAdviserPermission);
+        advertisingSpaceBiz.setAdviserPermission(advertisingAdviserPermission, adviserId);
         return new ResponseDto<>();
     }