Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

cehua_hzl

2018-09-21 5151fbbce6fb42110fe484c18dd87d06d5af86a1

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
# µ±ÈÕ³äÖµÒ»¶¨×êʯÈÎÑ¡Ò»½±Àø 
# [ 
#   [['ÆðʼÄêÔÂÈÕ', '½áÊøÄêÔÂÈÕ'], [ÐÇÆÚ¼¸Áбí], Àñ°üÀàÐÍ, [[ËùÐè×êʯÊý, [¶àÑ¡Ò»½±ÀøÁбí(itemID,¸öÊý,ÊÇ·ñ°ó¶¨)]], ...]], 
#   [['ÆðʼÄêÔÂÈÕ', '½áÊøÄêÔÂÈÕ'], [ÐÇÆÚ¼¸Áбí], Àñ°üÀàÐÍ, [[ËùÐè×êʯÊý, [¶àÑ¡Ò»½±ÀøÁбí(itemID,¸öÊý,ÊÇ·ñ°ó¶¨)]], ...]], 
# ] 
# Èç: [['2015-01-01 00:00:00', '2015-01-03 23:59:59'], 20000, [(2000,20,1),(2001,20,1),(2002,20,1),(2003,20,1)]],  
#     Ôªµ©1ºÅµ½3ºÅÿÈÕ³äÖµ´ïµ½20000×êʯ¿ÉÁìÈ¡½±ÀøÁбíÖÐÈÎÒâÒ»¸ö 
# ×¢£ºÃ¿Ìì½öÒ»¸öÅäÖÃÉúЧ£¬Ç뽫ÓÅÏȼ¶¸ßµÄÅÅÇ°Ãæ 
# ÐÇÆÚ£º1-ÐÇÆÚÒ», ... 7-ÐÇÆÚÌì 
# Àñ°üÀàÐÍ - 0  Îª°´³äÖµµµÁìÈ¡Àñ°ü 
#   [[ËùÐè×êʯÊý, [¶àÑ¡Ò»½±ÀøÁбí(itemID,¸öÊý,ÊÇ·ñ°ó¶¨)]], ...] 
# Àñ°üÀàÐÍ - 1  ÎªÎÞÏÞÁìÈ¡Àñ°ü 
#   [Öظ´ÁìÈ¡´ÎÊýÏÞÖÆ, Ã¿´ÎÁìÈ¡ËùÐè×êʯÊý, Õ¼Óøñ×ÓÊý, ½±ÀøÁбí[(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),...] ] 
 
( 
 
[ 
 
[ # ÁùÒ»½Ú 
    ['2015-05-28 00:00:00', '2015-06-01 23:59:59'], # »î¶¯Ê±¼ä 
    [], # »î¶¯ÐÇÆÚ 
    1,  # Àñ°üÀàÐÍ, 0-°´³äÖµµµÁìÈ¡½±Àø; 1-ÎÞÏÞÑ­»·ÁìÈ¡Àñ°ü 
    [ 
        0, # Öظ´ÁìÈ¡´ÎÊý, 0±íʾ²»ÏÞÖÆ 
        500, # Ã¿´ÎÁìÈ¡ËùÐè³äÖµ×êʯÊý 
        4, # Õ¼Óøñ×ÓÊý 
        [ # ½±ÀøÁбí[(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),...] 
            (21696,1,1), 
            (21704,2,1), 
            (7551,1,1), 
            (201,1,1), 
        ], 
    ], 
], 
[ # ¶ËÎç½Ú 
    ['2015-06-19 00:00:00', '2015-06-23 23:59:59'], # »î¶¯Ê±¼ä 
    [], # »î¶¯ÐÇÆÚ 
    1,  # Àñ°üÀàÐÍ, 0-°´³äÖµµµÁìÈ¡½±Àø; 1-ÎÞÏÞÑ­»·ÁìÈ¡Àñ°ü 
    [ 
        0, # Öظ´ÁìÈ¡´ÎÊý, 0±íʾ²»ÏÞÖÆ 
        500, # Ã¿´ÎÁìÈ¡ËùÐè³äÖµ×êʯÊý 
        4, # Õ¼Óøñ×ÓÊý 
        [ # ½±ÀøÁбí[(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),...] 
            (21696,1,1), 
            (21712,2,1), 
            (7551,1,1), 
            (201,1,1), 
        ], 
    ], 
], 
 
[ # ÖÐÇï½Ú 
    ['2016-09-20 00:00:00', '2016-09-22 23:59:59'], # »î¶¯Ê±¼ä 
    [],  # »î¶¯ÐÇÆÚ 
    0,  # Àñ°üÀàÐÍ, 0-°´³äÖµµµÁìÈ¡½±Àø; 1-ÎÞÏÞÑ­»·ÁìÈ¡Àñ°ü 
    [ 
        [2000, [(21524,1,1),(21525,1,1),(21526,1,1),(21527,1,1),(21528,1,1)]], # 2000×êµµ 
    ], 
], 
 
[ # Ê¥µ®½Ú 
    ['2016-12-24 00:00:00', '2016-12-26 23:59:59'], # »î¶¯Ê±¼ä 
    [], # »î¶¯ÐÇÆÚ 
    1,  # Àñ°üÀàÐÍ, 0-°´³äÖµµµÁìÈ¡½±Àø; 1-ÎÞÏÞÑ­»·ÁìÈ¡Àñ°ü 
    [ 
        0, # Öظ´ÁìÈ¡´ÎÊý, 0±íʾ²»ÏÞÖÆ 
        200, # Ã¿´ÎÁìÈ¡ËùÐè³äÖµ×êʯÊý 
        4, # Õ¼Óøñ×ÓÊý 
        [ # ½±ÀøÁбí[(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),...] 
            (43041,2,1), 
            (25081,2,1), 
            (25059,1,1), 
            (1202,1,1), 
        ], 
    ], 
], 
 
[ # Ôªµ©½Ú 
    ['2017-01-01 00:00:00', '2017-01-03 23:59:59'], # »î¶¯Ê±¼ä 
    [], # »î¶¯ÐÇÆÚ 
    1,  # Àñ°üÀàÐÍ, 0-°´³äÖµµµÁìÈ¡½±Àø; 1-ÎÞÏÞÑ­»·ÁìÈ¡Àñ°ü 
    [ 
        0, # Öظ´ÁìÈ¡´ÎÊý, 0±íʾ²»ÏÞÖÆ 
        200, # Ã¿´ÎÁìÈ¡ËùÐè³äÖµ×êʯÊý 
        4, # Õ¼Óøñ×ÓÊý 
        [ # ½±ÀøÁбí[(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),...] 
            (43041,2,1), 
            (25081,2,1), 
            (25059,1,1), 
            (1202,1,1), 
        ], 
    ], 
], 
 
[ # ÁìÖ÷¶ËÎç½Ú 
    ['2017-05-28 00:00:00', '2017-05-30 23:59:59'], # »î¶¯Ê±¼ä 
    [], # »î¶¯ÐÇÆÚ 
    1,  # Àñ°üÀàÐÍ, 0-°´³äÖµµµÁìÈ¡½±Àø; 1-ÎÞÏÞÑ­»·ÁìÈ¡Àñ°ü 
    [ 
        1, # Öظ´ÁìÈ¡´ÎÊý, 0±íʾ²»ÏÞÖÆ 
        300, # Ã¿´ÎÁìÈ¡ËùÐè³äÖµ×êʯÊý 
        5, # Õ¼Óøñ×ÓÊý 
        [ # ½±ÀøÁбí[(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),...] 
            (50050,10,1), 
            (60033,1,1), 
            (60000,5,1), 
            (42014,1,1), 
            (1506,1,1), 
        ], 
    ], 
], 
 
[ # ÐÇÆÚÁùÈÕ£¬ÀíÂÛÉÏ´ËÓÅÏȼ¶×îµÍ£¬½ÚÈջÇë²»Òª·ÅÔÚ¸ÃÅäÖÃÖ®ºó 
    [], # »î¶¯Ê±¼ä 
    [ 8 ],  # »î¶¯ÐÇÆÚ 
    0,  # Àñ°üÀàÐÍ, 0-°´³äÖµµµÁìÈ¡½±Àø; 1-ÎÞÏÞÑ­»·ÁìÈ¡Àñ°ü 
    [ 
        [2000, [(21564,1,1),(21565,1,1),(21566,1,1),(21567,1,1),(21618,1,1)]], # 2000×êµµ 
    ], 
], 
[ # ÁìÖ÷¸¸Ç×½Ú 
    ['2017-06-17 00:00:00', '2017-06-19 23:59:59'], # »î¶¯Ê±¼ä 
    [], # »î¶¯ÐÇÆÚ 
    1,  # Àñ°üÀàÐÍ, 0-°´³äÖµµµÁìÈ¡½±Àø; 1-ÎÞÏÞÑ­»·ÁìÈ¡Àñ°ü 
    [ 
        1, # Öظ´ÁìÈ¡´ÎÊý, 0±íʾ²»ÏÞÖÆ 
        300, # Ã¿´ÎÁìÈ¡ËùÐè³äÖµ×êʯÊý 
        5, # Õ¼Óøñ×ÓÊý 
        [ # ½±ÀøÁбí[(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),...] 
            (50050,5,1), 
            (60033,1,1), 
            (60000,5,1), 
            (42014,1,1), 
            (1506,1,1), 
        ], 
    ], 
], 
[ # ÁìÖ÷½¨µ³½Ú 
    ['2017-07-01 00:00:00', '2017-07-03 23:59:59'], # »î¶¯Ê±¼ä 
    [], # »î¶¯ÐÇÆÚ 
    1,  # Àñ°üÀàÐÍ, 0-°´³äÖµµµÁìÈ¡½±Àø; 1-ÎÞÏÞÑ­»·ÁìÈ¡Àñ°ü 
    [ 
        0, # Öظ´ÁìÈ¡´ÎÊý, 0±íʾ²»ÏÞÖÆ 
        200, # Ã¿´ÎÁìÈ¡ËùÐè³äÖµ×êʯÊý 
        4, # Õ¼Óøñ×ÓÊý 
        [ # ½±ÀøÁбí[(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),...] 
            (43045,2,1), 
            (25081,2,1), 
            (25059,1,1), 
            (1202,1,1), 
        ], 
    ], 
], 
[ # ÖÙÏÄÖ®Ò¹ 
    ['2017-07-16 00:00:00', '2017-07-18 23:59:59'], # »î¶¯Ê±¼ä 
    [], # »î¶¯ÐÇÆÚ 
    1,  # Àñ°üÀàÐÍ, 0-°´³äÖµµµÁìÈ¡½±Àø; 1-ÎÞÏÞÑ­»·ÁìÈ¡Àñ°ü 
    [ 
        1, # Öظ´ÁìÈ¡´ÎÊý, 0±íʾ²»ÏÞÖÆ 
        300, # Ã¿´ÎÁìÈ¡ËùÐè³äÖµ×êʯÊý 
        5, # Õ¼Óøñ×ÓÊý 
        [ # ½±ÀøÁбí[(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),(itemID,¸öÊý,ÊÇ·ñ°ó¶¨),...] 
            (50050,5,1), 
            (60033,1,1), 
            (60000,5,1), 
            (42014,1,1), 
            (1506,1,1), 
        ], 
    ], 
], 
[ # Ó¾³ØÅÉ¶Ô 
    ['2017-07-30 00:00:00', '2017-08-01 23:59:59'], # »î¶¯Ê±¼ä 
    [],  # »î¶¯ÐÇÆÚ 
    0,  # Àñ°üÀàÐÍ, 0-°´³äÖµµµÁìÈ¡½±Àø; 1-ÎÞÏÞÑ­»·ÁìÈ¡Àñ°ü 
    [ 
        [1000, [(21524,1,1),(21525,1,1),(21526,1,1),(21527,1,1),(21528,1,1)]], # 1000×êµµ 
    ], 
], 
] 
 
)