Merge branch 'dx-updateqrcode' into 'master'

同步更新个人二维码

See merge request rays/pcloud-book!100

pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/PersonalQrcodeDTO.java

+package com.pcloud.book.group.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author 戴兴
+ * @description TODO
+ * @date 2019/8/7 17:13
+ */
+public class PersonalQrcodeDTO implements Serializable {
+
+    private String newQrcodeUrl;
+
+    private String oldQrcodeUrl;
+
+    public String getNewQrcodeUrl() {
+        return newQrcodeUrl;
+    }
+
+    public void setNewQrcodeUrl(String newQrcodeUrl) {
+        this.newQrcodeUrl = newQrcodeUrl;
+    }
+
+    public String getOldQrcodeUrl() {
+        return oldQrcodeUrl;
+    }
+
+    public void setOldQrcodeUrl(String oldQrcodeUrl) {
+        this.oldQrcodeUrl = oldQrcodeUrl;
+    }
+
+    @Override
+    public String toString() {
+        return "PersonalQrcodeDTO{" +
+                "newQrcodeUrl='" + newQrcodeUrl + '\'' +
+                ", oldQrcodeUrl='" + oldQrcodeUrl + '\'' +
+                '}';
+    }
+}
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package com.pcloud.book.group.service;
 import java.util.List;
 import java.util.Map;
 
+import com.pcloud.book.group.dto.PersonalQrcodeDTO;
 import com.pcloud.book.group.dto.GroupCipherDTO;
 import com.pcloud.book.group.dto.GroupUseDTO;
 import org.springframework.cloud.netflix.feign.FeignClient;
@@ -51,6 +52,10 @@ public interface BookGroupService {
     @RequestMapping(value = "getBaseInfoBySceneId",method = RequestMethod.GET)
     ResponseEntity<ResponseDto<BookGroupDTO>> getBaseInfoBySceneId(@RequestParam("sceneId")Long sceneId) throws BizException;
 
+    @ApiOperation("更新个人二维码")
+    @RequestMapping(value = "updatePersonQrcode",method = RequestMethod.POST)
+    void updatePersonQrcode(@RequestBody PersonalQrcodeDTO personalQrcodeDTO) throws BizException;
+
     @ApiOperation("获取暗号状态")
     @GetMapping("/getCipherState")
     ResponseEntity<ResponseDto<Integer>> getCipherState(@RequestParam("cipher")String cipher) throws BizException;
@@ -66,4 +71,5 @@ public interface BookGroupService {
     @ApiOperation("获取暗号基本信息")
     @GetMapping("/getJoinGroupCipher")
     ResponseEntity<ResponseDto<GroupCipherDTO>> getJoinGroupCipher(@RequestParam("cipher")String cipher) throws BizException;
+
 }

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

@@ -207,6 +207,13 @@ public interface BookGroupBiz {
     BookGroupDTO getBaseInfoBySceneId(Long sceneId);
 
     /**
+    * @description 更新个人二维码
+    * @author 戴兴
+    * @date 2019/8/7 16:30
+    */
+    void updatePersonQrcode(PersonalQrcodeDTO personalQrcodeDTO);
+
+    /**
      * @Author:lili
      * @Desr:是否是特殊的出版社
      * @Date:2019/5/28 11:14

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

@@ -34,12 +34,7 @@ import com.pcloud.book.group.dao.AppClickRecordDao;
 import com.pcloud.book.group.dao.AppTouchRecordDao;
 import com.pcloud.book.group.dao.BookGroupClassifyDao;
 import com.pcloud.book.group.dao.BookGroupDao;
-import com.pcloud.book.group.dto.AppStatisticsDTO;
-import com.pcloud.book.group.dto.BookGroupDTO;
-import com.pcloud.book.group.dto.BookGroupStatisticDTO;
-import com.pcloud.book.group.dto.ClassifyKeywordDTO;
-import com.pcloud.book.group.dto.GroupStoreMyPayDto;
-import com.pcloud.book.group.dto.QrcodeNameAndProIdDTO;
+import com.pcloud.book.group.dto.*;
 import com.pcloud.book.group.entity.BookGroup;
 import com.pcloud.book.group.vo.*;
 import com.pcloud.book.keywords.dao.BookKeywordDao;
@@ -650,6 +645,15 @@ public class BookGroupBizImpl implements BookGroupBiz {
     }
 
     @Override
+    public void updatePersonQrcode(PersonalQrcodeDTO personalQrcodeDTO) {
+        if (personalQrcodeDTO == null || personalQrcodeDTO.getNewQrcodeUrl() == null ||
+                personalQrcodeDTO.getOldQrcodeUrl() == null){
+            throw new BookBizException(BookBizException.ERROR,"参数缺失");
+        }
+        bookGroupDao.updatePersonQrcode(personalQrcodeDTO);
+    }
+
+    @Override
     @ParamLog("是否是特殊的出版社")
     public Boolean isSpecialAgent(Long agentId) {
         return bookGroupDao.isSpecialAgent(agentId);

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/BookGroupDao.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.pcloud.book.group.dto.BookGroupDTO;
+import com.pcloud.book.group.dto.PersonalQrcodeDTO;
 import com.pcloud.book.group.dto.QrcodeNameAndProIdDTO;
 import com.pcloud.book.group.entity.BookGroup;
 import com.pcloud.common.core.dao.BaseDao;
@@ -120,6 +121,13 @@ public interface BookGroupDao extends BaseDao<BookGroup> {
     Boolean isSpecialAgent(Long agentId);
 
     /**
+    * @description 更新个人二维码
+    * @author 戴兴
+    * @date 2019/8/7 16:49
+    */
+    void updatePersonQrcode(PersonalQrcodeDTO personalQrcodeDTO);
+
+    /**
      * 获取社群书基本信息(包括书籍封面isbn号)
      * @param paramMap
      * @return

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/BookGroupDaoImpl.java

@@ -3,6 +3,8 @@ package com.pcloud.book.group.dao.impl;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.pcloud.book.group.dto.PersonalQrcodeDTO;
 import org.springframework.stereotype.Repository;
 import com.pcloud.book.group.dao.BookGroupDao;
 import com.pcloud.book.group.dto.BookGroupDTO;
@@ -124,6 +126,14 @@ public class BookGroupDaoImpl extends BaseDaoImpl<BookGroup> implements BookGrou
     }
 
     @Override
+    public void updatePersonQrcode(PersonalQrcodeDTO personalQrcodeDTO) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("newQrcodeUrl",personalQrcodeDTO.getNewQrcodeUrl());
+        map.put("oldQrcodeUrl",personalQrcodeDTO.getOldQrcodeUrl());
+        this.getSqlSession().update(this.getStatement("updatePersonQrcode"), map);
+    }
+
+    @Override
     public List<BookGroupDTO> getBookInfoByIdsWithBookClockInfoId(Map<String,Object> paramMap) {
         return this.getSqlSession().selectList(this.getStatement("getBookInfoByIdsWithBookClockInfoId"), paramMap);
     }

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

@@ -3,6 +3,8 @@ package com.pcloud.book.group.service.impl;
 import java.util.List;
 import java.util.Map;
 
+
+import com.pcloud.book.group.dto.PersonalQrcodeDTO;
 import com.pcloud.book.group.dto.GroupCipherDTO;
 import com.pcloud.book.group.dto.GroupUseDTO;
 import io.swagger.annotations.ApiOperation;
@@ -85,6 +87,13 @@ public class BookGroupServiceImpl implements BookGroupService {
         return ResponseHandleUtil.toResponse(bookGroupBiz.getBaseInfoBySceneId(sceneId));
     }
 
+
+    @Override
+    @RequestMapping(value = "updatePersonQrcode",method = RequestMethod.POST)
+    public void updatePersonQrcode(@RequestBody PersonalQrcodeDTO personalQrcodeDTO) throws BizException {
+        bookGroupBiz.updatePersonQrcode(personalQrcodeDTO);
+    }
+
     /**
      * 获取暗号状态
      */

pcloud-service-book/src/main/resources/mapper/group/BookGroupMapper.xml

@@ -299,6 +299,10 @@
         where agent_id = #{_parameter}
     </select>
 
+    <update id="updatePersonQrcode" parameterType="map">
+        update book_group set personal_qrcode_url = #{newQrcodeUrl} where personal_qrcode_url = #{oldQrcodeUrl}
+    </update>
+
     <!--获取社群码基本信息(包括书籍信息,及BookClockInfoId)-->
     <select id="getBookInfoByIdsWithBookClockInfoId" parameterType="map" resultMap="BookGroupDTO">
         SELECT