Merge branch 'feature/1009456' into 'master'

feat: [1009456]

See merge request rays/pcloud-book!1728

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookBiz.java

@@ -858,4 +858,9 @@ public interface BookBiz {
 	MoFangSceneVO getMoFangScene(Long sceneId);
 
 	List<Long> getMoFangBookIds(Long mofangId);
+
+	/**
+	 * 魔方新华书店列表
+	 */
+	PageBeanNew<MoFangBookStoreDto> listBookStore(String keyWords, Integer currentPage, Integer numPerPage, Integer type, String ip);
 }

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

@@ -108,6 +108,7 @@ import com.pcloud.book.book.vo.BookSaleVO;
 import com.pcloud.book.book.vo.ListNoAuthBookParam;
 import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
 import com.pcloud.book.book.vo.MoFangBookDto;
+import com.pcloud.book.book.vo.MoFangBookStoreDto;
 import com.pcloud.book.book.vo.MoFangSceneVO;
 import com.pcloud.book.book.vo.SearchBookVO;
 import com.pcloud.book.book.vo.ZouMuBaiVO;
@@ -159,6 +160,8 @@ import com.pcloud.book.group.entity.BookGroupServe;
 import com.pcloud.book.group.enums.JoinGroupTypeEnum;
 import com.pcloud.book.mq.producer.BookMQProducer;
 import com.pcloud.book.mq.producer.UpdateSuperSearchProducer;
+import com.pcloud.book.record.biz.BookBrowseRecordBiz;
+import com.pcloud.book.record.entity.BookBrowseRecord;
 import com.pcloud.book.rightsSetting.constants.RightsSettingConstant;
 import com.pcloud.book.rightsSetting.dao.RightsNowItemDao;
 import com.pcloud.book.rightsSetting.mapper.RightsSettingBookRelationMapper;
@@ -189,8 +192,10 @@ import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.DateUtils;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.NumberUtil;
+import com.pcloud.common.utils.RequestContextHolderUtil;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
+import com.pcloud.common.utils.nginx.NginxUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.commoncenter.export.dto.ExportDto;
 import com.pcloud.commoncenter.export.dto.ExportSheetDto;
@@ -400,6 +405,8 @@ public class BookBizImpl implements BookBiz {
     private BookElasticSearchConsr bookElasticSearchConsr;
     @Autowired
     private BookConsr bookConsr;
+    @Autowired
+    private BookBrowseRecordBiz bookBrowseRecordBiz;
 
     private static final List<Integer> zouMuBaiTypeList = CollUtil.toList(3,4);
 
@@ -4929,4 +4936,23 @@ public class BookBizImpl implements BookBiz {
         }
         return new ArrayList<>();
     }
+
+    /**
+     * 魔方新华书店列表
+     */
+    @Override
+    public PageBeanNew<MoFangBookStoreDto> listBookStore(String keyWords, Integer currentPage, Integer numPerPage, Integer type, String ip) {
+        String clientIp =StrUtil.isNotBlank(ip) ? ip : NginxUtils.getXRealIp(RequestContextHolderUtil.getRequest());
+        BookBrowseRecord cityByIP = bookBrowseRecordBiz.getCityByIP(clientIp);
+        String cityId = Optional.ofNullable(cityByIP).map(BookBrowseRecord::getCityCode).orElse(null);
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("keyWords",StrUtil.isBlank(keyWords) ? null : keyWords.trim());
+        paramMap.put("type",type);
+        paramMap.put("cityId",StrUtil.isBlank(cityId) ? "null" : cityId.trim());
+        PageBeanNew<MoFangBookStoreDto> listPageNew = bookDao.listPageNew(new PageParam(currentPage, numPerPage), paramMap, "listBookStore");
+        if (listPageNew == null || ListUtils.isEmpty(listPageNew.getRecordList())) {
+            return new PageBeanNew<>(currentPage,numPerPage,null==listPageNew ? 0 : listPageNew.getTotalCount(),new ArrayList<>());
+        }
+        return listPageNew;
+    }
 }

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

@@ -50,7 +50,6 @@ import com.pcloud.wechatgroup.message.enums.IsSystem;
 
 import org.codehaus.jackson.JsonParseException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -1592,4 +1591,17 @@ public class BookFacadeImpl implements BookFacade {
         return new ResponseDto<>(bookBiz.getMoFangScene(sceneId));
     }
 
+    /**
+     * 魔方新华书店列表
+     */
+    @RequestMapping(value = "listBookStore", method = RequestMethod.GET)
+    public ResponseDto<?> listBookStore(@RequestParam(value = "keyWords", required = false) String keyWords,
+                                        @RequestParam(value = "type", required = false) Integer type,
+                                        @RequestParam(value = "ip", required = false) String ip,
+                                        @RequestParam(value = "currentPage", required = false) Integer currentPage,
+                                        @RequestParam(value = "numPerPage", required = false) Integer numPerPage)
+            throws BizException, PermissionException {
+        return new ResponseDto<>(bookBiz.listBookStore(keyWords, currentPage, numPerPage, type, ip));
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/vo/MoFangBookStoreDto.java

+/**
+ *
+ */
+package com.pcloud.book.book.vo;
+
+import com.pcloud.channelcenter.qrcode.dto.QrcodeSceneDto;
+import com.pcloud.common.dto.BaseDto;
+
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * 魔方新华书店
+ */
+@Data
+public class MoFangBookStoreDto extends BaseDto {
+
+    private static final long serialVersionUID = -162839217433038629L;
+
+
+    private String bookStoreName;
+
+    private Long id;
+
+    private String address;
+
+    private String linkUrl;
+
+    private Integer checked;
+}

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -3516,4 +3516,19 @@
 		from mofang_zmb
 		where mofang_id = #{mofangId}
 	</select>
+
+	<select id="listBookStore" resultType="com.pcloud.book.book.vo.MoFangBookStoreDto">
+		select
+		id id,
+		book_store_name bookStoreName,
+		address address,
+        link_url linkUrl,
+		if(city_id=${cityId},1,0) checked
+		from mofang_xinhua_store
+		where 1=1
+		<if test="keyWords !=null">
+			and book_store_name like concat('%',#{keyWords},'%')
+		</if>
+		ORDER BY checked DESC,id ASC
+	</select>
 </mapper>