9.18

luodangjia

2024-09-18 a96c5eddcd63fa6f09e4cdce9e28c7b846068f0c

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java

@@ -142,8 +142,10 @@
    }
    @GetMapping("/consignerShoppingOrder")
    @ApiOperation(value = "发货", tags = {"管理后台-兑换订单"})
    public AjaxResult consignerShoppingOrder(String id) {
    public AjaxResult consignerShoppingOrder(String id,String companyName,String code) {
        TExchangeOrder byId = exchangeOrderService.getById(id);
        byId.setExpressCompany(companyName);
        byId.setExpressNumber(code);
        Long userid = tokenService.getLoginUser().getUserid();
        byId.setConsignerId(userid);
        byId.setConsignerTime(LocalDateTime.now());
@@ -221,7 +223,7 @@
     */
    @GetMapping("/getCodeByOrderId/{goodsIds}")
    public R<List<String>> getCodeByOrderId(@PathVariable("goodsIds") String goodsIds){
        String[] split = goodsIds.split("-");
        String[] split = goodsIds.split(",");
        List<String> strings = new ArrayList<>();
        for (String s : split) {
            if (s.contains("-")){