From 49d5518fc5c0585e204b3c2e47d9695c4f4638f6 Mon Sep 17 00:00:00 2001 From: cst61 Date: Thu, 11 Jun 2026 21:11:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A2=E5=8D=95=E5=8E=86=E5=8F=B2=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/rj/config/MybatisPlusConfig.java | 1 + .../LbBuyAccountHistoryController.java | 86 ++++++ .../com/rj/entity/LbBuyAccountHistory.java | 72 +++++ .../rj/mapper/LbBuyAccountHistoryMapper.java | 9 + .../service/ILbBuyAccountHistoryService.java | 26 ++ .../impl/LbBuyAccountHistoryServiceImpl.java | 270 ++++++++++++++++++ .../service/impl/LbOrderRowServiceImpl.java | 45 ++- src/main/sql/lb_buy_account_history.sql | 17 ++ ..._history_alter_add_rush_buy_fail_count.sql | 5 + 9 files changed, 526 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/rj/controller/LbBuyAccountHistoryController.java create mode 100644 src/main/java/com/rj/entity/LbBuyAccountHistory.java create mode 100644 src/main/java/com/rj/mapper/LbBuyAccountHistoryMapper.java create mode 100644 src/main/java/com/rj/service/ILbBuyAccountHistoryService.java create mode 100644 src/main/java/com/rj/service/impl/LbBuyAccountHistoryServiceImpl.java create mode 100644 src/main/sql/lb_buy_account_history.sql create mode 100644 src/main/sql/lb_buy_account_history_alter_add_rush_buy_fail_count.sql diff --git a/src/main/java/com/rj/config/MybatisPlusConfig.java b/src/main/java/com/rj/config/MybatisPlusConfig.java index 9261343..8d8795d 100644 --- a/src/main/java/com/rj/config/MybatisPlusConfig.java +++ b/src/main/java/com/rj/config/MybatisPlusConfig.java @@ -62,6 +62,7 @@ public class MybatisPlusConfig { ignoreTables.add("ai_prompts"); // AI 提示词全局配置，表无 tenant_id 字段 ignoreTables.add("lb_third_integration_config"); // 每租户一条，按 tenant_id 显式查询，不走插件自动拼接 ignoreTables.add("lb_buy_account"); // 抢单账号跨租户管理；分页/批量抢单按记录 tenant_id 业务处理 + ignoreTables.add("lb_buy_account_history"); // 抢单历史跨租户查询；按记录 tenant_id 业务过滤 return new TenantLineHandler() { diff --git a/src/main/java/com/rj/controller/LbBuyAccountHistoryController.java b/src/main/java/com/rj/controller/LbBuyAccountHistoryController.java new file mode 100644 index 0000000..86c81d3 --- /dev/null +++ b/src/main/java/com/rj/controller/LbBuyAccountHistoryController.java @@ -0,0 +1,86 @@ +package com.rj.controller; + +import com.rj.entity.LbBuyAccountHistory; +import com.rj.service.ILbBuyAccountHistoryService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@RestController +@RequestMapping("/api/lbBuyAccountHistory") +@Tag(name = "LB抢单历史", description = "lb_buy_account_history 增删改查与分页") +public class LbBuyAccountHistoryController { + + @Autowired + private ILbBuyAccountHistoryService lbBuyAccountHistoryService; + + @PostMapping("/add") + @Operation(summary = "新增") + public ResponseEntity> add( + @Parameter(description = "实体（id 为空时自动生成 UUID）", required = true) + @RequestBody LbBuyAccountHistory entity) { + Map result = lbBuyAccountHistoryService.add(entity); + Boolean success = (Boolean) result.get("success"); + if (success != null && success) { + return ResponseEntity.ok(result); + } + return ResponseEntity.badRequest().body(result); + } + + @PutMapping("/update") + @Operation(summary = "编辑") + public ResponseEntity> update( + @Parameter(description = "实体", required = true) @RequestBody LbBuyAccountHistory entity) { + Map result = lbBuyAccountHistoryService.update(entity); + Boolean success = (Boolean) result.get("success"); + if (success != null && success) { + return ResponseEntity.ok(result); + } + return ResponseEntity.badRequest().body(result); + } + + @DeleteMapping("/delete/{id}") + @Operation(summary = "删除") + public ResponseEntity> delete( + @Parameter(description = "主键ID(UUID)", required = true) @PathVariable String id) { + Map result = lbBuyAccountHistoryService.deleteById(id); + Boolean success = (Boolean) result.get("success"); + if (success != null && success) { + return ResponseEntity.ok(result); + } + return ResponseEntity.badRequest().body(result); + } + + @GetMapping("/list") + @Operation(summary = "分页查询") + public ResponseEntity> list( + @RequestParam(defaultValue = "1") Integer current, + @RequestParam(defaultValue = "10") Integer size, + @RequestParam(required = false) String tenantId, + @RequestParam(required = false) String tenantName, + @RequestParam(required = false) String loginAccount, + @RequestParam(required = false) String nickname, + @Parameter(description = "创建时间起，格式 yyyy-MM-dd HH:mm:ss") + @RequestParam(required = false) String createTimeStart, + @Parameter(description = "创建时间止，格式 yyyy-MM-dd HH:mm:ss") + @RequestParam(required = false) String createTimeEnd, + @Parameter(description = "最后一次抢单时间起，格式 yyyy-MM-dd HH:mm:ss") + @RequestParam(required = false) String lastRushBuyTimeStart, + @Parameter(description = "最后一次抢单时间止，格式 yyyy-MM-dd HH:mm:ss") + @RequestParam(required = false) String lastRushBuyTimeEnd) { + Map result = lbBuyAccountHistoryService.pageQuery( + current, size, tenantId, tenantName, loginAccount, nickname, + createTimeStart, createTimeEnd, lastRushBuyTimeStart, lastRushBuyTimeEnd + ); + Boolean success = (Boolean) result.get("success"); + if (success != null && success) { + return ResponseEntity.ok(result); + } + return ResponseEntity.internalServerError().body(result); + } +} diff --git a/src/main/java/com/rj/entity/LbBuyAccountHistory.java b/src/main/java/com/rj/entity/LbBuyAccountHistory.java new file mode 100644 index 0000000..5f4eac8 --- /dev/null +++ b/src/main/java/com/rj/entity/LbBuyAccountHistory.java @@ -0,0 +1,72 @@ +package com.rj.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("lb_buy_account_history") +@Schema(description = "LB 抢单历史表") +public class LbBuyAccountHistory implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + @Schema(description = "主键，UUID") + private String id; + + @TableField("tenant_id") + @Schema(description = "租户ID，关联 tenant.id") + private String tenantId; + + @TableField("tenant_name") + @Schema(description = "租户名称") + private String tenantName; + + @TableField("login_account") + @Schema(description = "登录账号") + private String loginAccount; + + @TableField("login_password") + @Schema(description = "登录密码（明文）") + private String loginPassword; + + @TableField("nickname") + @Schema(description = "昵称") + private String nickname; + + @TableField("max_grab_amount") + @Schema(description = "成功抢单总金额") + private Integer maxGrabAmount; + + @TableField("max_grab_count") + @Schema(description = "抢单总次数（含成功与失败）") + private Integer maxGrabCount; + + @TableField("rush_buy_fail_count") + @Schema(description = "抢单失败次数") + private Integer rushBuyFailCount; + + @TableField("rush_buy_result") + @Schema(description = "抢单结果") + private String rushBuyResult; + + @TableField("last_rush_buy_time") + @Schema(description = "最后一次抢单时间") + private LocalDateTime lastRushBuyTime; + + @TableField("create_time") + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @TableField("update_time") + @Schema(description = "修改时间") + private LocalDateTime updateTime; +} diff --git a/src/main/java/com/rj/mapper/LbBuyAccountHistoryMapper.java b/src/main/java/com/rj/mapper/LbBuyAccountHistoryMapper.java new file mode 100644 index 0000000..3ca1d43 --- /dev/null +++ b/src/main/java/com/rj/mapper/LbBuyAccountHistoryMapper.java @@ -0,0 +1,9 @@ +package com.rj.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rj.entity.LbBuyAccountHistory; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface LbBuyAccountHistoryMapper extends BaseMapper { +} diff --git a/src/main/java/com/rj/service/ILbBuyAccountHistoryService.java b/src/main/java/com/rj/service/ILbBuyAccountHistoryService.java new file mode 100644 index 0000000..998c1c2 --- /dev/null +++ b/src/main/java/com/rj/service/ILbBuyAccountHistoryService.java @@ -0,0 +1,26 @@ +package com.rj.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.rj.entity.LbBuyAccountHistory; + +import java.util.Map; + +public interface ILbBuyAccountHistoryService extends IService { + + Map add(LbBuyAccountHistory entity); + + Map update(LbBuyAccountHistory entity); + + Map deleteById(String id); + + Map pageQuery(Integer current, + Integer size, + String tenantId, + String tenantName, + String loginAccount, + String nickname, + String createTimeStart, + String createTimeEnd, + String lastRushBuyTimeStart, + String lastRushBuyTimeEnd); +} diff --git a/src/main/java/com/rj/service/impl/LbBuyAccountHistoryServiceImpl.java b/src/main/java/com/rj/service/impl/LbBuyAccountHistoryServiceImpl.java new file mode 100644 index 0000000..11eaa4e --- /dev/null +++ b/src/main/java/com/rj/service/impl/LbBuyAccountHistoryServiceImpl.java @@ -0,0 +1,270 @@ +package com.rj.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.rj.entity.LbBuyAccountHistory; +import com.rj.mapper.LbBuyAccountHistoryMapper; +import com.rj.service.ILbBuyAccountHistoryService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +@Slf4j +@Service +public class LbBuyAccountHistoryServiceImpl + extends ServiceImpl + implements ILbBuyAccountHistoryService { + + private static final DateTimeFormatter DATE_TIME_FORMATTER = + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + + @Override + public Map add(LbBuyAccountHistory entity) { + Map result = new HashMap<>(); + try { + Map validation = validateRequiredForAdd(entity); + if (validation != null) { + return validation; + } + trimStringFields(entity); + defaultIntegerFields(entity); + + if (entity.getId() == null || entity.getId().trim().isEmpty()) { + entity.setId(UUID.randomUUID().toString()); + } + LocalDateTime now = LocalDateTime.now(); + if (entity.getCreateTime() == null) { + entity.setCreateTime(now); + } + entity.setUpdateTime(now); + + boolean ok = this.save(entity); + result.put("success", ok); + result.put("message", ok ? "新增成功" : "新增失败"); + if (ok) { + result.put("data", entity); + } + return result; + } catch (Exception e) { + log.error("抢单历史新增异常", e); + result.put("success", false); + result.put("message", "新增异常：" + e.getMessage()); + return result; + } + } + + @Override + public Map update(LbBuyAccountHistory entity) { + Map result = new HashMap<>(); + try { + if (entity.getId() == null || entity.getId().trim().isEmpty()) { + result.put("success", false); + result.put("message", "id不能为空"); + return result; + } + trimStringFields(entity); + entity.setUpdateTime(LocalDateTime.now()); + boolean ok = this.updateById(entity); + result.put("success", ok); + result.put("message", ok ? "编辑成功" : "编辑失败"); + if (ok) { + result.put("data", this.getById(entity.getId())); + } + return result; + } catch (Exception e) { + log.error("抢单历史编辑异常", e); + result.put("success", false); + result.put("message", "编辑异常：" + e.getMessage()); + return result; + } + } + + @Override + public Map deleteById(String id) { + Map result = new HashMap<>(); + try { + if (id == null || id.trim().isEmpty()) { + result.put("success", false); + result.put("message", "id不能为空"); + return result; + } + boolean ok = this.removeById(id.trim()); + result.put("success", ok); + result.put("message", ok ? "删除成功" : "删除失败"); + return result; + } catch (Exception e) { + log.error("抢单历史删除异常", e); + result.put("success", false); + result.put("message", "删除异常：" + e.getMessage()); + return result; + } + } + + @Override + public Map pageQuery(Integer current, + Integer size, + String tenantId, + String tenantName, + String loginAccount, + String nickname, + String createTimeStart, + String createTimeEnd, + String lastRushBuyTimeStart, + String lastRushBuyTimeEnd) { + Map result = new HashMap<>(); + try { + if (current == null || current < 1) { + current = 1; + } + if (size == null || size < 1) { + size = 10; + } + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (tenantId != null && !tenantId.trim().isEmpty()) { + queryWrapper.eq(LbBuyAccountHistory::getTenantId, tenantId.trim()); + } + if (tenantName != null && !tenantName.trim().isEmpty()) { + queryWrapper.like(LbBuyAccountHistory::getTenantName, tenantName.trim()); + } + if (loginAccount != null && !loginAccount.trim().isEmpty()) { + queryWrapper.like(LbBuyAccountHistory::getLoginAccount, loginAccount.trim()); + } + if (nickname != null && !nickname.trim().isEmpty()) { + queryWrapper.like(LbBuyAccountHistory::getNickname, nickname.trim()); + } + + LocalDateTime createStart = parseDateTime(createTimeStart); + if (createTimeStart != null && !createTimeStart.trim().isEmpty() && createStart == null) { + result.put("success", false); + result.put("message", "createTimeStart 格式错误，请使用 yyyy-MM-dd HH:mm:ss"); + return result; + } + LocalDateTime createEnd = parseDateTime(createTimeEnd); + if (createTimeEnd != null && !createTimeEnd.trim().isEmpty() && createEnd == null) { + result.put("success", false); + result.put("message", "createTimeEnd 格式错误，请使用 yyyy-MM-dd HH:mm:ss"); + return result; + } + if (createStart != null) { + queryWrapper.ge(LbBuyAccountHistory::getCreateTime, createStart); + } + if (createEnd != null) { + queryWrapper.le(LbBuyAccountHistory::getCreateTime, createEnd); + } + + LocalDateTime rushStart = parseDateTime(lastRushBuyTimeStart); + if (lastRushBuyTimeStart != null && !lastRushBuyTimeStart.trim().isEmpty() && rushStart == null) { + result.put("success", false); + result.put("message", "lastRushBuyTimeStart 格式错误，请使用 yyyy-MM-dd HH:mm:ss"); + return result; + } + LocalDateTime rushEnd = parseDateTime(lastRushBuyTimeEnd); + if (lastRushBuyTimeEnd != null && !lastRushBuyTimeEnd.trim().isEmpty() && rushEnd == null) { + result.put("success", false); + result.put("message", "lastRushBuyTimeEnd 格式错误，请使用 yyyy-MM-dd HH:mm:ss"); + return result; + } + if (rushStart != null) { + queryWrapper.ge(LbBuyAccountHistory::getLastRushBuyTime, rushStart); + } + if (rushEnd != null) { + queryWrapper.le(LbBuyAccountHistory::getLastRushBuyTime, rushEnd); + } + + queryWrapper.orderByDesc(LbBuyAccountHistory::getLastRushBuyTime) + .orderByDesc(LbBuyAccountHistory::getUpdateTime) + .orderByDesc(LbBuyAccountHistory::getCreateTime); + + Page page = this.page(new Page<>(current, size), queryWrapper); + result.put("success", true); + result.put("message", "查询成功"); + result.put("data", page.getRecords()); + result.put("total", page.getTotal()); + result.put("current", page.getCurrent()); + result.put("size", page.getSize()); + result.put("pages", page.getPages()); + return result; + } catch (Exception e) { + log.error("抢单历史查询异常", e); + result.put("success", false); + result.put("message", "查询异常：" + e.getMessage()); + return result; + } + } + + private Map validateRequiredForAdd(LbBuyAccountHistory entity) { + Map result = new HashMap<>(); + if (entity.getTenantId() == null || entity.getTenantId().trim().isEmpty()) { + result.put("success", false); + result.put("message", "tenantId不能为空"); + return result; + } + if (entity.getTenantName() == null || entity.getTenantName().trim().isEmpty()) { + result.put("success", false); + result.put("message", "tenantName不能为空"); + return result; + } + if (entity.getLoginAccount() == null || entity.getLoginAccount().trim().isEmpty()) { + result.put("success", false); + result.put("message", "loginAccount不能为空"); + return result; + } + if (entity.getLoginPassword() == null || entity.getLoginPassword().trim().isEmpty()) { + result.put("success", false); + result.put("message", "loginPassword不能为空"); + return result; + } + return null; + } + + private static void trimStringFields(LbBuyAccountHistory entity) { + if (entity.getTenantId() != null) { + entity.setTenantId(entity.getTenantId().trim()); + } + if (entity.getTenantName() != null) { + entity.setTenantName(entity.getTenantName().trim()); + } + if (entity.getLoginAccount() != null) { + entity.setLoginAccount(entity.getLoginAccount().trim()); + } + if (entity.getLoginPassword() != null) { + entity.setLoginPassword(entity.getLoginPassword().trim()); + } + if (entity.getNickname() != null) { + entity.setNickname(entity.getNickname().trim()); + } + if (entity.getRushBuyResult() != null) { + entity.setRushBuyResult(entity.getRushBuyResult().trim()); + } + } + + private static void defaultIntegerFields(LbBuyAccountHistory entity) { + if (entity.getMaxGrabAmount() == null) { + entity.setMaxGrabAmount(0); + } + if (entity.getMaxGrabCount() == null) { + entity.setMaxGrabCount(0); + } + if (entity.getRushBuyFailCount() == null) { + entity.setRushBuyFailCount(0); + } + } + + private static LocalDateTime parseDateTime(String text) { + if (text == null || text.trim().isEmpty()) { + return null; + } + try { + return LocalDateTime.parse(text.trim(), DATE_TIME_FORMATTER); + } catch (Exception e) { + return null; + } + } +} diff --git a/src/main/java/com/rj/service/impl/LbOrderRowServiceImpl.java b/src/main/java/com/rj/service/impl/LbOrderRowServiceImpl.java index 1e65903..1d7ec70 100644 --- a/src/main/java/com/rj/service/impl/LbOrderRowServiceImpl.java +++ b/src/main/java/com/rj/service/impl/LbOrderRowServiceImpl.java @@ -54,6 +54,12 @@ public class LbOrderRowServiceImpl extends ServiceImpl rows) { + if (rows == null || rows.isEmpty()) { + return null; + } + for (LbOrderRow row : rows) { + String consignee = trimToNull(row.getConsignee()); + if (consignee != null) { + return consignee; + } + } + for (LbOrderRow row : rows) { + String buyerName = trimToNull(row.getBuyerName()); + if (buyerName != null) { + return buyerName; + } + } + return null; + } + /** 同一天、同一租户、同一 buyer_phone 已存在 day_stat 则复用其 id，否则生成占位 id */ private Long resolveBuyerDayStatRowId(String tenantId, String buyerPhone, String payTime) { LambdaQueryWrapper w = new LambdaQueryWrapper<>(); @@ -807,6 +835,7 @@ public class LbOrderRowServiceImpl extends ServiceImpl