From e60572581d3a8b97bb8cc35536daaa7b3f2c0a14 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 22 十一月 2022 13:57:33 +0800
Subject: [PATCH] #feat 调试修改问题
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
index 3180335..272fade 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
@@ -68,11 +68,13 @@
public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
return communityService.shopFlowerGoodsDetail(goodsId);
}
+
@ApiOperation(value = "删除商品")
@DeleteMapping("/goods/delete")
public R deleteShopGoods(@RequestParam("goodsId") Long goodsId) {
return communityService.deleteFlowerShopGoods(goodsId);
}
+
@ApiOperation(value = "商品上下架")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "商品Id"),
@ApiImplicitParam(name = "status", value = "1.上架 2.下架 ")})
@@ -80,12 +82,14 @@
public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
return communityService.changeFlowerStatus(id, status);
}
+
@ApiOperation(value = "编辑商品")
@PostMapping("/goods/edit/{id}")
public R editShopGoods(@PathVariable("id") Long id,
@RequestBody @Validated(AddGroup.class) AddShopFlowerGoodsVO addShopGoodsVO) {
return communityService.editFlowerShopGoods(id, addShopGoodsVO);
}
+
@ApiOperation(value = "新增商品")
@PostMapping("/goods/save")
public R saveShopGoods(@RequestBody @Validated(AddGroup.class) AddShopFlowerGoodsVO addShopGoodsVO) {
@@ -238,7 +242,7 @@
public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO) {
String evaluateContent = comShopFlowerEvaluateDTO.getEvaluateContent();
if (StrUtil.isNotBlank(evaluateContent)) {
- String result = checkService.checkMessageBy(evaluateContent,this.getLoginUserInfo().getOpenid(),this.getAppId());
+ String result = checkService.checkMessageBy(evaluateContent, this.getLoginUserInfo().getOpenid(), this.getAppId());
if (StrUtil.isNotBlank(result)) {
return R.fail(501, "填写内容存在 " + result + " 违规信息");
}
@@ -367,59 +371,64 @@
/**
* 查询我的店铺各类统计数据
+ *
* @param storeId
* @return
*/
@ApiOperation(value = "查询我的店铺各类统计数据")
@GetMapping("/selectCountByStoreId")
- public R selectCountByUserId(Long storeId){
+ public R selectCountByUserId(Long storeId) {
return communityService.selectCountByUserId(storeId);
}
/**
* 创建退款订单
+ *
* @param comShopFlowerRefundOrderDTO
* @return
*/
@PostMapping("createRefundOrder")
@ApiOperation(value = "创建退款订单")
- public R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO){
+ public R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO) {
return communityService.createRefundOrder(comShopFlowerRefundOrderDTO);
}
/**
* 用户 分页查询退款订单
+ *
* @param pageComOrderRefundDTO
* @return
*/
@PostMapping("pageRefundOrder")
- @ApiOperation(value = "退款订单分页查询 用户",response = ComShopFlowerRefundOrderVO.class)
- public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO){
+ @ApiOperation(value = "退款订单分页查询 用户", response = ComShopFlowerRefundOrderVO.class)
+ public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
pageComOrderRefundDTO.setUserId(this.getUserId());
return communityService.pageRefundOrder(pageComOrderRefundDTO);
}
/**
* 修改退款订单
+ *
* @param comShopFlowerRefundOrderDTO
* @return
*/
@PostMapping("updateRefundOrder")
@ApiOperation(value = "修改退款订单")
- public R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO){
+ public R updateRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO) {
return communityService.updateRefundOrder(comShopFlowerRefundOrderDTO);
}
/**
* 商家后台-退款申请统计
+ *
* @param storeId
* @return
*/
@GetMapping("selectCountGroupStatus")
@ApiOperation(value = "商家后台-退款申请统计")
- public R selectCountGroupStatus(Long storeId){
+ public R selectCountGroupStatus(Long storeId) {
return communityService.selectCountGroupStatus(storeId);
}
@@ -428,6 +437,7 @@
public R getAllGoodsCategories() {
return communityService.getAllGoodsCategories();
}
+
@ApiOperation(value = "分页查询便民服务分类", response = ConvenientServiceCategoryVO.class)
@PostMapping("/service-category/page")
public R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO) {
@@ -435,4 +445,43 @@
return communityService.pageServiceCategory(pageConvenientServiceCategoryDTO);
}
+ /**
+ * 新增商品浏览量
+ *
+ * @param goodsId
+ * @return
+ */
+ @GetMapping("incrGoodsView")
+ public R incrGoodsView(@RequestParam("goodsId") Long goodsId) {
+ return communityService.incrGoodsView(goodsId);
+ }
+
+ @ApiOperation(value = "增加商家咨询量")
+ @GetMapping("/merchant/incr-consult")
+ public R incrMerchantConsult(@RequestParam("merchantId") Long merchantId) {
+ return communityService.consultMerchant(merchantId);
+ }
+
+ @ApiOperation(value = "增加商家浏览量")
+ @GetMapping("/merchant/incr-view")
+ public R incrMerchantView(@RequestParam("merchantId") Long merchantId) {
+ return communityService.incrMerchantView(merchantId);
+ }
+
+ @ApiOperation(value = "出入账分页", response = ComShopFlowerOrderPayVO.class)
+ @PostMapping("pageOrderPay")
+ public R pageOrderPay(@RequestBody PageComShopFlowerOrderPayDTO pageComShopFlowerOrderPayDTO) {
+ return communityService.pageOrderPay(pageComShopFlowerOrderPayDTO);
+ }
+
+ /**
+ * 获取商家的营业额和可结算金额
+ * @param storeId
+ * @return
+ */
+ @ApiOperation(value = "获取商家的营业额和可结算金额")
+ @GetMapping("getQuota")
+ public R getQuota(@RequestParam("storeId") Long storeId){
+ return communityService.getQuota(storeId);
+ }
}
--
Gitblit v1.7.1