修改文件上传类型限制

mitao

2025-05-20 179c4d64313c9b7572778da4aaaf6c6584fe457d

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java

@@ -8,6 +8,7 @@
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.ConvenientElevatingPointOrderVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
@@ -52,7 +53,6 @@
    @PutMapping("/merchant/put")
    public R putMerchant(@RequestBody @Validated(PutGroup.class) ConvenientMerchantDTO convenientMerchantDTO) {
        convenientMerchantDTO.setUpdatedBy(this.getUserId());
        convenientMerchantDTO.setCreatedBy(this.getUserId());
        return communityService.putMerchant(convenientMerchantDTO);
    }

@@ -175,7 +175,15 @@
    @GetMapping("orderDetail")
    @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
    public R orderDetail(@RequestParam("orderId") Long orderId) {
        return communityService.orderDetailFlower(orderId);
        return communityService.orderDetailFlower(orderId,null);
    }

    @ApiOperation(value = "自提点查询订单详情", response = ComShopFlowerOrderPageVO.class)
    @GetMapping("pointOrderDetail")
    @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
    public R pointOrderDetail(@RequestParam("orderId") Long orderId) {
        String phone = this.getLoginUserInfo().getPhone();
        return communityService.orderDetailFlower(orderId,phone);
    }

    @ApiOperation(value = "取消订单")
@@ -223,12 +231,28 @@
     * @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);
    }

    /**
@@ -352,7 +376,7 @@
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @ApiOperation(value = "未配送-开始配送-订单列表", response = ComShopFlowerOrderPageVO.class)
    @ApiOperation(value = "未配送-开始配送-订单列表", response = ConvenientElevatingPointOrderVO.class)
    @PostMapping("pageNoDeliveryOrderList")
    public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
        return communityService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO);
@@ -405,9 +429,21 @@
    @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);
    }

@@ -512,4 +548,28 @@
        return communityService.refundOrderDetail(id);
    }

    /**
     * 清点商品 确认送达详情
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("pageOrderByDeliveryNo")
    @ApiOperation(value = "清点商品 确认送达详情",response = ComShopFlowerOrderDeliveryNoListVO.class)
    public R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO){
        return communityService.pageOrderByDeliveryNo(pageComFlowerOrderListDTO);
    }


    /**
     * 订单发货
     *
     * @param orderShipDTO 发货信息
     * @return 发货结果
     */
    @PostMapping("/shipOrderFlower")
    @ApiOperation(value = "订单发货")
    public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) {
        orderShipDTO.setOperUserAccount(this.getLoginUserInfo().getAccount());
        return communityService.shipOrderFlower(orderShipDTO);
    }
}