wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改计费时间类型

Browse Source
This commit is contained in:
wuweihua
2026-10-12 11:05:24 +08:00
parent 9dcf1b201c
commit b68cefd8d0
11 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/bms-system/src/main/java/com/bms/price/domain/PrcOrderBill.java
+2 -1
View File
@@ -67,7 +67,8 @@ public class PrcOrderBill extends BaseEntity
private String countryCode;
private String countryName;
private BigDecimal weight;
@JsonFormat(pattern = "yyyy-MM-dd")
/** 计费时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date bizDate;
private Long tmsId;
bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TmsPriceQuoteRequest.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class TmsPriceQuoteRequest implements Serializable
@NotNull(message = "weight is required")
private BigDecimal weight;
/** yyyy-MM-dd，默认今天 */
/** yyyy-MM-dd or yyyy-MM-dd HH:mm:ss; quote defaults today; bill required */
private String bizDate;
private Integer tmsId;
/** Header X-Api-Code 优先；Body 兜底 */
bms-back/bms-system/src/main/java/com/bms/price/oracle/OracleOrderBillMapper.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class OracleOrderBillMapper
req.setConsigneeName(firstStr(row, "CONSIGNEE_NAME"));
req.setWarehouseCode(firstStr(row, "REGISTER_SITE_CODE"));
req.setOrderRemark(firstStr(row, "TRACK_REMARK", "EXCEPTION_REMARK", "ORDER_CUSTOMNOTE"));
// CREATE_DATE is order place time only; bizDate (billing date) comes from mobile inbound task.
// CREATE_DATE is order place time only; bizDate (billing datetime) comes from task.bill_time.
Date createDate = firstDate(row, "CREATE_DATE");
if (createDate != null)
{
bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcBillingTaskServiceImpl.java
+2 -2
View File
@@ -182,8 +182,8 @@ public class PrcBillingTaskServiceImpl implements IPrcBillingTaskService
{
billReq.setOrderNo(task.getOrderNo());
}
// Billing date from task.bill_time (mobile), not Oracle CREATE_DATE.
billReq.setBizDate(new SimpleDateFormat("yyyy-MM-dd").format(task.getBillTime()));
// Billing datetime from task.bill_time (keep HH:mm:ss), not Oracle CREATE_DATE.
billReq.setBizDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(task.getBillTime()));
task.setCustomerCode(billReq.getCustomerCode());
TmsPriceQuoteResult result = billWithDbRetry(taskId, billReq);
bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java
+4 -7
View File
@@ -2,8 +2,6 @@ package com.bms.price.service.impl;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Arrays;
@@ -27,6 +25,7 @@ import com.bms.ar.enums.ArOrderBillStatus;
import com.bms.common.annotation.DataScope;
import com.bms.common.core.domain.entity.SysUser;
import com.bms.common.exception.ServiceException;
import com.bms.common.utils.DateUtils;
import com.bms.common.utils.DictUtils;
import com.bms.common.utils.MessageUtils;
import com.bms.common.utils.SecurityUtils;
@@ -1709,13 +1708,11 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService
{
throw new ServiceException(MessageUtils.message("price.bill.bizDateRequired"));
}
try
{
return new SimpleDateFormat("yyyy-MM-dd").parse(bizDate.trim());
}
catch (ParseException e)
Date parsed = DateUtils.parseDate(bizDate.trim());
if (parsed == null)
{
throw new ServiceException(MessageUtils.message("price.quote.bizDateInvalid"));
}
return parsed;
}
}
bms-back/bms-system/src/main/java/com/bms/price/service/impl/TmsPriceQuoteServiceImpl.java
+4 -5
View File
@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.bms.common.exception.ServiceException;
import com.bms.common.utils.DateUtils;
import com.bms.common.utils.MessageUtils;
import com.bms.common.utils.StringUtils;
import com.bms.common.utils.sign.Md5Utils;
@@ -1630,14 +1631,12 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService
return new Date();
}
}
try
{
return new SimpleDateFormat("yyyy-MM-dd").parse(bizDate.trim());
}
catch (ParseException e)
Date parsed = DateUtils.parseDate(bizDate.trim());
if (parsed == null)
{
throw new ServiceException(MessageUtils.message("price.quote.bizDateInvalid"));
}
return parsed;
}
/** Use end of bill day so same-day version activate still matches that day's quote. */