From e4636b43d19c8f288962cd44c9d61ea89a9239fb Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期日, 25 四月 2021 18:44:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 151 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 147 insertions(+), 4 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 f6f80ae..20336f8 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
@@ -424,6 +424,15 @@
R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO);
/**
+ * 获取志愿者详情
+ *
+ * @param id 志愿者信息
+ * @return 增加结果
+ */
+ @GetMapping("getVolunteerById")
+ R getVolunteerById(@RequestParam("id")Long id);
+
+ /**
* 增加志愿者
*
* @param comMngVolunteerMngVO 志愿者信息
@@ -1602,6 +1611,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 查询参数
@@ -1618,6 +1636,7 @@
*/
@PostMapping("/common/data/population/detail")
R detailPopulation(@RequestParam(value = "populationId") Long populationId);
+
/**
* 根据id修改实有人口标签列表
@@ -1776,6 +1795,13 @@
@PostMapping("/shop/saveStore")
R saveStore(@RequestBody ShopStoreVO storeVO);
+ /**
+ * 新增店铺
+ * @param storeVO 店铺信息
+ * @return 新增结果
+ */
+ @PostMapping("/shop/addStore")
+ R addStore(@RequestBody ShopStoreVO storeVO);
/**
* 编辑店铺、启用、禁用
@@ -1804,7 +1830,7 @@
* 商品列表-分页查询
* @param pageComShopGoodsDTO 添加数据
*/
- @PostMapping("/shop/pageShopGoods")
+ @PostMapping("/shop/pageGoods")
R pageGoodsList(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO);
/**
@@ -1836,7 +1862,7 @@
* @param id
* @return
*/
- @PostMapping("/shop/changeShopGoodsStatus")
+ @GetMapping("/shop/changeShopGoodsStatus")
R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status);
/**
* 结果
@@ -1854,9 +1880,9 @@
R pageShopOperLog(@RequestBody PageDTO pageDTO);
/**
- * 分页查询 商家后台操作日志
+ * 订单分页查询
* @param pageComShopOrderSearchDTO 分页数据
- * @return 分页日志
+ * @return 订单分页查询
*/
@PostMapping("/shop/order/page")
R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
@@ -1899,6 +1925,14 @@
*/
@PostMapping("/shop/shopCartList")
R shopCartList(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询用户购物车数量
+ * @param userId 用户id
+ * @return 用户购物车商品数量
+ */
+ @PostMapping("/shop/shopCartUserTotal")
+ R shopCartUserTotal(@RequestParam("userId") Long userId);
/**
* 购物车添加
@@ -2019,4 +2053,113 @@
*/
@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);
}
--
Gitblit v1.7.1