Compare commits
2 Commits
e45610661e
...
7f18765911
| Author | SHA1 | Date | |
|---|---|---|---|
| 7f18765911 | |||
| 876c92095c |
@@ -346,12 +346,24 @@ func (s *Service) CreateAdminOrder(ctx context.Context, req *dto.CreateAdminOrde
|
||||
if req.IotCardID == nil {
|
||||
return nil, errors.New(errors.CodeInvalidParam, "单卡购买必须指定IoT卡ID")
|
||||
}
|
||||
validationResult, err = s.purchaseValidationService.ValidateCardPurchase(ctx, *req.IotCardID, req.PackageIDs)
|
||||
// 平台账号代表平台直接下单,不受卡所属代理的套餐分配限制;
|
||||
// 代理账号下单时,卡所属代理必须已将套餐上架分配
|
||||
if buyerType == model.BuyerTypeAgent {
|
||||
validationResult, err = s.purchaseValidationService.ValidateCardPurchase(ctx, *req.IotCardID, req.PackageIDs)
|
||||
} else {
|
||||
validationResult, err = s.purchaseValidationService.ValidateAdminOfflineCardPurchase(ctx, *req.IotCardID, req.PackageIDs)
|
||||
}
|
||||
} else if req.OrderType == model.OrderTypeDevice {
|
||||
if req.DeviceID == nil {
|
||||
return nil, errors.New(errors.CodeInvalidParam, "设备购买必须指定设备ID")
|
||||
}
|
||||
validationResult, err = s.purchaseValidationService.ValidateDevicePurchase(ctx, *req.DeviceID, req.PackageIDs)
|
||||
// 平台账号代表平台直接下单,不受设备所属代理的套餐分配限制;
|
||||
// 代理账号下单时,设备所属代理必须已将套餐上架分配
|
||||
if buyerType == model.BuyerTypeAgent {
|
||||
validationResult, err = s.purchaseValidationService.ValidateDevicePurchase(ctx, *req.DeviceID, req.PackageIDs)
|
||||
} else {
|
||||
validationResult, err = s.purchaseValidationService.ValidateAdminOfflineDevicePurchase(ctx, *req.DeviceID, req.PackageIDs)
|
||||
}
|
||||
} else {
|
||||
return nil, errors.New(errors.CodeInvalidParam, "无效的订单类型")
|
||||
}
|
||||
|
||||
@@ -210,7 +210,7 @@ func (s *IotCardStore) List(ctx context.Context, opts *store.QueryOptions, filte
|
||||
|
||||
// standaloneListColumns 列表查询只选取响应需要的列,避免 SELECT * 的宽行 I/O
|
||||
var standaloneListColumns = []string{
|
||||
"id", "iccid", "card_category", "carrier_id", "carrier_type", "carrier_name",
|
||||
"id", "iccid", "virtual_no", "card_category", "carrier_id", "carrier_type", "carrier_name",
|
||||
"imsi", "msisdn", "batch_no", "supplier", "status", "shop_id", "activated_at",
|
||||
"activation_status", "real_name_status", "network_status", "data_usage_mb",
|
||||
"current_month_usage_mb", "current_month_start_date", "last_month_total_mb",
|
||||
|
||||
Reference in New Issue
Block a user