From 8c0b5b30e5200e7bd45aa34507c3623e17fcce91 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 24 八月 2023 13:47:24 +0800
Subject: [PATCH] 新增小程序积分列表 修改积分发放流程
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 916 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 843 insertions(+), 73 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 0578ea4..be0f5c3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.service.community;
+import java.util.Date;
import java.util.List;
import com.panzhihua.common.model.dtos.PageBaseDTO;
@@ -26,6 +27,7 @@
import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
@@ -35,6 +37,7 @@
import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
+import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.scheduling.annotation.Async;
@@ -217,68 +220,6 @@
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
-import com.panzhihua.common.model.vos.community.ActivitySignVO;
-import com.panzhihua.common.model.vos.community.BatchhouseVO;
-import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
-import com.panzhihua.common.model.vos.community.ComActActRegistVO;
-import com.panzhihua.common.model.vos.community.ComActActivityTypeVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComActAnnouncementVO;
-import com.panzhihua.common.model.vos.community.ComActColumnVO;
-import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
-import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
-import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
-import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
-import com.panzhihua.common.model.vos.community.ComActMessageVO;
-import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
-import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
-import com.panzhihua.common.model.vos.community.ComActSocialOrgVO;
-import com.panzhihua.common.model.vos.community.ComActVO;
-import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
-import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
-import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
-import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO;
-import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
-import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
-import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationCorrectExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationCultExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationDisabilityExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationDrugExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationElderExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationKeyExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationPensionExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO;
-import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
-import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
-import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
-import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
-import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngVillageVO;
-import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
-import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
-import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
-import com.panzhihua.common.model.vos.community.ComPensionAuthRecordImportExcelVO;
-import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO;
-import com.panzhihua.common.model.vos.community.ComPropertyVO;
-import com.panzhihua.common.model.vos.community.ComStreetVO;
-import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
-import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
-import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
-import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
-import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
@@ -575,6 +516,16 @@
*/
@PostMapping("pageeasyphoto")
R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO);
+
+ /**
+ * 分页查询随手拍 浪潮专用
+ *
+ * @param comActEasyPhotoVO
+ * 查询参数
+ * @return 心愿列表
+ */
+ @GetMapping("pageEasyPhotoAdminLC")
+ R pageEasyPhotoAdminLC(@RequestParam("pageNum") Long pageNum,@RequestParam("pageSize") Long pageSize);
/**
* 随手拍详情
@@ -2254,6 +2205,19 @@
R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode, @RequestParam(value = "areaCode", required = false) String areaCode);
/**
+ * 查询省下所有区域 tree结构
+ *
+ * @param provinceAdcode
+ * 省份code
+ * @param areaCode
+ * @return 查询结果
+ */
+ @GetMapping("/common/data/area/basiclevel")
+ R getCityTreeByCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
+ @RequestParam(value = "areaCode", required = false) String areaCode,
+ @RequestParam(value = "appId", required = false) String appId);
+
+ /**
* 分页查询街道
*
* @param pageComStreetDTO
@@ -2973,11 +2937,11 @@
/**
* 删除商品
*
- * @param id
+ * @param goodsId
* @return
*/
- @PostMapping("/shopFlower/deleteShopGoods")
- R deleteFlowerShopGoods(@RequestBody Long[] id);
+ @DeleteMapping("/shopFlower/deleteShopGoods")
+ R deleteFlowerShopGoods(@RequestParam("goodsId") Long goodsId);
/**
* 修改商品状态
@@ -2987,6 +2951,16 @@
*/
@GetMapping("/shopFlower/changeShopGoodsStatus")
R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
+
+ /**
+ * 商品详情
+ *
+ * @param goodsId
+ * @return
+ */
+ @GetMapping("/shopFlower/shopGoodsDetail")
+ R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId);
+
/**
@@ -3408,7 +3382,7 @@
* @return 详情
*/
@GetMapping("/detailworkguide")
- R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId);
+ R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, @RequestParam("communityId") String communityId);
/**
* 办事指南_分页
@@ -3509,6 +3483,15 @@
@PostMapping("/neighbor/pageNeighborByAdmin")
R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+ /**
+ * 统计大屏查询清单列表
+ *
+ * @param comActNeighborCircleAdminDTO
+ * 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/pageNeighborByBigScreen")
+ R pageNeighborByBigScreen(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
/**
* 后台修改邻里圈
*
@@ -6530,6 +6513,14 @@
R getMerchant(@RequestParam("merchantId") Long merchantId);
/**
+ * 获取便民服务商家详情
+ * @param userId
+ * @return
+ */
+ @GetMapping("/convenient/merchant/getMerchantByUserId")
+ R getMerchantByUserId(@RequestParam("userId") Long userId);
+
+ /**
* 禁用/启用便民服务商家
* @param disableOrEnableConvenientMerchantDTO
* @return
@@ -6559,6 +6550,14 @@
*/
@GetMapping("/convenient/getUserMerchantInfoByAccount")
R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);
+
+ /**
+ * 获取用户便民服务商家详情
+ * @param account 商家绑定账号
+ * @return
+ */
+ @GetMapping("/convenient/getMerchantInfoByAccount")
+ R<ConvenientMerchantVO> getMerchantInfoByAccount(@RequestParam("account") String account);
/**
* 获取商便民服务商家信息
@@ -10632,7 +10631,7 @@
* @param operator
* @return
*/
- @DeleteMapping("/point/delete")
+ @DeleteMapping("/convenient/point/delete")
R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator);
/**
@@ -10640,7 +10639,7 @@
* @param pointId
* @return
*/
- @GetMapping("/point/detail")
+ @GetMapping("/convenient/point/detail")
R detailPoint(@RequestParam("pointId") Long pointId);
/**
@@ -10648,7 +10647,7 @@
* @param convenientGoodsCategoryDTO
* @return
*/
- @PostMapping("/goodsCategory/add")
+ @PostMapping("/convenient/goodsCategory/add")
R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);
/**
@@ -10656,7 +10655,7 @@
* @param convenientGoodsCategoryDTO
* @return
*/
- @PutMapping("/goodsCategory/put")
+ @PutMapping("/convenient/goodsCategory/put")
R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO);
/**
@@ -10664,7 +10663,7 @@
* @param categoryId
* @return
*/
- @DeleteMapping("/goodsCategory/delete")
+ @DeleteMapping("/convenient/goodsCategory/delete")
R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);
/**
@@ -10672,7 +10671,7 @@
* @param categoryId
* @return
*/
- @GetMapping("/goodsCategory/get")
+ @GetMapping("/convenient/goodsCategory/get")
R getGoodsCategory(@RequestParam("categoryId") Long categoryId);
/**
@@ -10680,7 +10679,7 @@
* @param pageConvenientGoodsCategoryDTO
* @return
*/
- @PostMapping("/goodsCategory/page")
+ @PostMapping("/convenient/goodsCategory/page")
R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO);
@GetMapping("/dataCount")
@@ -10696,9 +10695,780 @@
R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);
/**
+ * 获取所有商品分类
+ * @return
+ */
+ @GetMapping("/convenient/goodsCategory/getAllGoodsCategories")
+ R getAllGoodsCategories();
+
+ /**
+ * 分页查询用户收货地址列表
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 用户收货地址列表
+ */
+ @PostMapping("/shopFlower/shopUserAddressList")
+ R shopFlowerUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户添加收货地址
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/shopFlower/shopAddUserAddress")
+ R shopFlowerAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户修改收货地址
+ *
+ * @param comShopAddressDTO
+ * 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/shopFlower/shopEditUserAddress")
+ R shopFlowerEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户删除收货地址
+ *
+ * @param addressId
+ * 收货地址id
+ * @return 删除结果
+ */
+ @DeleteMapping("/shopFlower/shopDelUserAddress")
+ R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId);
+
+ /**
+ * 订单预览
+ *
+ * @param orderPreviewDTO 请求参数
+ * @return 订单预览数据
+ */
+ @PostMapping("/shopFlower/orderPreview")
+ R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);
+
+ /**
+ * 创建订单
+ *
+ * @param orderCreateDTO 创建订单请求参数
+ * @return 创建结果
+ */
+ @PostMapping("/shopFlower/orderCreate")
+ R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO);
+
+ /**
+ * 分页查询用户订单列表
+ *
+ * @param comOrderListDTO 请求参数
+ * @return 查询结果
+ */
+ @PostMapping("/shopFlower/pageOrderList")
+ R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO);
+
+ /**
+ * 根据订单id查询订单详情
+ *
+ * @param orderId 订单id
+ * @return 订单详情
+ */
+ @GetMapping("/shopFlower/orderDetail")
+ R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone);
+
+ /**
+ * 根据订单id取消订单
+ *
+ * @param comShopOrderQueryDTO 请求参数
+ * @return 取消结果
+ */
+ @PostMapping("/shopFlower/orderCancel")
+ R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);
+
+ /**
+ * 根据订单id删除订单
+ *
+ * @param orderId 订单id
+ * @return 删除结果
+ */
+ @DeleteMapping("/shopFlower/orderDelete")
+ R orderDeleteFlower(@RequestParam("orderId") Long orderId);
+
+ /**
+ * 根据订单id确认收货
+ *
+ * @param comShopOrderQueryDTO 请求参数
+ * @return 确认结果
+ */
+ @PostMapping("/shopFlower/orderConfirm")
+ R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);
+
+ /**
+ * 分页查询 商家订单
+ *
+ * @param pageComShopOrderSearchDTO 分页数据
+ * @return 分页订单
+ */
+ @PostMapping("/shopFlower/order/page")
+ R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
+ /**
+ * 订单发货
+ *
+ * @param orderShipDTO 发货信息
+ * @return 发货结果
+ */
+ @PostMapping("/shopFlower/shipOrder")
+ R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO);
+
+ /**
+ * 订单配送
+ *
+ * @param deliverDTO 订单ID
+ * @return 配送结果
+ */
+ @PostMapping("/shopFlower/deliverOrder")
+ R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 订单配送
+ *
+ * @param deliverDTO 订单ID
+ * @return 配送完成
+ */
+ @PostMapping("/shopFlower/finishDeliverOrder")
+ R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 获取当前商铺周围的自提点信息以及距离手机距离
+ *
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/convenient/point/findPointByMerchantId")
+ R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng);
+
+ /**
+ * 保存评价
+ * @param comShopFlowerEvaluateDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/saveEvaluate")
+ R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO);
+
+ /**
+ * 分页查询评价
+ * @param pageComShopFlowerEvaluateDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageEvaluate")
+ R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);
+
+ /**
+ * 评价详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/shopFlower/detailEvaluate")
+ R detailEvaluate(@RequestParam("id") Long id);
+
+ /**
+ * 删除评价
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/shopFlower/deleteEvaluate")
+ R deleteEvaluate(@RequestParam("id") Long id);
+
+ /**
+ * 取货码
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "取货码")
+ @GetMapping("/shopFlower/getQRCode")
+ R getQRCode(@RequestParam("id") Long id);
+
+ /**
+ * 保存配送单
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("/shopFlower/saveDelivery")
+ R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);
+
+ /**
+ * 更新配送单
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("/shopFlower/updateDelivery")
+ R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);
+
+ /**
+ * 已配送、已送达 分页查询
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageDelivery")
+ R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);
+
+ /**
+ * 未配送 分页查询
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageNoDelivery")
+ R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);
+
+ /**
+ * 未配送-开始配送-订单列表
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageNoDeliveryOrderList")
+ R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);
+
+ /**
+ * 根据商家id查询商家的订单
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageOrderByStoreId")
+ R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);
+
+ /**
+ * 微信支付订单回调
+ *
+ * @param wxPayNotifyOrderDTO
+ * 订单支付回调参数
+ */
+ @PostMapping("/shopFlower/wxOrderPayNotify")
+ void wxOrderPayNotifyFlower(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);
+
+ /**
+ * 点击去支付订单
+ *
+ * @param orderPayDTO
+ * 请求参数
+ * @return 支付对象
+ */
+ @PostMapping("/shopFlower/wxPay")
+ R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO);
+
+ /**
* 获取社区动态置顶banner
* @param communityId 社区id
* */
@PostMapping("/easyphoto/getUserRewardsNew")
R getUserRewardsNew(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 统计查询订单数量
+ * @param deliveryType
+ * @param userId
+ * @return
+ */
+ @GetMapping("/shopFlower/selectCountByDeliveryType")
+ R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("userId") Long userId);
+
+ /**
+ * 查询我的店铺各类统计数据
+ * @param userId
+ * @return
+ */
+ @GetMapping("/shopFlower/selectCountByUserId")
+ R selectCountByUserId(@RequestParam("userId") Long userId);
+
+
+ /**
+ * 创建退款订单
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/createRefundOrder")
+ R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);
+
+ /**
+ * 分页查询
+ * @param pageComOrderRefundDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageRefundOrder")
+ R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO);
+
+ /**
+ * 修改退款订单
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/updateRefundOrder")
+ R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO);
+
+
+ /**
+ * 商家后台-退款申请统计
+ * @param storeId
+ * @return
+ */
+ @GetMapping("/shopFlower/selectCountGroupStatus")
+ R selectCountGroupStatus(@RequestParam("storeId") Long storeId);
+
+ /**
+ * 新增商品浏览量
+ * @param goodsId
+ * @return
+ */
+ @GetMapping("/shopFlower/incrGoodsView")
+ R incrGoodsView(@RequestParam("goodsId") Long goodsId);
+
+ /**
+ * 出入账分页
+ * @param pageComShopFlowerOrderPayDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageOrderPay")
+ R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO);
+
+ /**
+ * 获取商家的营业额和可结算金额
+ * @param storeId
+ * @return
+ */
+ @GetMapping("/shopFlower/getQuota")
+ R getQuota(@RequestParam("storeId") Long storeId);
+
+ /**
+ * 取消退款
+ * @param id
+ * @return
+ */
+ @GetMapping("/shopFlower/refundOrderCancel")
+ R refundOrderCancel(@RequestParam("id") Long id);
+
+ /**
+ * 退款订单详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/shopFlower/refundOrderDetail")
+ R refundOrderDetail(@RequestParam("id") Long id);
+
+ /**
+ * 清点商品 确认送达详情
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("/shopFlower/pageOrderByDeliveryNo")
+ R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);
+
+ /**
+ * 商家后台经营数据统计-上
+ * @param storeId
+ * @return
+ */
+ @GetMapping("/shopFlower/selectSumOrderAndAmountByStoreId")
+ R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId);
+
+ /**
+ * 统计时间区域的订单量 15天 30天 一年
+ * @param storeId
+ * @param type
+ * @return
+ */
+ @GetMapping("/shopFlower/selectOrderLineChart") R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type,@RequestParam("tab") Integer tab);
+
+ /**
+ * 统计上架的上下架商品数量
+ * @param userId
+ * @return
+ */
+ @GetMapping("/shopFlower/countSaleByUserId")
+ R countSaleByUserId(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询统计基础数据
+ * @return
+ */
+ @GetMapping("/selectBasicData")
+ R selectBasicData();
+
+ /**
+ * 统计在职干部特长
+ * @return
+ */
+ @GetMapping("/statisticsPbMemberType")
+ R statisticsPbMemberType();
+
+
+ /**
+ * 统计单位
+ * @return
+ */
+ @GetMapping("/selectUnitByNatureName")
+ R selectUnitByNatureName();
+
+ /**
+ * 大屏-社区活动分页
+ * @return
+ */
+ @PostMapping("pageActivityBigScreen")
+ R pageActivityBigScreen(@RequestBody PageBaseDTO pageBaseDTO);
+
+ /**
+ * 疫情防控 健康码统计
+ * @return
+ */
+ @GetMapping("/comActAcidRecord/selectColorMarkGroup")
+ R selectColorMarkGroup();
+
+
+ @GetMapping("easyphoto/selectStatisticsPhoto")
+ R selectStatisticsPhoto();
+
+ /**
+ * 获取商家周围 n(km)的自提点数量
+ *
+ * @param distance
+ * @return
+ */
+ @GetMapping("/convenient/point/findPointNumByDistance")
+ R findPointNumByDistance(@RequestParam("distance") Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng);
+
+
+ /**
+ * 普达大屏-自治动态
+ * */
+ @GetMapping("/pudaScreen/autonomyDynamic")
+ R autonomyDynamic();
+
+ /**
+ * 普达大屏-红色物业
+ * */
+ @GetMapping("/pudaScreen/propertyDynamic")
+ R propertyDynamic();
+
+ /**
+ * 普达大屏-党建数据
+ **/
+ @GetMapping("/pudaScreen/partyData")
+ R partyData();
+
+ /**
+ *
+ * 普达大屏-居民信息
+ * */
+ @GetMapping("/pudaScreen/peopleInfo")
+ R peopleInfo();
+
+
+ /**
+ * 普达大屏-小区院落
+ * */
+ @GetMapping("/pudaScreen/countryard")
+ R countryard();
+
+ /**
+ * 普达大屏-基础数据
+ * */
+ @GetMapping("/pudaScreen/basicData")
+ R basicData();
+
+ /**
+ * 普达大屏-特殊人群
+ * */
+ @GetMapping("/pudaScreen/specialPeople")
+ R specialPeople();
+
+
+
+ /**
+ * 通过洗车订单查询银联订单
+ *
+ * @return
+ */
+ @GetMapping("/unionpay/detail")
+ R queryById(@RequestParam("Id") String id);
+
+
+ /**
+ * 通过银联订单查询洗车订单
+ *
+ * @return
+ */
+ @GetMapping("/unionpay/unionpayDetail")
+ R carWashById(@RequestParam("Id") String id);
+
+ /**
+ * 新增洗车订单和银联订单关系
+ * @param carWashId
+ * @param unionpayOrderId
+ * @param money
+ * @return
+ */
+ @PostMapping("/unionpay/add")
+ int add(@RequestParam("carWashId") String carWashId,
+ @RequestParam("unionpayOrderId") String unionpayOrderId,
+ @RequestParam("money") String money);
+
+
+
+
+
+
+ /*********************************************************************************************************
+ *
+ *
+ * 最美志愿者
+ *
+ *
+ * *********************************************************************************************************/
+ @GetMapping("/MostBeautifu/queryById")
+ public R queryById2(@RequestParam("id") String Id);
+
+
+ /**
+ * 分页查询
+ * @param name
+ * @param unmountType
+ * @return
+ */
+ @GetMapping("/MostBeautifu/getqueryList")
+ public R queryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize")int pageSize,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "unmountType", required = false) String unmountType);
+
+
+
+ /**
+ * 新增
+ * @param mostBeautifulVolunteerVO
+ * @return
+ */
+ @PostMapping("/MostBeautifu/addMostBeautiful")
+ public R insertMostBeautifulVolunteer(@RequestBody MostBeautifulVolunteerVO mostBeautifulVolunteerVO);
+
+
+ /**
+ * 更新
+ * @param mostBeautifulVolunteerVO
+ * @return
+ */
+ @PostMapping("/MostBeautifu/upMostBeautiful")
+ public R updateById(@RequestBody MostBeautifulVolunteerVO mostBeautifulVolunteerVO);
+
+
+ /**
+ * 删除
+ * @param Id
+ * @return
+ */
+ @DeleteMapping("/MostBeautifu/delectVuId")
+ public R deleteById(@RequestParam("id") String Id);
+
+
+ /********************************************************************************************************************
+ *
+ *
+ * 志愿者活动
+ *
+ *
+ *******************************************************************************************************************/
+ /**
+ * 获取单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("Volunteer/queryById")
+ R volunteerQueryById(@RequestParam("id") String id);
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("Volunteer/queryList")
+ R volunteerQueryList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "name", required = false) String name,
+ @RequestParam(value = "acState", required = false) String acState,
+ @RequestParam(value = "acType", required = false) String acType,
+ @RequestParam(value = "actityBeginTime", required = false) Date actityBeginTime,
+ @RequestParam(value = "actityEndTime", required = false) Date actityEndTime);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("Volunteer/insertVolunteer")
+ R insertVolunteer(@RequestBody VolunteerActivityVO volunteerActivityVO);
+
+
+ @PostMapping("Volunteer/updateById")
+ R volunteerUpdateById(@RequestBody VolunteerActivityVO volunteerActivityVO);
+
+
+ @DeleteMapping("Volunteer/deleteById")
+ R volunteerDeleteById(@RequestParam("id") String id);
+
+
+
+ /**
+ * 定时刷新活动状态
+ * @return
+ */
+ @GetMapping("/Volunteer/timedTaskVolunteerActivitiesJobHandler")
+ public R timedTaskVolunteerActivitiesJobHandler();
+
+
+ /*******************************************************************************************************************
+ *
+ *
+ * 志愿者活动类型
+ *
+ *
+ *******************************************************************************************************************/
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerType/volunteerTypeGetList")
+ public R volunteerTypeGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize);
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerType/insertvolunteerType")
+ public R insertvolunteerType(@RequestBody VolunteerTypeVO volunteerTypeVO);
+
+ /**
+ * 更新
+ * @param volunteerTypeVO
+ * @return
+ */
+ @PostMapping("/VolunteerType/volunteerTypeUpdate")
+ public R volunteerTypeUpdate(@RequestBody VolunteerTypeVO volunteerTypeVO);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerType/volunteerTypeDelete")
+ public R volunteerTypeDelete(@RequestParam("id") String id);
+
+ /*****************************************************************************************************************
+ *
+ *
+ * 志愿者参加活动
+ *
+ *
+ ****************************************************************************************************************/
+ /**
+ * 志愿者单个详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerActivitiesPeople/vapGetById")
+ public R vapGetById(@RequestParam("id") String id);
+
+ /**
+ * 参与人员列表
+ * @param activityId
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/VolunteerActivitiesPeople/vapGetList")
+ public R vapGetList(@RequestParam("activityId") String activityId,
+ @RequestParam("communityId") String communityId);
+
+ /**
+ * 添加参与人员
+ * @param volunteerActivitiesPeopleVO
+ * @return
+ */
+ @PostMapping("/VolunteerActivitiesPeople/vapInsert")
+ public R vapInsert(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);
+
+ /**
+ * 修改参与人员
+ * @param volunteerActivitiesPeopleVO
+ * @return
+ */
+ @PostMapping("/VolunteerActivitiesPeople/vapUpdate")
+ public R vapUpdate(@RequestBody VolunteerActivitiesPeopleVO volunteerActivitiesPeopleVO);
+
+ /**
+ * 删除参与人员
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerActivitiesPeople/vapDelete")
+ public R vapDelete(@RequestParam("id") String id);
+
+
+ /**
+ * 志愿者活动 奖励发放
+ * @param grantIntegral
+ * @return
+ */
+ @PostMapping("/grantIntegral")
+ public R grantIntegral(@RequestBody GrantIntegral grantIntegral);
+
+ /**************************************************************************************************************
+ *
+ *
+ * 积分明细记录
+ *
+ *****************************************************************************************************************/
+ /**
+ * 获取单个详情
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralRecord/getId")
+ public R VolunteerIntegralRecordGetId(@RequestParam("id") String id);
+
+ /**
+ * 分页查询
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/VolunteerIntegralRecord/getId")
+ public R VolunteerIntegralRecordGetList(int pageNum, int pageSize,
+ @RequestParam("userId") String userId);
+
+ /**
+ * 新增
+ *
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralRecord/insertVolunteer")
+ public R VolunteerIntegralRecordInsertVolunteer(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO);
+
+ /**
+ * 便捷
+ * @param
+ * @return
+ */
+ @PostMapping("/VolunteerIntegralRecord/updateId")
+ public R VolunteerIntegralRecordUpdateId(@RequestBody() VolunteerIntegralRecordVO volunteerIntegralRecordVO);
+
+ /**
+ * 删除
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/VolunteerIntegralRecord/deleteId")
+ public R VolunteerIntegralRecordDeleteId(@RequestParam("id") String id);
+
+
}
--
Gitblit v1.7.1