From 11899dc62d10c1c7778fbebb631f5ee25705b7db Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 21:36:08 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java |  592 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 356 insertions(+), 236 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 e764885..3c959cf 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,12 +1,11 @@
 package com.panzhihua.service_community.api;
 
-import com.panzhihua.common.model.dtos.shop.ComShopFlowerGoodsDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopFlowerGoodsDTO;
+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.ComShopFlowerGoodsService;
-import com.panzhihua.service_community.service.ConvenientMerchantService;
+import com.panzhihua.service_community.service.*;
+import com.panzhihua.service_community.util.QRCodeUtil;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -20,19 +19,21 @@
 
     @Resource
     private ComShopFlowerGoodsService comShopFlowerGoodsService;
-//    @Resource
+    //    @Resource
 //    private ComShopOperLogService comShopOperLogService;
-//    @Resource
-//    private ComShopOrderService comShopOrderService;
-//    @Resource
+    @Resource
+    private ComShopFlowerOrderService comShopFlowerOrderService;
+    //    @Resource
 //    private ComShopCartService comShopCartService;
-//    @Resource
-//    private ComShopUserAddressService comShopUserAddressService;
+    @Resource
+    private ComShopFlowerUserAddressService comShopUserAddressService;
 
     @Resource
     private ConvenientMerchantService convenientMerchantService;
     @Resource
-    private UserService userService;
+    private ComShopFlowerEvaluateService comShopFlowerEvaluateService;
+    @Resource
+    private ComShopFlowerOrderDeliveryService comShopFlowerOrderDeliveryService;
 
 
     /**
@@ -93,6 +94,17 @@
     }
 
     /**
+     * 根据商品id查询商品详情
+     *
+     * @param goodsId 商品id
+     * @return 商品信息
+     */
+    @PostMapping("shopGoodsDetail")
+    public R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId) {
+        return comShopFlowerGoodsService.shopFlowerGoodsDetail(goodsId);
+    }
+
+    /**
      * 修改商品状态
      *
      * @param id
@@ -103,20 +115,339 @@
         return comShopFlowerGoodsService.changeStatus(id, status);
     }
 
-    /*
-     *//**
-     * 分页查询 商家订单
+    /**
+     * 查询用户收货地址列表
      *
-     * @param pageComShopOrderSearchDTO
-     *            分页数据
-     * @return 分页订单
-     *//*
-    @PostMapping("/order/page")
-    public R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
-        return comShopOrderService.pageShopOrder(pageComShopOrderSearchDTO);
+     * @param comShopAddressDTO 请求参数
+     * @return 用户收获地址列表
+     */
+    @PostMapping("shopUserAddressList")
+    public R shopFlowerUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
+        return comShopUserAddressService.shopUserAddressList(comShopAddressDTO);
     }
 
-    *//**
+    /**
+     * 用户添加书货地址
+     *
+     * @param comShopAddressDTO 请求参数
+     * @return 添加结果
+     */
+    @PostMapping("shopAddUserAddress")
+    public R shopFlowerAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
+        return comShopUserAddressService.shopAddUserAddress(comShopAddressDTO);
+    }
+
+    /**
+     * 用户修改收货地址
+     *
+     * @param comShopAddressDTO 请求参数
+     * @return 修改结果
+     */
+    @PostMapping("shopEditUserAddress")
+    public R shopFlowerEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
+        return comShopUserAddressService.shopEditUserAddress(comShopAddressDTO);
+    }
+
+    /**
+     * 用户删除收货地址
+     *
+     * @param addressId 收货地址id
+     * @return 删除结果
+     */
+    @PostMapping("shopDelUserAddress")
+    public R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId) {
+        return comShopUserAddressService.shopDelUserAddress(addressId);
+    }
+
+    /**
+     * 订单预览
+     *
+     * @param orderPreviewDTO 请求参数
+     * @return 订单预览数据
+     */
+    @PostMapping("orderPreview")
+    public R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
+        return comShopFlowerOrderService.orderPreview(orderPreviewDTO);
+    }
+
+    /**
+     * 创建订单
+     *
+     * @param orderCreateDTO 创建订单请求参数
+     * @return 创建结果
+     */
+    @PostMapping("orderCreate")
+    public R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
+        return comShopFlowerOrderService.orderCreate(orderCreateDTO);
+    }
+
+    /**
+     * 分页查询用户订单列表
+     *
+     * @param comOrderListDTO 请求参数
+     * @return 查询结果
+     */
+    @PostMapping("pageOrderList")
+    public R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO) {
+        return comShopFlowerOrderService.pageOrderList(comOrderListDTO);
+    }
+
+    /**
+     * 根据订单id查询订单详情
+     *
+     * @param orderId 订单id
+     * @return 订单详情
+     */
+    @PostMapping("orderDetail")
+    public R orderDetailFlower(@RequestParam("orderId") Long orderId) {
+        return comShopFlowerOrderService.orderDetail(orderId);
+    }
+
+    /**
+     * 根据订单id取消订单
+     *
+     * @param comShopOrderQueryDTO 请求参数
+     * @return 取消结果
+     */
+    @PostMapping("orderCancel")
+    public R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
+        return comShopFlowerOrderService.orderCancel(comShopOrderQueryDTO);
+    }
+
+    /**
+     * 根据订单id删除订单
+     *
+     * @param orderId 订单id
+     * @return 删除结果
+     */
+    @PostMapping("orderDelete")
+    public R orderDeleteFlower(@RequestParam("orderId") Long orderId) {
+        return comShopFlowerOrderService.orderDelete(orderId);
+    }
+
+    /**
+     * 根据订单id确认收货
+     *
+     * @param comShopOrderQueryDTO 请求参数
+     * @return 确认结果
+     */
+    @PostMapping("orderConfirm")
+    public R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
+        return comShopFlowerOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
+    }
+
+    /**
+     * 分页查询 商家订单
+     *
+     * @param pageComShopOrderSearchDTO 分页数据
+     * @return 分页订单
+     */
+    @PostMapping("/order/page")
+    public R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
+        return comShopFlowerOrderService.pageShopOrder(pageComShopOrderSearchDTO);
+    }
+
+    /**
+     * 订单发货
+     *
+     * @param orderShipDTO 发货信息
+     * @return 发货结果
+     */
+    @PostMapping("/shipOrder")
+    public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) {
+        return comShopFlowerOrderService.shipOrder(orderShipDTO);
+    }
+
+    /**
+     * 订单配送
+     *
+     * @param deliverDTO 订单ID
+     * @return 配送结果
+     */
+    @PostMapping("/deliverOrder")
+    public R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
+        return comShopFlowerOrderService.deliverOrder(deliverDTO);
+    }
+
+    /**
+     * 订单配送
+     *
+     * @param deliverDTO 订单ID
+     * @return 配送完成
+     */
+    @PostMapping("/finishDeliverOrder")
+    public R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
+        return comShopFlowerOrderService.finishDeliverOrder(deliverDTO);
+    }
+
+
+    /**
+     * 保存评价
+     *
+     * @param comShopFlowerEvaluateDTO
+     * @return
+     */
+    @PostMapping("/saveEvaluate")
+    public R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO) {
+        return comShopFlowerEvaluateService.saveEvaluate(comShopFlowerEvaluateDTO);
+    }
+
+    /**
+     * 分页查询评价
+     *
+     * @param pageComShopFlowerEvaluateDTO
+     * @return
+     */
+    @PostMapping("/pageEvaluate")
+    public R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO) {
+        return comShopFlowerEvaluateService.pageEvaluate(pageComShopFlowerEvaluateDTO);
+    }
+
+    /**
+     * 评价详情
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/detailEvaluate")
+    public R detailEvaluate(@RequestParam("id") Long id) {
+        return comShopFlowerEvaluateService.detailEvaluate(id);
+    }
+
+    /**
+     * 删除评价
+     *
+     * @param id
+     * @return
+     */
+    @DeleteMapping("deleteEvaluate")
+    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) {
+        return R.ok(QRCodeUtil.getBase64QRCode(id.toString()));
+    }
+
+
+    /**
+     * 保存配送单
+     *
+     * @param comShopFlowerOrderDeliveryDTO
+     */
+    @PostMapping("saveDelivery")
+    public R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+        return comShopFlowerOrderDeliveryService.saveDelivery(comShopFlowerOrderDeliveryDTO);
+    }
+
+    /**
+     * 更新配送单
+     *
+     * @param comShopFlowerOrderDeliveryDTO
+     */
+    @PostMapping("updateDelivery")
+    public R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO) {
+        return comShopFlowerOrderDeliveryService.updateDelivery(comShopFlowerOrderDeliveryDTO);
+    }
+
+    /**
+     * 已配送、已送达 分页查询
+     *
+     * @param pageComFlowerOrderDeliveryDTO
+     * @return
+     */
+    @PostMapping("pageDelivery")
+    public R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+        return comShopFlowerOrderDeliveryService.pageDelivery(pageComFlowerOrderDeliveryDTO);
+    }
+
+    /**
+     * 未配送 分页查询
+     *
+     * @param pageComFlowerOrderDeliveryDTO
+     * @return
+     */
+    @PostMapping("pageNoDelivery")
+    public R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO) {
+        return comShopFlowerOrderDeliveryService.pageNoDelivery(pageComFlowerOrderDeliveryDTO);
+    }
+
+    /**
+     * 未配送-开始配送-订单列表
+     *
+     * @param pageComFlowerOrderListDTO
+     * @return
+     */
+    @PostMapping("pageNoDeliveryOrderList")
+    public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+        return comShopFlowerOrderDeliveryService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO);
+    }
+
+    /**
+     * 根据商家id查询商家的订单
+     *
+     * @param pageComFlowerOrderListDTO
+     * @return
+     */
+    @PostMapping("pageOrderByStoreId")
+    public R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
+        return comShopFlowerOrderService.pageOrderByStoreId(pageComFlowerOrderListDTO);
+    }
+
+    /**
+     * 微信支付订单回调
+     *
+     * @param wxPayNotifyOrderDTO
+     *            订单支付回调参数
+     */
+    @PostMapping("/wxOrderPayNotify")
+    public void wxOrderPayNotifyFlower(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
+        comShopFlowerOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
+    }
+
+    /**
+     * 点击去支付订单
+     *
+     * @param orderPayDTO
+     *            请求参数
+     * @return 支付对象
+     */
+    @PostMapping("/wxPay")
+    public R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO) {
+        return comShopFlowerOrderService.wxPay(orderPayDTO);
+    }
+
+    @GetMapping("/selectCountByDeliveryType")
+    public R selectCountByDeliveryType(Integer deliveryType){
+        return comShopFlowerOrderService.selectCountByDeliveryType(deliveryType);
+    }
+
+
+    /**
+     * 统计用户订单数量
+     *
+     * @param userId
+     *            用户id
+     * @return 统计结果
+     */
+/*    @PostMapping("orderStatistics")
+    public R orderStatistics(@RequestParam("userId") Long userId) {
+        return comShopOrderService.orderStatistics(userId);
+    }*/
+
+
+    /*
+
+
+     *//**
      * 根据店铺id查询店铺详情
      *
      * @param comShopStoreDTO
@@ -128,186 +459,7 @@
         return comShopStoreService.shopStoreDetail(comShopStoreDTO);
     }
 
-    *//**
-     * 分页查询商品列表
-     *
-     * @param comShopGoodsDTO
-     *            请求参数
-     * @return 商品列表
-     *//*
-    @PostMapping("/pageShopGoods")
-    public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
 
-        return comShopFlowerGoodsService.pageShopGoods(comShopGoodsDTO);
-    }
-
-    *//**
-     * 根据商品id查询商品详情
-     *
-     * @param goodsId
-     *            商品id
-     * @return 商品信息
-     *//*
-    @PostMapping("shopGoodsDetail")
-    public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
-        return comShopFlowerGoodsService.shopGoodsDetail(goodsId);
-    }
-
-    *//**
-     * 根据用户id查询购物车列表
-     *
-     * @param userId
-     *            用户id
-     * @return 购物车列表信息
-     *//*
-    @PostMapping("shopCartList")
-    public R shopCartList(@RequestParam("userId") Long userId) {
-        return comShopCartService.shopCartList(userId);
-    }
-
-    *//**
-     * 查询用户收货地址列表
-     *
-     * @param comShopAddressDTO
-     *            请求参数
-     * @return 用户收获地址列表
-     *//*
-    @PostMapping("shopUserAddressList")
-    public R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
-        return comShopUserAddressService.shopUserAddressList(comShopAddressDTO);
-    }
-
-    *//**
-     * 用户添加书货地址
-     *
-     * @param comShopAddressDTO
-     *            请求参数
-     * @return 添加结果
-     *//*
-    @PostMapping("shopAddUserAddress")
-    public R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
-        return comShopUserAddressService.shopAddUserAddress(comShopAddressDTO);
-    }
-
-    *//**
-     * 用户修改收货地址
-     *
-     * @param comShopAddressDTO
-     *            请求参数
-     * @return 修改结果
-     *//*
-    @PostMapping("shopEditUserAddress")
-    public R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
-        return comShopUserAddressService.shopEditUserAddress(comShopAddressDTO);
-    }
-
-    *//**
-     * 用户删除收货地址
-     *
-     * @param addressId
-     *            收货地址id
-     * @return 删除结果
-     *//*
-    @PostMapping("shopDelUserAddress")
-    public R shopDelUserAddress(@RequestParam("addressId") Long addressId) {
-        return comShopUserAddressService.shopDelUserAddress(addressId);
-    }
-
-    *//**
-     * 订单预览
-     *
-     * @param orderPreviewDTO
-     *            请求参数
-     * @return 订单预览数据
-     *//*
-    @PostMapping("orderPreview")
-    public R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
-        return comShopOrderService.orderPreview(orderPreviewDTO);
-    }
-
-    *//**
-     * 创建订单
-     *
-     * @param orderCreateDTO
-     *            创建订单请求参数
-     * @return 创建结果
-     *//*
-    @PostMapping("orderCreate")
-    public R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
-        return comShopOrderService.orderCreate(orderCreateDTO);
-    }
-
-    *//**
-     * 分页查询用户订单列表
-     *
-     * @param comOrderListDTO
-     *            请求参数
-     * @return 查询结果
-     *//*
-    @PostMapping("pageOrderList")
-    public R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO) {
-        return comShopOrderService.pageOrderList(comOrderListDTO);
-    }
-
-    *//**
-     * 根据订单id查询订单详情
-     *
-     * @param orderId
-     *            订单id
-     * @return 订单详情
-     *//*
-    @PostMapping("orderDetail")
-    public R orderDetail(@RequestParam("orderId") Long orderId) {
-        return comShopOrderService.orderDetail(orderId);
-    }
-
-    *//**
-     * 根据订单id取消订单
-     *
-     * @param comShopOrderQueryDTO
-     *            请求参数
-     * @return 取消结果
-     *//*
-    @PostMapping("orderCancel")
-    public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
-        return comShopOrderService.orderCancel(comShopOrderQueryDTO);
-    }
-
-    *//**
-     * 根据订单id删除订单
-     *
-     * @param orderId
-     *            订单id
-     * @return 删除结果
-     *//*
-    @PostMapping("orderDelete")
-    public R orderDelete(@RequestParam("orderId") Long orderId) {
-        return comShopOrderService.orderDelete(orderId);
-    }
-
-    *//**
-     * 根据订单id确认收货
-     *
-     * @param comShopOrderQueryDTO
-     *            请求参数
-     * @return 确认结果
-     *//*
-    @PostMapping("orderConfirm")
-    public R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
-        return comShopOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
-    }
-
-    *//**
-     * 统计用户订单数量
-     *
-     * @param userId
-     *            用户id
-     * @return 统计结果
-     *//*
-    @PostMapping("orderStatistics")
-    public R orderStatistics(@RequestParam("userId") Long userId) {
-        return comShopOrderService.orderStatistics(userId);
-    }
 
 
 
@@ -322,41 +474,7 @@
         return comShopOrderService.capitalDetailByStore(id);
     }
 
-    *//**
-     * 订单发货
-     *
-     * @param orderShipDTO
-     *            发货信息
-     * @return 发货结果
-     *//*
-    @PostMapping("/shipOrder")
-    R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO) {
-        return comShopOrderService.shipOrder(orderShipDTO);
-    }
 
-    *//**
-     * 订单配送
-     *
-     * @param deliverDTO
-     *            订单ID
-     * @return 配送结果
-     *//*
-    @PostMapping("/deliverOrder")
-    R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
-        return comShopOrderService.deliverOrder(deliverDTO);
-    }
-
-    *//**
-     * 订单配送
-     *
-     * @param deliverDTO
-     *            订单ID
-     * @return 配送完成
-     *//*
-    @PostMapping("/finishDeliverOrder")
-    R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
-        return comShopOrderService.finishDeliverOrder(deliverDTO);
-    }
 
     *//**
      * 订单导出信息
@@ -489,4 +607,6 @@
         Boolean isMcsValid = userService.checkUserIsValid(userId, 11);
         return R.ok(isShopValid || isConvenientValid || isMcsValid);
     }*/
+
+
 }

--
Gitblit v1.7.1