fieldsets
2 ha cambiato i file con 18 aggiunte e 0 eliminazioni
+ 4
- 0
commands/management/commands/hb.py
@@ -39,16 +39,20 @@ class Command(CompatibilityBaseCommand): |
||
| 39 | 39 |
try: |
| 40 | 40 |
elog = MchInfoEncryptLogInfo.objects.select_for_update().get(sn=v.get('sn', ''))
|
| 41 | 41 |
except MchInfoEncryptLogInfo.DoesNotExist: |
| 42 |
+ logger.info('MchInfoEncryptLogInfo.DoesNotExist')
|
|
| 42 | 43 |
continue |
| 43 | 44 |
except MchInfoEncryptLogInfo.MultipleObjectsReturned: |
| 45 |
+ logger.info('MchInfoEncryptLogInfo.MultipleObjectsReturned')
|
|
| 44 | 46 |
continue |
| 45 | 47 |
|
| 46 | 48 |
try: |
| 47 | 49 |
user = UserInfo.objects.get(user_id=v.get('user_id', ''))
|
| 48 | 50 |
except UserInfo.DoesNotExist: |
| 51 |
+ logger.info('UserInfo.DoesNotExist')
|
|
| 49 | 52 |
continue |
| 50 | 53 |
|
| 51 | 54 |
if not user.openid: |
| 55 |
+ logger.info('UserInfo.OpenID.DoesNotExist')
|
|
| 52 | 56 |
r.rpushjson(REDPACK_WAITING_SEND_LIST, v) |
| 53 | 57 |
continue |
| 54 | 58 |
|
+ 14
- 0
logs/admin.py
@@ -11,6 +11,20 @@ class MchInfoEncryptLogInfoAdmin(Readonly2ModelAdmin, admin.ModelAdmin): |
||
| 11 | 11 |
list_filter = ('alg', 'brand_pk', 'model_pk', 'distributor_pk', 'operator_id', 'is_send_redpack', 'has_send_redpack', 'is_clerk_send_redpack', 'has_clerk_send_redpack', 'status')
|
| 12 | 12 |
readonly_fields_exclude = ('is_send_redpack', 'redpack_amount', 'redpack_max_amount', 'is_clerk_send_redpack', 'clerk_redpack_amount', 'clerk_redpack_max_amount')
|
| 13 | 13 |
|
| 14 |
+ fieldsets = ( |
|
| 15 |
+ (u'基本信息', {
|
|
| 16 |
+ 'fields': ('plaintext', 'alg', 'ciphertext', 'brand_pk', 'model_pk', 'distributor_pk', 'sn', 'operator_id', 'status', 'created_at', 'updated_at')
|
|
| 17 |
+ }), |
|
| 18 |
+ (u'消费者红包信息', {
|
|
| 19 |
+ 'classes': ('collapse', ),
|
|
| 20 |
+ 'fields': ('is_send_redpack', 'redpack_amount', 'redpack_max_amount', 'has_send_redpack', 'redpack_send_amount', 'user_id', 'nickname')
|
|
| 21 |
+ }), |
|
| 22 |
+ (u'销售员红包信息', {
|
|
| 23 |
+ 'classes': ('collapse', ),
|
|
| 24 |
+ 'fields': ('is_clerk_send_redpack', 'clerk_redpack_amount', 'clerk_redpack_max_amount', 'has_clerk_send_redpack', 'clerk_redpack_send_amount', 'clerk_user_id', 'clerk_nickname')
|
|
| 25 |
+ }), |
|
| 26 |
+ ) |
|
| 27 |
+ |
|
| 14 | 28 |
|
| 15 | 29 |
class MchInfoDecryptLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin): |
| 16 | 30 |
list_display = ('ciphertext', 'brand_pk', 'model_pk', 'distributor_pk', 'sn', 'decrypt_count', 'status', 'created_at', 'updated_at')
|