Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Y
ypt_mgw_local
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
苏星豪
ypt_mgw_local
Commits
9188cee7
提交
9188cee7
authored
11月 22, 2022
作者:
张颂恩
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
新增酒鬼酒生肖卡合成接口
上级
188da033
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
68 行增加
和
8 行删除
+68
-8
urls.py
datacenter/urls.py
+1
-0
views.py
sales/views.py
+67
-8
没有找到文件。
datacenter/urls.py
浏览文件 @
9188cee7
...
...
@@ -126,6 +126,7 @@ urlpatterns = [
url
(
r'^sales/promotioncode/share_json/$'
,
sal_views
.
promotionCode_share_json
),
url
(
r'^sales/promotioncode/compose/$'
,
sal_views
.
promotionCode_compose
),
url
(
r'^sales/promotioncode/compose_json/$'
,
sal_views
.
promotionCode_compose_json
),
url
(
r'^sales/promotioncode/compose_json_jg/$'
,
sal_views
.
promotionCode_compose_json_jg
),
url
(
r'^sales/promotioncode/redeem/$'
,
sal_views
.
promotionCode_redeem
),
url
(
r'^sales/promotioncode/redeem_json/$'
,
sal_views
.
promotionCode_redeem_json
),
url
(
r'^sales/promotioncode/super_prize_redeem_json/$'
,
sal_views
.
promotionCode_super_prize_redeem_json
),
...
...
sales/views.py
浏览文件 @
9188cee7
...
...
@@ -3348,7 +3348,7 @@ def promotionCode_getUserData(request):
f
"(select name from sales_award where id=(select award_id from sales_activityawards where id=a.award_id)), "
\
f
"tm, activity_id "
\
f
"from sales_consumerwinner a "
\
f
"where activity_id in (18, 55, 98) and consumer_id={user.id} and tm_redeemed is null"
f
"where activity_id in (18, 55, 98
, 104
) and consumer_id={user.id} and tm_redeemed is null"
cur
.
execute
(
sql2
)
t
=
cur
.
fetchall
()
...
...
@@ -3367,7 +3367,7 @@ def promotionCode_getUserData(request):
f
"(select name from sales_award where id=(select award_id from sales_activityawards where id=a.award_id)), "
\
f
"tm, tm_redeemed, activity_id "
\
f
"from sales_consumerwinner a "
\
f
"where activity_id in (18, 55, 98) and consumer_id={user.id} and tm_redeemed is not null"
f
"where activity_id in (18, 55, 98
, 104
) and consumer_id={user.id} and tm_redeemed is not null"
cur
.
execute
(
sql3
)
d
=
cur
.
fetchall
()
...
...
@@ -4064,7 +4064,7 @@ def promotionCode_compose_json(request):
@csrf_exempt
def
promotionCode_compose_json_
v2
(
request
):
def
promotionCode_compose_json_
jg
(
request
):
"""
{plan}
0: 馥郁奖,
...
...
@@ -4090,9 +4090,9 @@ def promotionCode_compose_json_v2(request):
if
company_id
==
1
:
plan
=
int
(
plan
)
if
activity
==
104
and
plan
==
0
:
if
plan
==
0
:
card_consume_list
=
[]
activityAward
=
42
5
activityAward
=
42
6
qty
=
1
ids
=
[]
for
key
,
value
in
cardsUse
.
items
():
...
...
@@ -4101,7 +4101,6 @@ def promotionCode_compose_json_v2(request):
rs
=
cur
.
fetchall
()
for
r
in
rs
:
ids
.
append
([
r
[
0
],
r
[
1
]])
if
len
(
ids
)
==
3
:
for
r
in
ids
:
# 修改code的状态
...
...
@@ -4123,8 +4122,68 @@ def promotionCode_compose_json_v2(request):
c
.
save
()
return
JsonResponse
({
'card_consumed'
:
card_consume_list
,
'plan'
:
plan
})
else
:
JsonResponse
({
'msg'
:
'not enough'
})
return
JsonResponse
({
'msg'
:
'not enough'
})
elif
plan
==
1
:
card_consume_list
=
[]
sql0
=
f
"select item, count(*) from sales_promotioncode where uid_id={user.id} and status in (1,2) and activity_id='{activity}' group by item"
cur
.
execute
(
sql0
)
r
=
cur
.
fetchall
()
list
=
[]
listArray
=
[
0
,
0
,
0
,
0
,
0
,
0
]
cardsUseArray
=
cardsUse
.
split
(
','
)
for
i
,
v
in
enumerate
(
cardsUseArray
):
cardsUseArray
[
i
]
=
int
(
v
)
for
i
in
r
:
list
.
append
({
i
[
0
]:
i
[
1
]
})
listArray
[
i
[
0
]
-
1
]
=
i
[
1
]
qty
=
1
limit
=
6
activityAward
=
425
cardsUseSum
=
0
for
i
in
cardsUseArray
:
cardsUseSum
+=
i
if
cardsUseSum
!=
limit
:
return
JsonResponse
({
'e'
:
'limit not match'
,
'code'
:
'16-1'
})
sufficientCards
=
True
for
i
,
v
in
enumerate
(
listArray
):
if
cardsUseArray
[
i
]
>
listArray
[
i
]:
sufficientCards
=
False
break
if
sufficientCards
==
False
:
return
JsonResponse
({
'e'
:
'insufficient cards'
,
'code'
:
'15-1'
})
else
:
for
j
,
jv
in
enumerate
(
cardsUseArray
):
if
jv
==
0
:
continue
sql
=
f
"select id, item from sales_promotioncode where activity_id={activity} and uid_id={user.id} and status in (1,2) and item={j + 1} limit {jv}"
cur
.
execute
(
sql
)
rs
=
cur
.
fetchall
()
for
r
in
rs
:
# 修改code的状态
pc
=
PromotionCode
.
objects
.
get
(
id
=
r
[
0
])
pc
.
status
=
3
pc
.
save
()
# 写消耗的记录
p
=
PromotionCodeStatusRecord
(
code
=
pc
,
operation
=
3
,
uid
=
user
,
tm
=
tm
)
p
.
save
()
card_consume_list
.
append
({
'id'
:
r
[
0
],
'item'
:
r
[
1
]})
# 写 ConsumerWinner
c
=
ConsumerWinner
(
company_id
=
company_id
,
consumer_id
=
user
.
id
,
activity_id
=
104
,
award_id
=
activityAward
,
qty
=
qty
)
c
.
save
()
return
JsonResponse
({
'card_consumed'
:
card_consume_list
,
'plan'
:
plan
})
return
JsonResponse
({
'msg'
:
'ok'
})
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论