filter subscribe
Brightcells
共有 2 个文件被更改，包括 2 次插入 和 2 次删除
+ 1
- 1
api/hb_views.py
@@ -13,7 +13,7 @@ def exec_send_jsapi_hb(user, elog, amount): |
||
| 13 | 13 |
if elog.redpack_send_num >= 3: |
| 14 | 14 |
return |
| 15 | 15 |
|
| 16 |
- if not SubscribeUserInfo.objects.filter(extraid=user.brand_id, unionid=user.unionid, openid=user.openid).exists(): |
|
| 16 |
+ if not SubscribeUserInfo.objects.filter(extraid=user.brand_id, unionid=user.unionid, openid=user.openid, subscribe=True).exists(): |
|
| 17 | 17 |
return |
| 18 | 18 |
|
| 19 | 19 |
pre_amount = elog.pre_redpack_send_amount or elog.redpack_amount or elog.redpack_max_amount |
+ 1
- 1
logs/admin.py
@@ -17,7 +17,7 @@ class MchInfoEncryptLogInfoAdmin(Readonly2ModelAdmin, admin.ModelAdmin): |
||
| 17 | 17 |
}), |
| 18 | 18 |
(u'消费者红包信息', {
|
| 19 | 19 |
'classes': ('collapse', ),
|
| 20 |
- 'fields': ('is_send_redpack', 'redpack_amount', 'redpack_max_amount', 'has_send_redpack', 'redpack_send_amount', 'user_id', 'nickname')
|
|
| 20 |
+ 'fields': ('is_send_redpack', 'redpack_amount', 'redpack_max_amount', 'has_send_redpack', 'redpack_send_amount', 'user_id', 'nickname', 'redpack_send_num', 'pre_redpack_send_amount')
|
|
| 21 | 21 |
}), |
| 22 | 22 |
(u'销售员红包信息', {
|
| 23 | 23 |
'classes': ('collapse', ),
|