| | |
| | | @PutMapping("/merchant/put") |
| | | public R putMerchant(@RequestBody @Validated(PutGroup.class) ConvenientMerchantDTO convenientMerchantDTO) { |
| | | convenientMerchantDTO.setUpdatedBy(this.getUserId()); |
| | | convenientMerchantDTO.setCreatedBy(this.getUserId()); |
| | | return communityService.putMerchant(convenientMerchantDTO); |
| | | } |
| | | |
| | |
| | | * @param merchantId |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "获取自提点") |
| | | @ApiOperation(value = "获取自提点",response = ConvenientElevatingPointVO.class) |
| | | @ApiImplicitParams({@ApiImplicitParam(name = "merchantId", value = "商家Id", required = true), |
| | | @ApiImplicitParam(name = "lat", value = "经度", required = true), @ApiImplicitParam(name = "lng", value = "纬度", required = true)}) |
| | | @GetMapping("/point/findPointByMerchantId") |
| | | public R findPointByMerchantId(@RequestParam("merchantId") Long merchantId, @RequestParam("lat") String lat, @RequestParam("lng") String lng) { |
| | | return communityService.findPointByMerchantId(merchantId, lat, lng); |
| | | } |
| | | /** |
| | | * 获取商家周围 n(km)的自提点数量 |
| | | * |
| | | * @param distance |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "获取商家周围 n(km)的自提点数量") |
| | | @ApiImplicitParams({@ApiImplicitParam(name = "distance", value = "距离", required = false), |
| | | @ApiImplicitParam(name = "lat", value = "经度", required = true), @ApiImplicitParam(name = "lng", value = "纬度", required = true)}) |
| | | @GetMapping("/point/findPointNumByDistance") |
| | | public R findPointNumByDistance(@RequestParam(value = "distance",required = false) Integer distance, @RequestParam("lat") String lat, @RequestParam("lng") String lng) { |
| | | if (null == distance){ |
| | | return R.ok(0); |
| | | } |
| | | return communityService.findPointNumByDistance(distance, lat, lng); |
| | | } |
| | | |
| | | /** |
| | |
| | | @PostMapping("pageRefundOrder") |
| | | @ApiOperation(value = "退款订单分页查询 用户", response = ComShopFlowerRefundOrderVO.class) |
| | | public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) { |
| | | if (null == pageComOrderRefundDTO.getStoreId()){ |
| | | pageComOrderRefundDTO.setUserId(this.getUserId()); |
| | | } |
| | | pageComOrderRefundDTO.setUserId(this.getUserId()); |
| | | return communityService.pageRefundOrder(pageComOrderRefundDTO); |
| | | } |
| | | |
| | | /** |
| | | * 商家 分页查询退款订单 |
| | | * |
| | | * @param pageComOrderRefundDTO |
| | | * @return |
| | | */ |
| | | @PostMapping("pageRefundOrderStore") |
| | | @ApiOperation(value = "退款订单分页查询 商家", response = ComShopFlowerRefundOrderVO.class) |
| | | public R pageRefundOrderStore(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) { |
| | | LoginUserInfoVO loginUserInfo = this.getLoginUserInfo(); |
| | | pageComOrderRefundDTO.setStoreId(loginUserInfo.getStoreIdId()); |
| | | return communityService.pageRefundOrder(pageComOrderRefundDTO); |
| | | } |
| | | |
| | |
| | | @PostMapping("/shipOrderFlower") |
| | | @ApiOperation(value = "订单发货") |
| | | public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) { |
| | | orderShipDTO.setOperUserAccount(this.getLoginUserInfo().getAccount()); |
| | | return communityService.shipOrderFlower(orderShipDTO); |
| | | } |
| | | } |