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 | 155 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 137 insertions(+), 18 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 fc1db3b..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,16 +1,24 @@
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.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
+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;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -23,21 +31,28 @@
@Slf4j
@RestController
@RequestMapping("/shopFlower/")
-@Api(tags = {"商城服务"})
+@Api(tags = {"花城商城服务"})
public class ShopFlowerApi extends BaseController {
@Resource
private CommunityService communityService;
+ @Resource
+ private CheckService checkService;
-/* @ApiOperation(value = "查询店铺详情", response = PageShopStoreVO.class)
- @PostMapping("shopstoredetail")
- public R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO) {
- if (comShopStoreDTO == null || comShopStoreDTO.getStoreId() == null) {
- return R.fail("参数错误");
- }
- return communityService.shopStoreDetail(comShopStoreDTO);
- }*/
+ @ApiOperation(value = "查询便民服务商家详情", response = ConvenientMerchantVO.class)
+ @GetMapping("/merchant/getMerchantByUserId")
+ public R getMerchant(@RequestParam("userId") Long userId) {
+ return communityService.getMerchantByUserId(userId);
+ }
+
+ @ApiOperation(value = "编辑便民服务商家")
+ @PutMapping("/merchant/put")
+ public R putMerchant(@RequestBody @Validated(PutGroup.class) ConvenientMerchantDTO convenientMerchantDTO) {
+ convenientMerchantDTO.setUpdatedBy(this.getUserId());
+ convenientMerchantDTO.setCreatedBy(this.getUserId());
+ return communityService.putMerchant(convenientMerchantDTO);
+ }
@ApiOperation(value = "分页查询商品列表", response = ComShopFlowerGoodsVO.class)
@PostMapping("pageShopGoods")
@@ -46,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)
@@ -131,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 = "取消订单")
@@ -181,7 +219,7 @@
return R.fail("请重新登陆");
}
orderPayDTO.setOpenId(loginUserInfo.getOpenid());
- return communityService.wxPay(orderPayDTO);
+ return communityService.wxPayFlower(orderPayDTO);
}
/**
@@ -200,60 +238,141 @@
/**
* 保存评价
+ *
* @param comShopFlowerEvaluateDTO
* @return
*/
@ApiOperation(value = "保存评价")
@PostMapping("/saveEvaluate")
- public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO){
+ 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);
}
/**
* 分页查询评价
+ *
* @param pageComShopFlowerEvaluateDTO
* @return
*/
- @ApiOperation(value = "分页查询评价",response = ComShopFlowerEvaluateVO.class)
+ @ApiOperation(value = "分页查询评价", response = ComShopFlowerEvaluateVO.class)
@PostMapping("/pageEvaluate")
- public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO){
+ public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO) {
return communityService.pageEvaluate(pageComShopFlowerEvaluateDTO);
}
/**
* 评价详情
+ *
* @param id
* @return
*/
@ApiOperation(value = "评价详情")
@GetMapping("/detailEvaluate")
- public R detailEvaluate(@RequestParam("id") Long id){
+ public R detailEvaluate(@RequestParam("id") Long id) {
return communityService.detailEvaluate(id);
}
/**
* 删除评价
+ *
* @param id
* @return
*/
@ApiOperation(value = "删除评价")
@DeleteMapping("deleteEvaluate")
- public R deleteEvaluate(@RequestParam("id") Long id){
+ public R deleteEvaluate(@RequestParam("id") Long id) {
return communityService.deleteEvaluate(id);
}
/**
* 取货码
+ *
* @param orderId
* @return
*/
@ApiOperation(value = "取货码")
@GetMapping("getQRCode")
@ApiImplicitParam(name = "orderId", value = "订单id", required = true)
- public R getQRCode(@RequestParam("orderId") Long orderId){
+ public R getQRCode(@RequestParam("orderId") Long orderId) {
return communityService.getQRCode(orderId);
}
+ /**
+ * 保存配送单
+ *
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("saveDelivery")
+ @ApiOperation(value = "保存配送单")
+ public R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+ return communityService.saveDelivery(comShopFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 更新配送单
+ *
+ * @param comShopFlowerOrderDeliveryDTO
+ */
+ @PostMapping("updateDelivery")
+ @ApiOperation(value = "更新配送单")
+ public R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+ return communityService.updateDelivery(comShopFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 已配送、已送达 分页查询
+ *
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @PostMapping("pageDelivery")
+ @ApiOperation(value = "已配送、已送达 分页查询", response = ComShopFlowerOrderDeliveryVO.class)
+ public R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+ return communityService.pageDelivery(pageComFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 未配送 分页查询
+ *
+ * @param pageComFlowerOrderDeliveryDTO
+ * @return
+ */
+ @ApiOperation(value = "未配送 分页查询", response = ConvenientElevatingPointVO.class)
+ @PostMapping("pageNoDelivery")
+ public R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+ return communityService.pageNoDelivery(pageComFlowerOrderDeliveryDTO);
+ }
+
+ /**
+ * 未配送-开始配送-订单列表
+ *
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @ApiOperation(value = "未配送-开始配送-订单列表", response = ComShopFlowerOrderPageVO.class)
+ @PostMapping("pageNoDeliveryOrderList")
+ public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+ return communityService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO);
+ }
+
+ /**
+ * 根据商家id查询商家的订单
+ *
+ * @param pageComFlowerOrderListDTO
+ * @return
+ */
+ @ApiOperation(value = "根据商家id分页查询商家的订单", response = ComShopFlowerOrderStoreListVO.class)
+ @PostMapping("pageOrderByStoreId")
+ public R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+ return communityService.pageOrderByStoreId(pageComFlowerOrderListDTO);
+ }
}
--
Gitblit v1.7.1