java/zhihuishenqu.git

			@@ -35,6 +35,7 @@
			import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
			import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
			import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
			import io.swagger.annotations.ApiOperation;
			import io.swagger.annotations.ApiParam;
			import org.springframework.cloud.openfeign.FeignClient;
			import org.springframework.scheduling.annotation.Async;
			@@ -2987,6 +2988,16 @@
			*/
			@GetMapping("/shopFlower/changeShopGoodsStatus")
			R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);

			/**
			* 修改商品状态
			*
			* @param goodsId
			* @return
			*/
			@PostMapping("/shopFlower/shopGoodsDetail")
			R shopFlowerGoodsDetail(@RequestParam("goodsId") Long goodsId);



			/**
			@@ -6528,6 +6539,14 @@
			*/
			@GetMapping("/convenient/merchant/get")
			R getMerchant(@RequestParam("merchantId") Long merchantId);

			/**
			* 获取便民服务商家详情
			* @param userId
			* @return
			*/
			@GetMapping("/convenient/merchant/getMerchantByUserId")
			R getMerchantByUserId(@RequestParam("userId") Long userId);

			/**
			* 禁用/启用便民服务商家
			@@ -10694,4 +10713,272 @@
			* */
			@GetMapping("comProperty/noticeList")
			R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId);

			/**
			* 获取所有商品分类
			* @return
			*/
			@GetMapping("/goodsCategory/getAllGoodsCategories")
			R getAllGoodsCategories();

			/**
			* 分页查询用户收货地址列表
			*
			* @param comShopAddressDTO
			* 请求参数
			* @return 用户收货地址列表
			*/
			@PostMapping("/shopFlower/shopUserAddressList")
			R shopFlowerUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);

			/**
			* 用户添加收货地址
			*
			* @param comShopAddressDTO
			* 请求参数
			* @return 添加结果
			*/
			@PostMapping("/shopFlower/shopAddUserAddress")
			R shopFlowerAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

			/**
			* 用户修改收货地址
			*
			* @param comShopAddressDTO
			* 请求参数
			* @return 修改结果
			*/
			@PostMapping("/shopFlower/shopEditUserAddress")
			R shopFlowerEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

			/**
			* 用户删除收货地址
			*
			* @param addressId
			* 收货地址id
			* @return 删除结果
			*/
			@PostMapping("/shopFlower/shopDelUserAddress")
			R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId);

			/**
			* 订单预览
			*
			* @param orderPreviewDTO 请求参数
			* @return 订单预览数据
			*/
			@PostMapping("/shopFlower/orderPreview")
			R orderPreviewFlower(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);

			/**
			* 创建订单
			*
			* @param orderCreateDTO 创建订单请求参数
			* @return 创建结果
			*/
			@PostMapping("/shopFlower/orderCreate")
			R orderCreateFlower(@RequestBody ComShopOrderCreateDTO orderCreateDTO);

			/**
			* 分页查询用户订单列表
			*
			* @param comOrderListDTO 请求参数
			* @return 查询结果
			*/
			@PostMapping("/shopFlower/pageOrderList")
			R pageOrderListFlower(@RequestBody PageComFlowerOrderListDTO comOrderListDTO);

			/**
			* 根据订单id查询订单详情
			*
			* @param orderId 订单id
			* @return 订单详情
			*/
			@PostMapping("/shopFlower/orderDetail")
			R orderDetailFlower(@RequestParam("orderId") Long orderId);

			/**
			* 根据订单id取消订单
			*
			* @param comShopOrderQueryDTO 请求参数
			* @return 取消结果
			*/
			@PostMapping("/shopFlower/orderCancel")
			R orderCancelFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

			/**
			* 根据订单id删除订单
			*
			* @param orderId 订单id
			* @return 删除结果
			*/
			@PostMapping("/shopFlower/orderDelete")
			R orderDeleteFlower(@RequestParam("orderId") Long orderId);

			/**
			* 根据订单id确认收货
			*
			* @param comShopOrderQueryDTO 请求参数
			* @return 确认结果
			*/
			@PostMapping("/shopFlower/orderConfirm")
			R orderConfirmFlower(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

			/**
			* 分页查询商家订单
			*
			* @param pageComShopOrderSearchDTO 分页数据
			* @return 分页订单
			*/
			@PostMapping("/shopFlower/order/page")
			R pageShopOrderFlower(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
			/**
			* 订单发货
			*
			* @param orderShipDTO 发货信息
			* @return 发货结果
			*/
			@PostMapping("/shopFlower/shipOrder")
			R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO);

			/**
			* 订单配送
			*
			* @param deliverDTO 订单ID
			* @return 配送结果
			*/
			@PostMapping("/shopFlower/deliverOrder")
			R deliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);

			/**
			* 订单配送
			*
			* @param deliverDTO 订单ID
			* @return 配送完成
			*/
			@PostMapping("/shopFlower/finishDeliverOrder")
			R finishDeliverOrderFlower(@RequestBody ComShopOrderDeliverDTO deliverDTO);

			/**
			* 获取当前商铺周围的自提点信息以及距离手机距离
			*
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/point/findPointByMerchantId")
			R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng);

			/**
			* 保存评价
			* @param comShopFlowerEvaluateDTO
			* @return
			*/
			@PostMapping("/shopFlower/saveEvaluate")
			R saveEvaluate(@RequestBody ComShopFlowerEvaluateDTO comShopFlowerEvaluateDTO);

			/**
			* 分页查询评价
			* @param pageComShopFlowerEvaluateDTO
			* @return
			*/
			@PostMapping("/pageEvaluate")
			R pageEvaluate(@RequestBody PageComShopFlowerEvaluateDTO pageComShopFlowerEvaluateDTO);

			/**
			* 评价详情
			* @param id
			* @return
			*/
			@GetMapping("/shopFlower/detailEvaluate")
			R detailEvaluate(@RequestParam("id") Long id);

			/**
			* 删除评价
			* @param id
			* @return
			*/
			@DeleteMapping("/shopFlower/deleteEvaluate")
			R deleteEvaluate(@RequestParam("id") Long id);

			/**
			* 取货码
			* @param id
			* @return
			*/
			@ApiOperation(value = "取货码")
			@GetMapping("/shopFlower/getQRCode")
			R getQRCode(@RequestParam("id") Long id);

			/**
			* 保存配送单
			* @param comShopFlowerOrderDeliveryDTO
			*/
			@PostMapping("/shopFlower/saveDelivery")
			R saveDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

			/**
			* 更新配送单
			* @param comShopFlowerOrderDeliveryDTO
			*/
			@PostMapping("/shopFlower/updateDelivery")
			R updateDelivery(@RequestBody ComShopFlowerOrderDeliveryDTO comShopFlowerOrderDeliveryDTO);

			/**
			* 已配送、已送达分页查询
			* @param pageComFlowerOrderDeliveryDTO
			* @return
			*/
			@PostMapping("/shopFlower/pageDelivery")
			R pageDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

			/**
			* 未配送分页查询
			* @param pageComFlowerOrderDeliveryDTO
			* @return
			*/
			@PostMapping("/shopFlower/pageNoDelivery")
			R pageNoDelivery(@RequestBody PageComFlowerOrderDeliveryDTO pageComFlowerOrderDeliveryDTO);

			/**
			* 未配送-开始配送-订单列表
			* @param pageComFlowerOrderListDTO
			* @return
			*/
			@PostMapping("/shopFlower/pageNoDeliveryOrderList")
			R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

			/**
			* 根据商家id查询商家的订单
			* @param pageComFlowerOrderListDTO
			* @return
			*/
			@PostMapping("/shopFlower/pageOrderByStoreId")
			R pageOrderByStoreId(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

			/**
			* 微信支付订单回调
			*
			* @param wxPayNotifyOrderDTO
			* 订单支付回调参数
			*/
			@PostMapping("/shopFlower/wxOrderPayNotify")
			void wxOrderPayNotifyFlower(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);

			/**
			* 点击去支付订单
			*
			* @param orderPayDTO
			* 请求参数
			* @return 支付对象
			*/
			@PostMapping("/shopFlower/wxPay")
			R wxPayFlower(@RequestBody OrderPayDTO orderPayDTO);

			/**
			* 统计查询订单数量
			* @param deliveryType
			* @return
			*/
			@GetMapping("/shopFlower/selectCountByDeliveryType")
			R selectCountByDeliveryType(Integer deliveryType);
			}