Compare commits

...

2 Commits

Author SHA1 Message Date
1b596e10a7 修正抵扣逻辑 2026-05-30 18:28:17 +08:00
0e8e810862 货品页面 2026-05-30 17:26:11 +08:00
4 changed files with 9 additions and 2 deletions

View File

@@ -80,6 +80,7 @@ public class LbGoodsController {
@RequestParam(required = false) Long sellerId,
@Parameter(description = "是否展示0否 1是") @RequestParam(required = false) Integer isShow,
@RequestParam(required = false) Integer status,
@Parameter(description = "同步来源页码") @RequestParam(required = false) Integer currentPage,
@Parameter(description = "创建开始时间格式yyyy-MM-dd HH:mm:ss")
@RequestParam(required = false) String createdAtStart,
@Parameter(description = "创建结束时间格式yyyy-MM-dd HH:mm:ss")
@@ -98,6 +99,7 @@ public class LbGoodsController {
sellerId,
isShow,
status,
currentPage,
createdAtStart,
createdAtEnd,
updatedAtStart,

View File

@@ -23,6 +23,7 @@ public interface ILbGoodsService extends IService<LbGoods> {
Long sellerId,
Integer isShow,
Integer status,
Integer currentPage,
String createdAtStart,
String createdAtEnd,
String updatedAtStart,

View File

@@ -132,7 +132,7 @@ public class LbDeductionAmountServiceImpl
entity.setOriginalText(trimmedText);
entity.setId(null);
entity.setUpdateTime(null);
entity.setTixianAmt(BigDecimal.ZERO);
enrichFromDeductionText(entity, trimmedText);
log.debug(
"parseFromTextByLlmAndSaveuserName={} userPhone={} dikouAmt={} tixianAmt={} createTime={}",
@@ -141,7 +141,7 @@ public class LbDeductionAmountServiceImpl
entity.getDikouAmt(),
entity.getTixianAmt(),
entity.getCreateTime());
entity.setTixianAmt(BigDecimal.ZERO);
return add(entity);
} catch (NoApiKeyException e) {
log.error("DashScope API Key 异常", e);

View File

@@ -151,6 +151,7 @@ public class LbGoodsServiceImpl extends ServiceImpl<LbGoodsMapper, LbGoods> impl
Long sellerId,
Integer isShow,
Integer status,
Integer currentPage,
String createdAtStart,
String createdAtEnd,
String updatedAtStart,
@@ -186,6 +187,9 @@ public class LbGoodsServiceImpl extends ServiceImpl<LbGoodsMapper, LbGoods> impl
if (status != null) {
w.eq(LbGoods::getStatus, status);
}
if (currentPage != null) {
w.eq(LbGoods::getCurrentPage, currentPage);
}
LocalDateTime createdStart = parseDateTime(createdAtStart);
if (createdAtStart != null && !createdAtStart.trim().isEmpty() && createdStart == null) {