12.18

luodangjia

2025-01-24 c90a8ac772937f8f084356ea1f04c5dba1d9e5d5

12.18

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

@@ -31,6 +31,7 @@
import io.swagger.annotations.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -512,5 +513,13 @@
        orderService.updateById(order);
        return R.ok();
    }


    /**
     * 导入物流信息
     */
    @PostMapping("/importExpress")
    public R importExpress(@RequestParam("file") MultipartFile file){
    }
}


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java

@@ -6,8 +6,7 @@
import com.ruoyi.order.model.Order;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.vo.*;
import org.omg.CORBA.INTERNAL;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.multipart.MultipartFile;

import java.util.List;

@@ -113,4 +112,9 @@
     * 定时查询快递信息
     */
    void taskExpress();

    /**
     * 导入物流信息
     */
    void importExpress(MultipartFile file);
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -35,12 +35,15 @@
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import org.apache.poi.ss.usermodel.*;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
@@ -901,4 +904,19 @@
            }
        }
    }

    @Override
    public void importExpress(MultipartFile file) {
        try (InputStream inputStream = file.getInputStream()) {
            Workbook workbook = WorkbookFactory.create(inputStream);
            Sheet sheet = workbook.getSheetAt(0); // 获取第一个Sheet

            for (Row row : sheet) {
//                cell.getStringCellValue()
                System.out.println();
            }
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
    }
}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java

@@ -56,6 +56,19 @@
    }

    /**
     * 商品克隆
     */
    @GetMapping("/cloneGoods")
    @ApiOperation(value = "商品克隆", tags = {"管理后台-商品管理"})
    public R<Void> cloneGoods(@RequestParam Long goodsId,@RequestParam String goodsName) {
        Goods goods = goodsService.getManageGoodsDetail(goodsId);
        goods.setId(null);
        goods.setName(goodsName);
        goodsService.addGoods(goods);
        return R.ok();
    }

    /**
     * 管理后台商品列表
     */
    @GetMapping("/manageGoodsList")

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RechargeSetController.java

@@ -1,12 +1,15 @@
package com.ruoyi.other.controller;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.account.api.model.UserClickLog;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.BaseSetting;
import com.ruoyi.other.api.domain.RechargeSet;
import com.ruoyi.other.dto.RechargeDto;
import com.ruoyi.other.service.BaseSettingService;
import com.ruoyi.other.service.RechargeSetService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +30,8 @@
public class RechargeSetController {
    @Resource
    private RechargeSetService rechargeSetService;
    @Resource
    private BaseSettingService baseSettingService;

    @GetMapping("/list")
    @ApiOperation(value = "充值设置查询", tags = {"后台"})
@@ -42,6 +47,11 @@
        List<RechargeSet> list = rechargeSetService.list();
        rechargeSetService.removeBatchByIds(list);
        rechargeSetService.saveBatch(rechargeDto.getRechargeDto());
        if (rechargeDto.getResetQuota() != null){
            baseSettingService.update(new LambdaUpdateWrapper<BaseSetting>()
                    .eq(BaseSetting::getId, 7)
                    .set(BaseSetting::getContent, rechargeDto.getResetQuota().toString()));
        }
        return R.ok();
    }


 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/dto/RechargeDto.java

@@ -1,9 +1,12 @@
package com.ruoyi.other.dto;

import com.ruoyi.other.api.domain.RechargeSet;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -11,6 +14,9 @@
 * @date 2024/12/18 18:03
 */
@Data
@ApiModel(value = "RechargeDto对象", description = "充值设置")
public class RechargeDto {
    @ApiModelProperty(value = "重置限额")
    private BigDecimal resetQuota;
    private List<RechargeSet> rechargeDto;
}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GoodsService.java

@@ -32,4 +32,5 @@
    IPage<Goods> getManageGoodsList(Page<Goods> page, Goods goods);

    Goods getManageGoodsDetail(Long goodsId);

}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java

@@ -673,4 +673,5 @@
        }
        return price;
    }

}