七月迭代短暂完结,还有很多后端的关键东西没有弄,这是一版赶时间做的东西
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 8m26s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 8m26s
This commit is contained in:
@@ -1093,7 +1093,7 @@ func buildAgentWalletTransactionAssetSnapshot(order *model.Order) (string, uint,
|
||||
}
|
||||
|
||||
// buildOrderAssetIdentifier 生成订单资产标识快照。
|
||||
// 后台按标识下单时保留请求标识;按ID下单时用卡ICCID或设备IMEI/虚拟号兜底。
|
||||
// 后台按标识下单时保留请求标识;按ID下单时用卡ICCID或设备虚拟号/IMEI兜底。
|
||||
func buildOrderAssetIdentifier(result *purchase_validation.PurchaseValidationResult) string {
|
||||
if result == nil {
|
||||
return ""
|
||||
@@ -1102,7 +1102,7 @@ func buildOrderAssetIdentifier(result *purchase_validation.PurchaseValidationRes
|
||||
return result.Card.ICCID
|
||||
}
|
||||
if result.Device != nil {
|
||||
return firstNonEmpty(result.Device.IMEI, result.Device.VirtualNo)
|
||||
return firstNonEmpty(result.Device.VirtualNo, result.Device.IMEI)
|
||||
}
|
||||
return ""
|
||||
}
|
||||
@@ -2134,7 +2134,7 @@ func resolveAdminCarrierInfoFromVars(orderType string, iotCardID *uint, deviceID
|
||||
return "", 0
|
||||
}
|
||||
|
||||
// resolveAssetByIdentifier 通过标识符(ICCID 或 VirtualNo)解析资产
|
||||
// resolveAssetByIdentifier 通过卡 ICCID 或设备 VirtualNo、IMEI、SN 解析资产。
|
||||
// 优先查注册表,注册表命中则直接返回对应卡或设备
|
||||
func (s *Service) resolveAssetByIdentifier(ctx context.Context, identifier string) (*model.IotCard, *model.Device, error) {
|
||||
if s.assetIdentifierStore != nil {
|
||||
|
||||
Reference in New Issue
Block a user