Compare commits
2 Commits
cfcbde95dd
...
1b596e10a7
| Author | SHA1 | Date | |
|---|---|---|---|
| 1b596e10a7 | |||
| 0e8e810862 |
@@ -80,6 +80,7 @@ public class LbGoodsController {
|
|||||||
@RequestParam(required = false) Long sellerId,
|
@RequestParam(required = false) Long sellerId,
|
||||||
@Parameter(description = "是否展示:0否 1是") @RequestParam(required = false) Integer isShow,
|
@Parameter(description = "是否展示:0否 1是") @RequestParam(required = false) Integer isShow,
|
||||||
@RequestParam(required = false) Integer status,
|
@RequestParam(required = false) Integer status,
|
||||||
|
@Parameter(description = "同步来源页码") @RequestParam(required = false) Integer currentPage,
|
||||||
@Parameter(description = "创建开始时间,格式:yyyy-MM-dd HH:mm:ss")
|
@Parameter(description = "创建开始时间,格式:yyyy-MM-dd HH:mm:ss")
|
||||||
@RequestParam(required = false) String createdAtStart,
|
@RequestParam(required = false) String createdAtStart,
|
||||||
@Parameter(description = "创建结束时间,格式:yyyy-MM-dd HH:mm:ss")
|
@Parameter(description = "创建结束时间,格式:yyyy-MM-dd HH:mm:ss")
|
||||||
@@ -98,6 +99,7 @@ public class LbGoodsController {
|
|||||||
sellerId,
|
sellerId,
|
||||||
isShow,
|
isShow,
|
||||||
status,
|
status,
|
||||||
|
currentPage,
|
||||||
createdAtStart,
|
createdAtStart,
|
||||||
createdAtEnd,
|
createdAtEnd,
|
||||||
updatedAtStart,
|
updatedAtStart,
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ public interface ILbGoodsService extends IService<LbGoods> {
|
|||||||
Long sellerId,
|
Long sellerId,
|
||||||
Integer isShow,
|
Integer isShow,
|
||||||
Integer status,
|
Integer status,
|
||||||
|
Integer currentPage,
|
||||||
String createdAtStart,
|
String createdAtStart,
|
||||||
String createdAtEnd,
|
String createdAtEnd,
|
||||||
String updatedAtStart,
|
String updatedAtStart,
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ public class LbDeductionAmountServiceImpl
|
|||||||
entity.setOriginalText(trimmedText);
|
entity.setOriginalText(trimmedText);
|
||||||
entity.setId(null);
|
entity.setId(null);
|
||||||
entity.setUpdateTime(null);
|
entity.setUpdateTime(null);
|
||||||
|
entity.setTixianAmt(BigDecimal.ZERO);
|
||||||
enrichFromDeductionText(entity, trimmedText);
|
enrichFromDeductionText(entity, trimmedText);
|
||||||
log.debug(
|
log.debug(
|
||||||
"parseFromTextByLlmAndSave:userName={} userPhone={} dikouAmt={} tixianAmt={} createTime={}",
|
"parseFromTextByLlmAndSave:userName={} userPhone={} dikouAmt={} tixianAmt={} createTime={}",
|
||||||
@@ -141,7 +141,7 @@ public class LbDeductionAmountServiceImpl
|
|||||||
entity.getDikouAmt(),
|
entity.getDikouAmt(),
|
||||||
entity.getTixianAmt(),
|
entity.getTixianAmt(),
|
||||||
entity.getCreateTime());
|
entity.getCreateTime());
|
||||||
|
entity.setTixianAmt(BigDecimal.ZERO);
|
||||||
return add(entity);
|
return add(entity);
|
||||||
} catch (NoApiKeyException e) {
|
} catch (NoApiKeyException e) {
|
||||||
log.error("DashScope API Key 异常", e);
|
log.error("DashScope API Key 异常", e);
|
||||||
|
|||||||
@@ -151,6 +151,7 @@ public class LbGoodsServiceImpl extends ServiceImpl<LbGoodsMapper, LbGoods> impl
|
|||||||
Long sellerId,
|
Long sellerId,
|
||||||
Integer isShow,
|
Integer isShow,
|
||||||
Integer status,
|
Integer status,
|
||||||
|
Integer currentPage,
|
||||||
String createdAtStart,
|
String createdAtStart,
|
||||||
String createdAtEnd,
|
String createdAtEnd,
|
||||||
String updatedAtStart,
|
String updatedAtStart,
|
||||||
@@ -186,6 +187,9 @@ public class LbGoodsServiceImpl extends ServiceImpl<LbGoodsMapper, LbGoods> impl
|
|||||||
if (status != null) {
|
if (status != null) {
|
||||||
w.eq(LbGoods::getStatus, status);
|
w.eq(LbGoods::getStatus, status);
|
||||||
}
|
}
|
||||||
|
if (currentPage != null) {
|
||||||
|
w.eq(LbGoods::getCurrentPage, currentPage);
|
||||||
|
}
|
||||||
|
|
||||||
LocalDateTime createdStart = parseDateTime(createdAtStart);
|
LocalDateTime createdStart = parseDateTime(createdAtStart);
|
||||||
if (createdAtStart != null && !createdAtStart.trim().isEmpty() && createdStart == null) {
|
if (createdAtStart != null && !createdAtStart.trim().isEmpty() && createdStart == null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user