岐济生
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
luodangjia
2025-02-07 8ffeb751b3a694e8d1cb6a21bec855f6c49b31b6 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java


@@ -9,6 +9,7 @@


import com.ruoyi.account.api.model.UserAddress;


import com.ruoyi.common.core.domain.R;


import com.ruoyi.common.core.utils.StringUtils;


import com.ruoyi.common.core.utils.poi.ExcelUtil;


import com.ruoyi.common.core.web.controller.BaseController;


import com.ruoyi.common.core.web.page.PageInfo;


import com.ruoyi.common.core.web.page.TableDataInfo;


@@ -29,6 +30,10 @@


import com.ruoyi.system.api.feignClient.SysUserClient;


import com.ruoyi.system.api.model.LoginUser;


import io.swagger.annotations.*;


import org.springframework.core.io.InputStreamResource;


import org.springframework.http.HttpHeaders;


import org.springframework.http.MediaType;


import org.springframework.http.ResponseEntity;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.multipart.MultipartFile;


@@ -37,8 +42,10 @@


import javax.servlet.http.HttpServletResponse;


import javax.validation.constraints.NotBlank;


import java.io.IOException;


import java.io.InputStream;


import java.io.PrintWriter;


import java.math.BigDecimal;


import java.net.URL;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.time.LocalDateTime;


@@ -239,7 +246,6 @@


        List<Order> list = orderService.lambdaQuery()


                .eq(Order::getAppUserId, appUserId)


                .eq(null != shopId && -1 != shopId, Order::getShopId, shopId)


                .eq(Order::getDistributionMode, 1)


                .eq(Order::getPayStatus, 2)


                .isNull(Order::getRefundStatus)


                .eq(Order::getDelFlag, 0)


@@ -262,10 +268,7 @@


        return R.ok(list);


    }




    


    


    


    




    


    @PostMapping("/confirmDelivery")


    @ApiOperation(value = "已发货操作", tags = {"管理后台-订单管理"})


@@ -519,7 +522,37 @@


     * 导入物流信息


     */


    @PostMapping("/importExpress")


    public R importExpress(@RequestParam("file") MultipartFile file){


    public R importExpress(@RequestBody String url){


        JSONObject jsonObject = JSONObject.parseObject(url);


        String url2 = jsonObject.getString("url");


        orderService.importExpress(url2);


        return R.ok();


    }




    /**


     * 导出订单信息


     */


    @GetMapping("/exportExpress")


    public void exportExpress(HttpServletResponse response,OrderPageList orderPage){


        PageInfo<OrderPageListVo> orderPageList = orderService.getOrderPageList(orderPage);


        List<OrderPageListVo> list = orderPageList.getRecords();


        ExcelUtil<OrderPageListVo> util = new ExcelUtil<OrderPageListVo>(OrderPageListVo.class);


        util.exportExcel(response, list, "订单数据");


    }


    


    


    /**


     * 获取用户订单数量


     * @param appUserId


     * @return


     */


    @PostMapping("/getOrderCountByAppUserId")


    public R<Long> getOrderCountByAppUserId(@RequestParam("id") Long appUserId){


        long count = orderService.count(new LambdaQueryWrapper<Order>().eq(Order::getDelFlag, 0)


                .eq(Order::getAppUserId, appUserId).in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 7, 8))


                .eq(Order::getPayStatus, 2));


        return R.ok(count);


    }




}