update

.idea/terminal.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="TerminalProjectOptionsProvider">
+    <envs>
+      <env key="http_proxy" value="http://127.0.0.1:12639" />
+      <env key="https_proxy" value="http://127.0.0.1:12639" />
+    </envs>
+  </component>
+</project>

adslib/addata/custom.go

@@ -4,6 +4,7 @@ import (
 	"math/rand"
 	"miads/adslib/redis_data"
 	"miads/adslib/utils"
+	"strings"
 )
 
 func CombineOrderBy(adData *AdData, dsp *utils.DspParam) {
@@ -32,7 +33,7 @@ func CombineOrderBy(adData *AdData, dsp *utils.DspParam) {
 
 
 // 获取一个广告
-func GetOneAds(dsp *utils.DspParam, orderType int, fixFlag int) (*redis_data.AdOrderInfo, error){
+func getOneAds(dsp *utils.DspParam, orderType int, fixFlag int) (*redis_data.AdOrderInfo, error){
 	// 取出广告
 	orders, err := redis_data.GetOrderInfos(dsp, fixFlag)
 	if err != nil {
@@ -80,25 +81,65 @@ func GetOneAds(dsp *utils.DspParam, orderType int, fixFlag int) (*redis_data.AdO
 	return nil, nil
 }
 
+func getSubTimeValue(adData *redis_data.AdOrderInfo, a) {
+	b_min = int(ads_item['begin_time'])
+	b_min = datetime.fromtimestamp(b_min)
+
+	// 获取当前分钟值
+	now_minute = b_min.minute + (b_min.hour * 60)
+
+	// 不足一天
+	all_count = 1587820.0
+	e_time = int(ads_item['end_time'])
+
+	// 获取起点分钟
+	be_minute = now_minute + 2
+	// 获取分钟数到24点还能跑多少值
+	key = "time_all_count_" + str(be_minute)
+	if int(ads_item['line_type']) == 1:
+	// 定制曲线
+	key = "time_all_count_{0}_{1}".format(ads_item['order_id'], str(be_minute))
+	// 起始剩余值
+	all_count = redis_tools.get_key_int_value(key)
+
+	// 计算最后分钟
+	e_d = datetime.fromtimestamp(e_time)
+	e_d_min = e_d.minute + (e_d.hour * 60)
+	if e_d_min > 1439:
+	e_d_min = e_d_min - 1440 + 2
+	key = "time_all_count_" + str(e_d_min)
+	if int(ads_item['line_type']) == 1:
+	// 定制曲线
+	key = "time_all_count_{0}_{1}".format(ads_item['order_id'], str(e_d_min))
+	// 结束的剩余值 - 起始剩余值 = 获取区间能跑的值
+	all_count = all_count - redis_tools.get_key_int_value(key)
+	return all_count
+}
+
 func GetAdsInfos(dsp *utils.DspParam, advertiser string, orderType int, fixFlag int, xiaomiHasFlag int) {
 	ua = dsp.ua_client
 	req_source = dsp.req_source
 
-	ads_item = getOneAds(dsp, order_type, fix_flag)
-	if ads_item is
-None:
-	raise
-	gen.Return((None, None))
-	r = random.randint(0, 100)
-	if xiaomi_has_flag == 1:
-	if ads_item['title'].find("_ios") > 0:
-	raise
-	gen.Return((None, None)) else:
-	r = random.randint(50, 100)
+	order, err := getOneAds(dsp, order_type, fix_flag)
+	if err != nil {
+		return err
+	}
+	if order == nil {
+		return nil
+	}
+
+	r = rand.Intn( 100)
+	if xiaomiHasFlag == 1 {
+		if strings.Index(order.Title, "_ios") > 0 {
+			return nil
+		} else {
+			r = rand.Intn(50)
+		}
+	}
 
 	a = datetime.now()
 
-	#获取剩余时间内的值
+	// 获取剩余时间内的值
 	all_count = get_sub_time_value(ads_item, a)
 	all_count = all_count * 1.0