java/zhihuishenqu.git

			@@ -5,18 +5,33 @@
			import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
			import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
			import com.panzhihua.common.model.dtos.community.*;
			import com.panzhihua.common.model.dtos.neighbor.*;
			import com.panzhihua.common.model.dtos.neighbor.*;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
			import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
			import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
			import com.panzhihua.common.model.dtos.shop.*;
			import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
			import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
			import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
			import com.panzhihua.common.model.vos.R;
			import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
			import com.panzhihua.common.model.vos.community.*;
			import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
			import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
			import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
			import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
			import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
			import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
			import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
			import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
			import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
			import com.panzhihua.common.model.vos.shop.ShopStoreVO;
			import com.panzhihua.common.model.vos.user.UserPhoneVO;
			import org.springframework.cloud.openfeign.FeignClient;
			import org.springframework.transaction.annotation.Transactional;
			import org.springframework.web.bind.annotation.*;

			import java.util.List;
			@@ -421,6 +436,15 @@
			R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO);

			/**
			* 获取志愿者详情
			*
			* @param id 志愿者信息
			* @return 增加结果
			*/
			@GetMapping("getVolunteerById")
			R getVolunteerById(@RequestParam("id")Long id);

			/**
			* 增加志愿者
			*
			* @param comMngVolunteerMngVO 志愿者信息
			@@ -727,6 +751,15 @@
			*/
			@PostMapping("timedtaskactactivityall")
			R timedTaskActActivityAll();


			/**
			* 定时任务刷新社区活动的各个状态除取消外
			*
			* @return
			*/
			@PostMapping("timedtaskactmicrowishall")
			R timedTaskActMicroWishAll();

			/**
			* 其他建筑详情
			@@ -1599,6 +1632,15 @@
			R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);

			/**
			* 确认导入实有人口（有则更新，无则新建）
			* @param list 用户信息
			* @param communityId 社区id
			* @return 导入结果
			*/
			@PostMapping("/common/data/population/import/confirm")
			R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);

			/**
			* 分页查询实有人口
			*
			* @param comMngPopulationVO 查询参数
			@@ -1615,6 +1657,15 @@
			*/
			@PostMapping("/common/data/population/detail")
			R detailPopulation(@RequestParam(value = "populationId") Long populationId);

			/**
			* 根据id查询实有人口电子档案信息
			* @param populationId 实有人口id
			* @return 实有人口电子档信息
			*/
			@PostMapping("/common/data/population/electronicArchives")
			R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId);


			/**
			* 根据id修改实有人口标签列表
			@@ -1773,6 +1824,13 @@
			@PostMapping("/shop/saveStore")
			R saveStore(@RequestBody ShopStoreVO storeVO);

			/**
			* 新增店铺
			* @param storeVO 店铺信息
			* @return 新增结果
			*/
			@PostMapping("/shop/addStore")
			R addStore(@RequestBody ShopStoreVO storeVO);

			/**
			* 编辑店铺、启用、禁用
			@@ -1796,6 +1854,45 @@
			@GetMapping("/shop/getStoreInfo")
			R getStoreInfo(@RequestParam("id")Long id);


			/**
			* 商品列表-分页查询
			* @param pageComShopGoodsDTO 添加数据
			*/
			@PostMapping("/shop/pageGoods")
			R pageGoodsList(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO);

			/**
			* 新增商品
			* @param addShopGoodsVO
			* @return
			*/
			@PostMapping("/shop/saveShopGoods")
			R saveShopGoods(@RequestBody AddShopGoodsVO addShopGoodsVO);

			/**
			* 编辑商品
			* @param id
			* @param addShopGoodsVO
			* @return
			*/
			@PostMapping("/shop/editShopGoods/{id}")
			R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO);

			/**
			* 删除商品
			* @param id
			* @return
			*/
			@PostMapping("/shop/deleteShopGoods")
			R deleteShopGoods(@RequestBody Long[] id);
			/**
			* 修改商品状态
			* @param id
			* @return
			*/
			@GetMapping("/shop/changeShopGoodsStatus")
			R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status);
			/**
			* 结果
			* @param shopOperlog 商城后台操作日志
			@@ -1812,10 +1909,514 @@
			R pageShopOperLog(@RequestBody PageDTO pageDTO);

			/**
			* 分页查询商家后台操作日志
			* 订单分页查询
			* @param pageComShopOrderSearchDTO 分页数据
			* @return 分页日志
			* @return 订单分页查询
			*/
			@PostMapping("/shop/order/page")
			R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
			/**
			* 分页查询店铺列表
			* @param comShopStoreDTO 请求参数
			* @return 店铺列表
			*/
			@PostMapping("/shop/pageShopStore")
			R pageShopStore(@RequestBody PageComShopStoreDTO comShopStoreDTO);

			/**
			* 根据id查询店铺详情
			* @param comShopStoreDTO 请求参数
			* @return 店铺详情
			*/
			@PostMapping("/shop/shopStoreDetail")
			R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO);

			/**
			* 分页查询商品列表
			* @param comShopGoodsDTO 请求参数
			* @return 商品列表
			*/
			@PostMapping("/shop/pageShopGoods")
			R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO);

			/**
			* 根据商品id查询商品信息
			* @param goodsId 商品id
			* @return 商品信息
			*/
			@PostMapping("/shop/shopGoodsDetail")
			R shopGoodsDetail(@RequestParam("goodsId") Long goodsId);

			/**
			* 查询用户购物车列表
			* @param userId 用户id
			* @return 购物车列表
			*/
			@PostMapping("/shop/shopCartList")
			R shopCartList(@RequestParam("userId") Long userId);

			/**
			* 查询用户购物车数量
			* @param userId 用户id
			* @return 用户购物车商品数量
			*/
			@PostMapping("/shop/shopCartUserTotal")
			R shopCartUserTotal(@RequestParam("userId") Long userId);

			/**
			* 购物车添加
			* @param comShopCartDTO 请求参数
			* @return 购物车列表
			*/
			@PostMapping("/shop/shopAddCart")
			R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO);

			/**
			* 购物车内商品数量修改
			* @param shopEditNubCartDTO 请求参数
			* @return 修改结果
			*/
			@PostMapping("/shop/shopEditNubCart")
			R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO);

			/**
			* 删除购物车记录
			* @param Ids 购物车id集合
			* @return 删除结果
			*/
			@PostMapping("/shop/shopDelCart")
			R shopDelCart(@RequestBody List<Long> Ids);

			/**
			* 分页查询用户收货地址列表
			* @param comShopAddressDTO 请求参数
			* @return 用户收货地址列表
			*/
			@PostMapping("/shop/shopUserAddressList")
			R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);

			/**
			* 用户添加收货地址
			* @param comShopAddressDTO 请求参数
			* @return 添加结果
			*/
			@PostMapping("/shop/shopAddUserAddress")
			R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

			/**
			* 用户修改收货地址
			* @param comShopAddressDTO 请求参数
			* @return 修改结果
			*/
			@PostMapping("/shop/shopEditUserAddress")
			R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

			/**
			* 用户删除收货地址
			* @param addressId 收货地址id
			* @return 删除结果
			*/
			@PostMapping("/shop/shopDelUserAddress")
			R shopDelUserAddress(@RequestParam("addressId") Long addressId);

			/**
			* 订单预览
			* @param orderPreviewDTO 请求参数
			* @return 订单预览数据
			*/
			@PostMapping("/shop/orderPreview")
			R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);

			/**
			* 创建订单
			* @param orderCreateDTO 创建订单请求参数
			* @return 创建结果
			*/
			@PostMapping("/shop/orderCreate")
			R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO);

			/**
			* 分页查询用户订单列表
			* @param comOrderListDTO 请求参数
			* @return 查询结果
			*/
			@PostMapping("/shop/pageOrderList")
			R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO);

			/**
			* 根据订单id查询订单详情
			* @param orderId 订单id
			* @return 订单详情
			*/
			@PostMapping("/shop/orderDetail")
			R orderDetail(@RequestParam("orderId") Long orderId);

			/**
			* 根据订单id取消订单
			* @param comShopOrderQueryDTO 请求参数
			* @return 取消结果
			*/
			@PostMapping("/shop/orderCancel")
			R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

			/**
			* 根据订单id删除订单
			* @param orderId 订单id
			* @return 删除结果
			*/
			@PostMapping("/shop/orderDelete")
			R orderDelete(@RequestParam("orderId") Long orderId);

			/**
			* 根据订单id确认收货
			* @param comShopOrderQueryDTO 请求参数
			* @return 确认结果
			*/
			@PostMapping("/shop/orderConfirm")
			R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

			/**
			* 统计用户订单数量
			* @param userId 用户id
			* @return 统计结果
			*/
			@PostMapping("/shop/orderStatistics")
			R orderStatistics(@RequestParam("userId") Long userId);

			/**
			* 商家资金的订单详情
			* @param id
			* @return
			*/
			@GetMapping("/shop/capitalDetailByStore")
			R capitalDetailByStore(@RequestParam("id") Long id);


			/**
			* 订单发货
			* @param orderShipDTO 商城订单发货信息
			* @return 发货结果
			*/
			@PostMapping("/shop/shipOrder")
			R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO);

			/**
			* 订单配送
			* @param deliverDTO 订单信息
			* @return 配送结果
			*/
			@PostMapping("/shop/deliverOrder")
			R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);

			/**
			* 订单完成配送
			* @param deliverDTO 订单信息
			* @return 配送完成结果
			*/
			@PostMapping("/shop/finishDeliverOrder")
			R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);

			/**
			* 获取用户商户详情
			* @param userId 用户ID
			*/
			@GetMapping("/shop/getUserStoreInfo")
			R getUserStoreInfo(@RequestParam("userId") Long userId);

			/**
			* 获取用户商户详情
			* @param account 用户账号
			*/
			@GetMapping("/shop/getUserStoreInfoByAccount")
			R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account);

			/**
			* 订单导出信息
			* @param comShopOrderExportDTO 订单导出信息
			* @return 订单导出信息
			*/
			@PostMapping("/shop/shopOrderExportData")
			R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO);

			/**
			* 资金管理导出信息
			* @param comShopFundsExportDTO 资金管理导出信息
			* @return 资金管理导出信息
			*/
			@PostMapping("/shop/shopOrderFundsExportData")
			R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO );

			/**
			* 店铺资金统计信息
			* @param userId 用户ID
			* @return 店铺资金统计信息
			*/
			@GetMapping("/shop/getFundsStat")
			R getFundsStat(@RequestParam("userId") Long userId);

			/**
			* 店铺资金统计信息
			* @param pageComShopFundsSearchDTO 店铺资金
			* @return 店铺资金统计信息
			*/
			@PostMapping("/shop/pageShopFunds")
			R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO);

			/**
			* 微信支付订单回调
			* @param wxPayNotifyOrderDTO 订单支付回调参数
			*/
			@PostMapping("/shop/wxOrderPayNotify")
			void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);

			/**
			* 点击去支付订单
			* @param orderPayDTO 请求参数
			* @return 支付对象
			*/
			@PostMapping("/shop/wxPay")
			R wxPay(@RequestBody OrderPayDTO orderPayDTO);

			/**
			* 编辑实有人口
			* @param editComMngPopulationVO
			* @return
			*/
			@PostMapping("/common/data/population/edit")
			R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO, @RequestParam("communityId") Long communityId);

			/**
			* 微心愿删除
			* @param id 微心愿id
			*/
			@PostMapping("deletemicrowish")
			R deletemicrowish(@RequestParam("id")Long id);

			/**
			* 基础数据》特殊群体》分页查询
			* @param pageInputUserDTO
			* @return
			*/
			@PostMapping("common/data/special/page")
			R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO);

			/**
			* 删除特殊群体人员
			* @param id 特殊群体id
			* @return 删除结果
			*/
			@PostMapping("common/data/special/delete")
			R deleteSpecialInputUser(@RequestParam(value = "id") Long id);


			/**
			* 办事指南_新增
			* @param workGuideVO 新增信息
			* @return 新增结果
			*/
			@PostMapping("/addworkguide")
			R addWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId);

			/**
			* 办事指南_编辑
			* @param workGuideVO
			* @return 编辑结果
			*/
			@PostMapping("/editworkguide")
			R editWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId);

			/**
			* 办事指南_详情
			* @param workGuideId
			* @return 详情
			*/
			@GetMapping("/detailworkguide")
			R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId);
			/**
			* 办事指南_分页
			* @param pageActWorkGuideDTO 查询参数
			* @return 分页集合
			*/
			@PostMapping("/pageworkguide")
			R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO);

			/**
			* 办事指南_删除
			* @param workGuideId 办事指南id
			* @return 删除结果
			*/
			@PostMapping("/delectworkguide")
			R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);

			/**
			* 分页查询邻里圈
			* @param neighborCircleAppDTO 请求参数
			* @return 邻里圈列表
			*/
			@PostMapping("/neighbor/pageNeighborByApp")
			R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

			/**
			* 用户发布邻里圈审核
			* @param addNeighborCircleAppDTO 邻里圈请求参数
			* @return 发布结果
			*/
			@PostMapping("/neighbor/addNeighborByApp")
			R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO);

			/**
			* 用户查看邻里圈详情
			* @param neighborCircleAppDTO 请求参数
			* @return 邻里圈详情
			*/
			@PostMapping("/neighbor/neighborDetailByApp")
			R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);

			/**
			* 管理后台查询邻里圈列表
			* @param comActNeighborCircleAdminDTO 请求参数
			* @return 邻里圈列表
			*/
			@PostMapping("/neighbor/pageNeighborByAdmin")
			R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);


			/**
			* 后台修改邻里圈
			* @param editNeighborCircleAdminVO 请求参数
			*/
			@PostMapping("/neighbor/changeStatusByAdmin")
			R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);


			/**
			* 邻里圈_后台删除
			* @param id 邻里圈id
			* @return 邻里圈列表
			*/
			@PostMapping("/neighbor/deleteByAdmin")
			R deleteByAdmin(@RequestParam("id")Long id);

			/**
			* 查看邻里圈基础_详情
			* @param id 邻里圈id
			* @return 邻里圈列表
			*/
			@GetMapping("/neighbor/detailNeighborByAdmin")
			R detailNeighborByAdmin(@RequestParam("id")Long id);

			/**
			* 邻里圈的所有评论_分页
			* @param dto 请求参数
			* @return 评论列表
			*/
			@PostMapping("/neighbor/detailNeighborAllCommentByAdmin")
			R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto);

			/**
			* 评论的状态_修改
			* @param vo 请求参数
			*/
			@PostMapping("/neighbor/changeCommentStatusByAdmin")
			R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo);

			/**
			* 邻里圈评论_详情
			* @param id 评论id
			*/
			@GetMapping("/neighbor/detailNeighborCommentByAdmin")
			R detailNeighborCommentByAdmin(@RequestParam("id") Long id);


			/**
			* 用户查询邻里圈列表
			* @param neighborCircleAppDTO 请求参数
			* @return 邻里圈列表
			*/
			@PostMapping("/neighbor/neighborExamineByApp")
			R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

			/**
			* 邻里圈点赞
			* @param fabulousAppDTO 请求参数
			* @return 点赞结果
			*/
			@PostMapping("/neighbor/neighborFabulousByApp")
			R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);

			/**
			* 邻里圈转发
			* @param forwardAppDTO 请求参数
			* @return 转发结果
			*/
			@PostMapping("/neighbor/neighborForwardByApp")
			R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO);

			/**
			* 邻里圈评论
			* @param commentAppDTO 请求参数
			* @return 评论结果
			*/
			@PostMapping("/neighbor/neighborCommentByApp")
			R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO);

			/**
			* 邻里圈回复
			* @param replyAppDTO 请求参数
			* @return 回复结果
			*/
			@PostMapping("/neighbor/neighborReplyByApp")
			R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO);

			/**
			* 定时任务更新邻里圈近3天评论数/点赞数/浏览量
			* @return 执行结果
			*/
			@PostMapping("/neighbor/timeTaskCircleFlow")
			R timedTaskNeighborCircleRecord();

			/**
			* 邻里圈评论回复_分页
			* @param dto 参数
			*/
			@PostMapping("/neighbor/detailNeighborCommentAllReply")
			R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto);

			/**
			* 邻里圈评论回复_基本详情
			* @param id 参数
			*/
			@PostMapping("/neighbor/detailNeighborCommentReply")
			R detailNeighborCommentReply(@RequestParam("id") Long id);

			/**
			* 评论回复状态_修改
			* @param changeStatusReplyVO 参数
			*/
			@PostMapping("/neighbor/changeCommentReplyStatusByAdmin")
			R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO);
			/**
			* 邻里圈取消点赞
			* @param fabulousAppDTO 请求参数
			* @return 取消点赞结果
			*/
			@PostMapping("/neighbor/neighborFabulousCancelByApp")
			R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);

			/**
			* 添加邻里圈浏览记录
			* @param addBrowseAppDTO 请求参数
			* @return 返回参数
			*/
			@PostMapping("/neighbor/neighborAddBrowseByApp")
			R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO);


			/**
			* 邻里圈_添加
			* @param addNeighborCircleAdminVO 参数
			*/
			@PostMapping("/neighbor/addNeighborByAdmin")
			R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO);

			}