From b2fce0dc7dc4ea5dec9792a2bc3ceb9d33d6e07b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 04 九月 2023 13:59:52 +0800
Subject: [PATCH] 修改后台社区动态加载不出来
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java | 410 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 235 insertions(+), 175 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
index a70aac5..90a8da2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
@@ -1,10 +1,8 @@
package com.panzhihua.service_community.api;
-import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
-import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.service.*;
import com.panzhihua.service_community.util.QRCodeUtil;
import io.swagger.annotations.ApiOperation;
@@ -21,19 +19,20 @@
@Resource
private ComShopFlowerGoodsService comShopFlowerGoodsService;
- // @Resource
-// private ComShopOperLogService comShopOperLogService;
@Resource
- private ComShopFlowerOrderService comShopOrderService;
- // @Resource
-// private ComShopCartService comShopCartService;
+ private ComShopFlowerOrderService comShopFlowerOrderService;
@Resource
private ComShopFlowerUserAddressService comShopUserAddressService;
-
@Resource
private ConvenientMerchantService convenientMerchantService;
@Resource
private ComShopFlowerEvaluateService comShopFlowerEvaluateService;
+ @Resource
+ private ComShopFlowerOrderDeliveryService comShopFlowerOrderDeliveryService;
+ @Resource
+ private ComShopFlowerRefundOrderService comShopFlowerRefundOrderService;
+ @Resource
+ private ComShopFlowerOrderPayService comShopFlowerOrderPayService;
/**
@@ -85,12 +84,12 @@
/**
* 删除商品
*
- * @param id
+ * @param goodsId
* @return
*/
- @PostMapping("deleteShopGoods")
- public R deleteFlowerShopGoods(@RequestBody Long[] id) {
- return comShopFlowerGoodsService.deleteShopFlowerGoods(id);
+ @DeleteMapping("deleteShopGoods")
+ public R deleteFlowerShopGoods(@RequestParam("goodsId") Long goodsId) {
+ return comShopFlowerGoodsService.deleteShopFlowerGoods(goodsId);
}
/**
@@ -99,7 +98,7 @@
* @param goodsId 商品id
* @return 商品信息
*/
- @PostMapping("shopGoodsDetail")
+ @GetMapping("shopGoodsDetail")
public R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId) {
return comShopFlowerGoodsService.shopFlowerGoodsDetail(goodsId);
}
@@ -154,7 +153,7 @@
* @param addressId 收货地址id
* @return 删除结果
*/
- @PostMapping("shopDelUserAddress")
+ @DeleteMapping("shopDelUserAddress")
public R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId) {
return comShopUserAddressService.shopDelUserAddress(addressId);
}
@@ -167,7 +166,7 @@
*/
@PostMapping("orderPreview")
public R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
- return comShopOrderService.orderPreview(orderPreviewDTO);
+ return comShopFlowerOrderService.orderPreview(orderPreviewDTO);
}
/**
@@ -178,7 +177,7 @@
*/
@PostMapping("orderCreate")
public R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
- return comShopOrderService.orderCreate(orderCreateDTO);
+ return comShopFlowerOrderService.orderCreate(orderCreateDTO);
}
/**
@@ -189,7 +188,7 @@
*/
@PostMapping("pageOrderList")
public R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO) {
- return comShopOrderService.pageOrderList(comOrderListDTO);
+ return comShopFlowerOrderService.pageOrderList(comOrderListDTO);
}
/**
@@ -198,9 +197,9 @@
* @param orderId 订单id
* @return 订单详情
*/
- @PostMapping("orderDetail")
- public R orderDetailFlower(@RequestParam("orderId") Long orderId) {
- return comShopOrderService.orderDetail(orderId);
+ @GetMapping("orderDetail")
+ public R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone) {
+ return comShopFlowerOrderService.orderDetail(orderId,phone);
}
/**
@@ -211,7 +210,7 @@
*/
@PostMapping("orderCancel")
public R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
- return comShopOrderService.orderCancel(comShopOrderQueryDTO);
+ return comShopFlowerOrderService.orderCancel(comShopOrderQueryDTO);
}
/**
@@ -220,9 +219,9 @@
* @param orderId 订单id
* @return 删除结果
*/
- @PostMapping("orderDelete")
+ @DeleteMapping("orderDelete")
public R orderDeleteFlower(@RequestParam("orderId") Long orderId) {
- return comShopOrderService.orderDelete(orderId);
+ return comShopFlowerOrderService.orderDelete(orderId);
}
/**
@@ -233,7 +232,7 @@
*/
@PostMapping("orderConfirm")
public R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
- return comShopOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
+ return comShopFlowerOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
}
/**
@@ -244,7 +243,7 @@
*/
@PostMapping("/order/page")
public R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
- return comShopOrderService.pageShopOrder(pageComShopOrderSearchDTO);
+ return comShopFlowerOrderService.pageShopOrder(pageComShopOrderSearchDTO);
}
/**
@@ -255,7 +254,7 @@
*/
@PostMapping("/shipOrder")
public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) {
- return comShopOrderService.shipOrder(orderShipDTO);
+ return comShopFlowerOrderService.shipOrder(orderShipDTO);
}
/**
@@ -266,7 +265,7 @@
*/
@PostMapping("/deliverOrder")
public R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
- return comShopOrderService.deliverOrder(deliverDTO);
+ return comShopFlowerOrderService.deliverOrder(deliverDTO);
}
/**
@@ -276,245 +275,306 @@
* @return 配送完成
*/
@PostMapping("/finishDeliverOrder")
- public R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
- return comShopOrderService.finishDeliverOrder(deliverDTO);
+ public R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
+ return comShopFlowerOrderService.finishDeliverOrder(deliverDTO);
}
/**
* 保存评价
+ *
* @param comShopFlowerEvaluateDTO
* @return
*/
@PostMapping("/saveEvaluate")
- public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO){
+ public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO) {
return comShopFlowerEvaluateService.saveEvaluate(comShopFlowerEvaluateDTO);
}
/**
* 分页查询评价
+ *
* @param pageComShopFlowerEvaluateDTO
* @return
*/
@PostMapping("/pageEvaluate")
- public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO){
+ public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO) {
return comShopFlowerEvaluateService.pageEvaluate(pageComShopFlowerEvaluateDTO);
}
/**
* 评价详情
+ *
* @param id
* @return
*/
@GetMapping("/detailEvaluate")
- public R detailEvaluate(@RequestParam("id") Long id){
+ public R detailEvaluate(@RequestParam("id") Long id) {
return comShopFlowerEvaluateService.detailEvaluate(id);
}
/**
* 删除评价
+ *
* @param id
* @return
*/
@DeleteMapping("deleteEvaluate")
- public R deleteEvaluate(@RequestParam("id") Long id){
+ public R deleteEvaluate(@RequestParam("id") Long id) {
return comShopFlowerEvaluateService.deleteEvaluate(id);
}
/**
* 取货码
+ *
* @param id
* @return
*/
@ApiOperation(value = "取货码")
@GetMapping("getQRCode")
- public R getQRCode(@RequestParam("id") Long id){
+ public R getQRCode(@RequestParam("id") Long id) {
return R.ok(QRCodeUtil.getBase64QRCode(id.toString()));
}
+
/**
- * 统计用户订单数量
+ * 保存配送单
*
- * @param userId
- * 用户id
- * @return 统计结果
+ * @param comShopFlowerOrderDeliveryDTO
*/
-/* @PostMapping("orderStatistics")
- public R orderStatistics(@RequestParam("userId") Long userId) {
- return comShopOrderService.orderStatistics(userId);
- }*/
-
-
- /*
-
-
- *//**
- * 根据店铺id查询店铺详情
- *
- * @param comShopStoreDTO
- * 请求参数
- * @return 店铺详情
- *//*
- @PostMapping("shopStoreDetail")
- public R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO) {
- return comShopStoreService.shopStoreDetail(comShopStoreDTO);
+ @PostMapping("saveDelivery")
+ public R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+ return comShopFlowerOrderDeliveryService.saveDelivery(comShopFlowerOrderDeliveryDTO);
}
-
-
-
-
- *//**
- * 商家资金的订单详情
+ /**
+ * 更新配送单
*
- * @param id
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("updateDelivery")
+ public R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+ return comShopFlowerOrderDeliveryService.updateDelivery(comShopFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 已配送、已送达 分页查询
+ *
+ * @param pageComFlowerOrderDeliveryDTO
* @return
- *//*
- @GetMapping("capitalDetailByStore")
- public R capitalDetailByStore(@RequestParam("id") Long id) {
- return comShopOrderService.capitalDetailByStore(id);
+ */
+ @PostMapping("pageDelivery")
+ public R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+ return comShopFlowerOrderDeliveryService.pageDelivery(pageComFlowerOrderDeliveryDTO);
}
-
-
- *//**
- * 订单导出信息
+ /**
+ * 未配送 分页查询
*
- * @param comShopOrderExportDTO
- * 订单导出信息
- * @return 订单导出信息
- *//*
- @PostMapping("/shopOrderExportData")
- R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO) {
- return comShopOrderService.shopOrderExportData(comShopOrderExportDTO);
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("pageNoDelivery")
+ public R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+ return comShopFlowerOrderDeliveryService.pageNoDelivery(pageComFlowerOrderDeliveryDTO);
}
- *//**
- * 资金管理导出信息
+ /**
+ * 未配送-开始配送-订单列表
*
- * @param comShopFundsExportDTO
- * 资金管理导出信息
- * @return 资金管理导出信息
- *//*
- @PostMapping("/shopOrderFundsExportData")
- R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO) {
- return comShopOrderService.shopOrderFundsExportData(comShopFundsExportDTO);
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("pageNoDeliveryOrderList")
+ public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+ return comShopFlowerOrderDeliveryService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO);
}
- *//**
- * 用户资金统计信息
+ /**
+ * 根据商家id查询商家的订单
*
- * @param userId
- * 用户ID
- * @return 统计信息
- *//*
- @GetMapping("/getFundsStat")
- R getFundsStat(@RequestParam("userId") Long userId) {
- return comShopOrderService.getFundsStat(userId);
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("pageOrderByStoreId")
+ public R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+ return comShopFlowerOrderService.pageOrderByStoreId(pageComFlowerOrderListDTO);
}
- *//**
- * 店铺资金统计信息
- *
- * @param pageComShopFundsSearchDTO
- * 店铺资金
- * @return 店铺资金统计信息
- *//*
- @PostMapping("/pageShopFunds")
- R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO) {
- return comShopOrderService.pageShopFunds(pageComShopFundsSearchDTO);
- }
-
- *//**
+ /**
* 微信支付订单回调
*
* @param wxPayNotifyOrderDTO
* 订单支付回调参数
- *//*
+ */
@PostMapping("/wxOrderPayNotify")
- public void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
- comShopOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
+ public void wxOrderPayNotifyFlower(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
+ comShopFlowerOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
}
- *//**
+ /**
* 点击去支付订单
*
* @param orderPayDTO
* 请求参数
* @return 支付对象
- *//*
+ */
@PostMapping("/wxPay")
- public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
- return comShopOrderService.wxPay(orderPayDTO);
+ public R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO) {
+ return comShopFlowerOrderService.wxPay(orderPayDTO);
}
- *//**
- * 商城系统配置
- *
- * @param comShopSysConfDTO
+ /**
+ * 查询订单总数
+ * @param deliveryType
* @return
- *//*
- @PostMapping("/conf/edit")
- R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO) {
- ComShopSysConfDO comShopSysConfDO = comShopSysConfService.getBaseMapper().selectById(comShopSysConfDTO.getId());
- switch (comShopSysConfDTO.getHidden()) {
- case 0:
- comShopSysConfDO.setVal("0");
- comShopSysConfDO.setEnabled("1");
- break;
- case 1:
- comShopSysConfDO.setVal("1");
- comShopSysConfDO.setEnabled("1");
- break;
- default:
- break;
- }
- int updated = comShopSysConfService.getBaseMapper().updateById(comShopSysConfDO);
- if (updated == 1) {
- return R.ok();
- }
- return R.fail();
+ */
+ @GetMapping("/selectCountByDeliveryType")
+ public R selectCountByDeliveryType(@RequestParam("deliveryType") Integer deliveryType,@RequestParam("userId") Long userId){
+ return comShopFlowerOrderService.selectCountByDeliveryType(deliveryType,userId);
}
- *//**
- * 商城系统配置查询
- *
- * @param pageComShopSysConfDTO
- * @return
- *//*
- @PostMapping("/conf/get")
- R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO) {
- List<ComShopSysConfDO> confList =
- comShopSysConfService.getBaseMapper().selectList(new LambdaQueryWrapper<ComShopSysConfDO>()
- .eq(ComShopSysConfDO::getName, "SHOP_HIDDEN").orderByDesc(ComShopSysConfDO::getCreate_at));
- ComShopSysConfVO comShopSysConfVO = new ComShopSysConfVO();
- if (confList != null && confList.size() > 0) {
- ComShopSysConfDO firstConf = confList.get(0);
- BeanUtils.copyProperties(firstConf, comShopSysConfVO);
- return R.ok(comShopSysConfVO);
- }
- return R.ok();
- }
-
- *//**
- * check商家/店铺是否有效
+ /**
+ * 查询我的店铺各类统计数据
* @param userId
* @return
- *//*
- @GetMapping("/checkStoreIsValid")
- public R checkStoreIsValid(@RequestParam("userId") Long userId) {
- Boolean isShopValid = comShopStoreService.checkStoreIsValid(userId);
- Boolean isConvenientValid = convenientMerchantService.checkStoreIsValid(userId);
- Boolean isMcsValid = userService.checkUserIsValid(userId, 11);
- return R.ok(isShopValid || isConvenientValid || isMcsValid);
- }*/
+ */
+ @GetMapping("/selectCountByUserId")
+ public R selectCountByUserId(@RequestParam("userId") Long userId){
+ return comShopFlowerOrderService.selectCountByUserId(userId);
+ }
+
+ /**
+ * 创建退款订单
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("createRefundOrder")
+ public R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO){
+ return comShopFlowerRefundOrderService.createRefundOrder(comShopFlowerRefundOrderDTO);
+ }
+
+ /**
+ * 分页查询
+ * @param pageComOrderRefundDTO
+ * @return
+ */
+ @PostMapping("pageRefundOrder")
+ public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO){
+ return comShopFlowerRefundOrderService.pageRefundOrder(pageComOrderRefundDTO);
+ }
+
+ /**
+ * 修改退款订单
+ * @param comShopFlowerRefundOrderDTO
+ * @return
+ */
+ @PostMapping("updateRefundOrder")
+ public R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO){
+ return comShopFlowerRefundOrderService.updateRefundOrder(comShopFlowerRefundOrderDTO);
+ }
/**
- * 保存评价
+ * 商家后台-退款申请统计
+ * @param storeId
* @return
*/
- public R saveEvaluate(){
- return R.ok();
+ @GetMapping("selectCountGroupStatus")
+ public R selectCountGroupStatus(@RequestParam("storeId") Long storeId){
+ return comShopFlowerRefundOrderService.selectCountGroupStatus(storeId);
}
+
+ /**
+ * 新增商品浏览量
+ * @param goodsId
+ * @return
+ */
+ @GetMapping("incrGoodsView")
+ public R incrGoodsView(@RequestParam("goodsId") Long goodsId){
+ return comShopFlowerGoodsService.incrGoodsView(goodsId);
+ }
+
+ /**
+ * 出入账分页
+ * @param pageComShopFlowerOrderPayDTO
+ * @return
+ */
+ @PostMapping("pageOrderPay")
+ public R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO){
+ return comShopFlowerOrderPayService.pageOrderPay(pageComShopFlowerOrderPayDTO);
+ }
+
+ /**
+ * 获取商家的营业额和可结算金额
+ * @param storeId
+ * @return
+ */
+ @GetMapping("getQuota")
+ public R getQuota(@RequestParam("storeId") Long storeId){
+ return comShopFlowerOrderService.getQuota(storeId);
+ }
+
+
+ /**
+ * 商家后台经营数据统计-上
+ * @param storeId
+ * @return
+ */
+ @GetMapping("selectSumOrderAndAmountByStoreId")
+ public R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId){
+ return comShopFlowerOrderService.selectSumOrderAndAmountByStoreId(storeId);
+ }
+
+ /**
+ * 统计时间区域的订单量 15天 30天 一年
+ * @param storeId
+ * @param type
+ * @return
+ */
+ @GetMapping("selectOrderLineChart")
+ public R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type,@RequestParam("tab") Integer tab){
+ return comShopFlowerOrderService.selectOrderLineChart(storeId,type,tab);
+ }
+
+ /**
+ * 取消退款
+ * @param id
+ * @return
+ */
+ @GetMapping("refundOrderCancel")
+ public R refundOrderCancel(@RequestParam("id") Long id){
+ return comShopFlowerRefundOrderService.orderCancel(id);
+ }
+
+ /**
+ * 退款订单详情
+ * @param id
+ * @return
+ */
+ @GetMapping("refundOrderDetail")
+ public R refundOrderDetail(@RequestParam("id") Long id){
+ return comShopFlowerRefundOrderService.refundOrderDetail(id);
+ }
+
+ /**
+ * 清点商品 确认送达详情
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @PostMapping("pageOrderByDeliveryNo")
+ public R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO){
+ return comShopFlowerOrderService.pageOrderByDeliveryNo(pageComFlowerOrderListDTO);
+ }
+
+ /**
+ * 统计上架的上下架商品数量
+ * @param userId
+ * @return
+ */
+ @GetMapping("/countSaleByUserId")
+ R countSaleByUserId(@RequestParam("userId") Long userId){
+ return comShopFlowerGoodsService.countSaleByUserId(userId);
+ }
+
}
--
Gitblit v1.7.1