From b108592ff8de820f374f19c5ee61d16213fc4dfb Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 18 十一月 2022 16:41:22 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 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 411bb0b..f8a167e 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
@@ -1,5 +1,7 @@
package com.panzhihua.applets.api;
+import cn.hutool.core.util.StrUtil;
+import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.shop.*;
@@ -9,6 +11,7 @@
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -28,11 +31,13 @@
@Slf4j
@RestController
@RequestMapping("/shopFlower/")
-@Api(tags = {"商城服务"})
+@Api(tags = {"花城商城服务"})
public class ShopFlowerApi extends BaseController {
@Resource
private CommunityService communityService;
+ @Resource
+ private CheckService checkService;
@ApiOperation(value = "查询便民服务商家详情", response = ConvenientMerchantVO.class)
@@ -56,10 +61,33 @@
}
@ApiOperation(value = "查询商品详情", response = ComShopFlowerGoodsVO.class)
- @PostMapping("shopGoodsDetail")
+ @GetMapping("shopGoodsDetail")
@ApiImplicitParam(name = "goodsId", value = "商品id", required = true)
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.下架 ")})
+ @GetMapping("/goods/changeStatus")
+ 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) {
+ return communityService.saveFlowerShopGoods(addShopGoodsVO);
}
@ApiOperation(value = "查询用户收货地址列表", response = ComShopUserAddressVO.class)
@@ -141,7 +169,7 @@
@PostMapping("orderDetail")
@ApiImplicitParam(name = "orderId", value = "订单id", required = true)
public R orderDetail(@RequestParam("orderId") Long orderId) {
- return communityService.orderDetail(orderId);
+ return communityService.orderDetailFlower(orderId);
}
@ApiOperation(value = "取消订单")
@@ -191,7 +219,7 @@
return R.fail("请重新登陆");
}
orderPayDTO.setOpenId(loginUserInfo.getOpenid());
- return communityService.wxPay(orderPayDTO);
+ return communityService.wxPayFlower(orderPayDTO);
}
/**
@@ -217,6 +245,13 @@
@ApiOperation(value = "保存评价")
@PostMapping("/saveEvaluate")
public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO) {
+ String evaluateContent = comShopFlowerEvaluateDTO.getEvaluateContent();
+ if (StrUtil.isNotBlank(evaluateContent)) {
+ String result = checkService.checkMessageBy(evaluateContent,this.getLoginUserInfo().getOpenid(),this.getAppId());
+ if (StrUtil.isNotBlank(result)) {
+ return R.fail(501, "填写内容存在 " + result + " 违规信息");
+ }
+ }
return communityService.saveEvaluate(comShopFlowerEvaluateDTO);
}
--
Gitblit v1.7.1