From fb97f83e39a0995fb70326c492a0bcd37af5e300 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 12 十一月 2025 17:45:57 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
index ad38e30..0a96087 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
@@ -172,11 +172,11 @@
}
}
}
- @Log(title = "商户信息导入", businessType = BusinessType.INSERT)
+ @Log(title = "商户信息-商户信息导入", businessType = BusinessType.INSERT)
@ApiOperation(value = "商户信息导入")
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
@PostMapping("/import")
- public R<String> importLocation(@RequestPart("file") MultipartFile file) {
+ public R<String> importInfo(@RequestPart("file") MultipartFile file) {
List<TMerchant> merchants = new ArrayList<>();
ImportParams params = new ImportParams();
params.setHeadRows(1); //表头行数
@@ -205,21 +205,26 @@
for (MerchantImport merchantImport : merchantImports) {
if (!StringUtils.hasLength(merchantImport.getMerchantName())){
result.append("第"+i+"行：[", "商户名称"+"]不能为空");
+ continue;
}
if (!StringUtils.hasLength(merchantImport.getMerchantPhone())){
result.append("第"+i+"行：[", "商户电话"+"]不能为空");
+ continue;
}
if (!StringUtils.hasLength(merchantImport.getTypeName())){
result.append("第"+i+"行：[", "商户分类"+"]不能为空");
+ continue;
}
if (!StringUtils.hasLength(merchantImport.getAddress())){
result.append("第"+i+"行：[", "商户地址"+"]不能为空");
+ continue;
}
TMerchantType merchantType = merchantTypeService.getOne(Wrappers.lambdaQuery(TMerchantType.class)
.eq(TMerchantType::getTypeName, merchantImport.getTypeName())
.last("LIMIT 1"));
if(Objects.isNull(merchantType)){
result.append("第"+i+"行：[", "商户分类"+"]不存在");
+ continue;
}
TMerchant merchant = new TMerchant();
BeanUtils.copyProperties(merchantImport, merchant);
--
Gitblit v1.7.1