6 ans auparavant · 2c83131e50
--- a/api/admin_views.py
+++ b/api/admin_views.py
@@ -1,34 +1,31 @@
 
                 # -*- coding: utf-8 -*-
              
 
                 
              
 
                -import logging
              
 
                -import requests
              
 
                 import json
              
 
                +import logging
              
 
                 
              
 
                -from django.core.paginator import Paginator
              
 
                +import requests
              
 
                +from django.conf import settings
              
 
                 from django.contrib.auth.hashers import check_password
              
 
                +from django.core.paginator import Paginator
              
 
                 from django.db import transaction
              
 
                 from django.db.models import Q
              
 
                 from django_logit import logit
              
 
                 from django_response import response
              
 
                -from django.core.files import File
              
 
                -from TimeConvert import TimeConvert as tc
              
 
                -from django.conf import settings
              
 
                -
              
 
                 from pywe_token import access_token
              
 
                -from pywe_storage import RedisStorage
              
 
                +from TimeConvert import TimeConvert as tc
              
 
                 
              
 
                 from account.models import AdministratorInfo, UserInfo
              
 
                 from goods.models import GoodsInfo, PackInfo
              
 
                 from kol.models import KOLInfo
              
 
                +from live.models import AnchorInfo, RoomGoodsInfo, RoomInfo, RoomOrderInfo, liveGoodsInfo
              
 
                 from pay.models import OrderInfo
              
 
                -from live.models import RoomInfo, RoomGoodsInfo, RoomOrderInfo, AnchorInfo, liveGoodsInfo
              
 
                 from utils.error.errno_utils import AdministratorStatusCode, OrderStatusCode
              
 
                 
              
 
                -from utils.redis.connect import r
              
 
                 
              
 
                 logger = logging.getLogger('logit')
              
 
                 WECHAT = settings.WECHAT
              
 
                 
              
 
                +
              
 
                 @logit(res=True)
              
 
                 def login(request):
              
 
                     name = request.POST.get('name', '')
              
@@ -141,6 +138,7 @@ def order_update(request):
 
                 
              
 
                     return response(200, 'Order Update Success', '订单更新成功')
              
 
                 
              
 
                +
              
 
                 @logit(res=True)
              
 
                 def live_goods_list(request):
              
 
                     admin_id = request.POST.get('admin_id', '')
              
@@ -169,6 +167,7 @@ def live_goods_list(request):
 
                         'count': count,
              
 
                     })
              
 
                 
              
 
                +
              
 
                 @logit(res=True)
              
 
                 def live_goods_create(request):
              
 
                     admin_id = request.POST.get('admin_id', '')
              
@@ -182,7 +181,6 @@ def live_goods_create(request):
 
                         administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              
 
                     except AdministratorInfo.DoesNotExist:
              
 
                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              
 
                -    
              
 
                 
              
 
                     wxcfg = WECHAT.get('MINIAPP', {})
              
 
                 
              
@@ -195,7 +193,7 @@ def live_goods_create(request):
 
                 
              
 
                     if media_id == '':
              
 
                         return response()
              
 
                -    
              
 
                +
              
 
                     goods_info, _ = liveGoodsInfo.objects.get_or_create(
              
 
                         name=goods_name,
              
 
                         coverImgUrl=media_id,
              
@@ -205,7 +203,7 @@ def live_goods_create(request):
 
                         goods_img=goods_img
              
 
                     )
              
 
                 
              
 
                -    data ={
              
 
                +    data = {
              
 
                         "goodsInfo": {
              
 
                             'name': goods_name,
              
 
                             'coverImgUrl': media_id,
              
@@ -214,7 +212,7 @@ def live_goods_create(request):
 
                             'price2': price2 / 100,
              
 
                             'url': 'pages/live/order/order?goods_id=' + goods_info.goods_id,
              
 
                         }
              
 
                -    } 
              
 
                +    }
              
 
                 
              
 
                     wx_goods = requests.post(url=('https://api.weixin.qq.com/wxaapi/broadcast/goods/add?access_token=' + token), json=data).text
              
 
                     wx_goods = json.loads(wx_goods)
              
@@ -227,6 +225,7 @@ def live_goods_create(request):
 
                         'goods': goods_info.admindata,
              
 
                     })
              
 
                 
              
 
                +
              
 
                 @logit(res=True)
              
 
                 def live_goods_update(request):
              
 
                     admin_id = request.POST.get('admin_id', '')
              
@@ -239,7 +238,6 @@ def live_goods_update(request):
 
                         administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              
 
                     except AdministratorInfo.DoesNotExist:
              
 
                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              
 
                -    
              
 
                 
              
 
                     goods_info = liveGoodsInfo.objects.get(goods_id=goods_id, status=True)
              
 
                 
              
@@ -255,8 +253,8 @@ def live_goods_update(request):
 
                     if media_id == '':
              
 
                         return response()
              
 
                 
              
 
                -    data ={
              
 
                -        "goodsInfo": {
              
 
                +    data = {
              
 
                +        'goodsInfo': {
              
 
                             'goodsId': goods_info.wx_goods_id,
              
 
                             'name': goods_info.name,
              
 
                             'coverImgUrl': media_id,
              
@@ -265,7 +263,7 @@ def live_goods_update(request):
 
                             'price2': price2 / 100,
              
 
                             'url': 'pages/live/order/order?goods_id=' + goods_id,
              
 
                         }
              
 
                -    } 
              
 
                +    }
              
 
                 
              
 
                     wx_goods = requests.post(url=('https://api.weixin.qq.com/wxaapi/broadcast/goods/update?access_token=' + token), json=data).text
              
 
                     errcode = json.loads(wx_goods).get('errcode', -1)
              
@@ -278,12 +276,12 @@ def live_goods_update(request):
 
                     goods_info.price2 = price2
              
 
                     goods_info.coverImgUrl = media_id
              
 
                     goods_info.save()
              
 
                -    
              
 
                 
              
 
                     return response(200, 'Live Goods Update Success', u'直播商品库更新成功', data={
              
 
                         'goods': goods_info.admindata,
              
 
                     })
              
 
                 
              
 
                +
              
 
                 @logit(res=True)
              
 
                 def live_goods_audit(request):
              
 
                     admin_id = request.POST.get('admin_id', '')
              
@@ -291,7 +289,6 @@ def live_goods_audit(request):
 
                         administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              
 
                     except AdministratorInfo.DoesNotExist:
              
 
                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              
 
                -    
              
 
                 
              
 
                     wxcfg = WECHAT.get('MINIAPP', {})
              
 
                 
              
@@ -312,9 +309,8 @@ def live_goods_audit(request):
 
                         g = liveGoodsInfo.objects.get(wx_goods_id=goods.get('goods_id', ''), status=True)
              
 
                         g.audit_status = goods.get('audit_status', 0)
              
 
                         g.save()
              
 
                -    
              
 
                -    return response(200, 'Live Goods Audit Success', '获取直播商品库审核状态成功') 
              
 
                 
              
 
                +    return response(200, 'Live Goods Audit Success', '获取直播商品库审核状态成功')
              
 
                 
              
 
                 
              
 
                 @logit(res=True)
              
@@ -322,11 +318,11 @@ def live_goods_delete(request):
 
                     admin_id = request.POST.get('admin_id', '')
              
 
                     goods_id = request.POST.get('goods_id', '')
              
 
                     wx_goods_id = request.POST.get('wx_goods_id', '')
              
 
                +
              
 
                     try:
              
 
                         administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              
 
                     except AdministratorInfo.DoesNotExist:
              
 
                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              
 
                -    
              
 
                 
              
 
                     wxcfg = WECHAT.get('MINIAPP', {})
              
 
                 
              
@@ -334,18 +330,15 @@ def live_goods_delete(request):
 
                     secret = wxcfg.get('appsecret')
              
 
                     token = access_token(appid, secret)
              
 
                 
              
 
                -    status = requests.post(url=('https://api.weixin.qq.com/wxaapi/broadcast/goods/delete?access_token=' + token), json={ 'goodsId': wx_goods_id}).text
              
 
                +    status = requests.post(url=('https://api.weixin.qq.com/wxaapi/broadcast/goods/delete?access_token=' + token), json={'goodsId': wx_goods_id}).text
              
 
                     errcode = json.loads(status).get('errcode', -1)
              
 
                 
              
 
                     if errcode != 0:
              
 
                         return response()
              
 
                -    
              
 
                -    try:
              
 
                -        liveGoodsInfo.objects.filter(goods_id=goods_id, status=True).update(status=False)
              
 
                -    except:
              
 
                -        return response()
              
 
                -    
              
 
                -    return response(200, 'Live Goods Delete Success', '直播商品库删除成功') 
              
 
                +
              
 
                +    liveGoodsInfo.objects.filter(goods_id=goods_id, status=True).update(status=False)
              
 
                +
              
 
                +    return response(200, 'Live Goods Delete Success', '直播商品库删除成功')
              
 
                 
              
 
                 
              
 
                 @logit(res=True)
              
@@ -373,6 +366,7 @@ def live_room_list(request):
 
                         'count': count,
              
 
                     })
              
 
                 
              
 
                +
              
 
                 @logit(res=True)
              
 
                 def live_order_list(request):
              
 
                     admin_id = request.POST.get('admin_id', '')
              
@@ -386,11 +380,11 @@ def live_order_list(request):
 
                         administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              
 
                     except AdministratorInfo.DoesNotExist:
              
 
                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              
 
                -    
              
 
                +
              
 
                     orders = RoomOrderInfo.objects.filter(Q(name__contains=query) | Q(phone__contains=query)).order_by('-created_at')
              
 
                     if pay_status:
              
 
                         orders = orders.filter(pay_status=pay_status)
              
 
                -    
              
 
                +
              
 
                     if goods_name:
              
 
                         goods_infos = liveGoodsInfo.objects.filter(goods_name__contains=goods_name)
              
 
                         goods_infos = [info.goods_id for info in goods_infos]
              
@@ -405,12 +399,13 @@ def live_order_list(request):
 
                         'count': count,
              
 
                     })
              
 
                 
              
 
                +
              
 
                 @logit(res=True)
              
 
                 def live_order_delivery(request):
              
 
                     admin_id = request.POST.get('admin_id', '')
              
 
                     order_id = request.POST.get('order_id', '')
              
 
                     user_id = request.POST.get('user_id', '')
              
 
                -    
              
 
                +
              
 
                     delivery_id = request.POST.get('delivery_id', '')
              
 
                     biz_id = request.POST.get('biz_id', '')
              
 
                 
              
@@ -418,13 +413,13 @@ def live_order_delivery(request):
 
                         administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              
 
                     except AdministratorInfo.DoesNotExist:
              
 
                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              
 
                -    
              
 
                +
              
 
                     user = UserInfo.objects.get(user_id=user_id, status=True)
              
 
                 
              
 
                     order = RoomOrderInfo.objects.get(order_id=order_id, status=True)
              
 
                 
              
 
                     goods = liveGoodsInfo.objects.get(goods_id=order.goods_id, status=True)
              
 
                -    
              
 
                +
              
 
                     wxcfg = WECHAT.get('MINIAPP', {})
              
 
                 
              
 
                     appid = wxcfg.get('appID')
              
@@ -462,13 +457,15 @@ def live_order_delivery(request):
 
                             'spaceX': 10,
              
 
                             'spaceY': 10,
              
 
                             'spaceZ': 10,
              
 
                -            'detail_list': [{
              
 
                -            'name': goods.name,
              
 
                -            'count': order.amount,
              
 
                -            }]
              
 
                +            'detail_list': [
              
 
                +                {
              
 
                +                    'name': goods.name,
              
 
                +                    'count': order.amount,
              
 
                +                }
              
 
                +            ]
              
 
                         },
              
 
                         'shop': {
              
 
                -            'wxa_path': 'pages/live/anchorHome/anchorHome?anchor_id='+order.anchor_id,
              
 
                +            'wxa_path': 'pages/live/anchorHome/anchorHome?anchor_id=' + order.anchor_id,
              
 
                             'img_url': goods.goods_img_url,
              
 
                             'goods_name': goods.name,
              
 
                             'goods_count': order.amount,
              
@@ -493,14 +490,15 @@ def live_order_delivery(request):
 
                         deliveryResultcode = res.get('delivery_resultcode', '')
              
 
                         deliveryResultmsg = res.get('delivery_resultmsg', '')
              
 
                         return response(errCode, errMsg, str(deliveryResultcode) + ':' + deliveryResultmsg)
              
 
                -    
              
 
                +
              
 
                     order.tracking_number = res.get('waybill_id', '')
              
 
                     order.save()
              
 
                -    
              
 
                +
              
 
                     return response(200, 'Live Order Delivery Success', '直播订单下单成功', data={
              
 
                         'order': order.admindata
              
 
                     })
              
 
                 
              
 
                +
              
 
                 @logit(res=True)
              
 
                 def fetch_wx_room_list(request):
              
 
                     admin_id = request.POST.get('admin_id', '')
              
@@ -508,7 +506,6 @@ def fetch_wx_room_list(request):
 
                         administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              
 
                     except AdministratorInfo.DoesNotExist:
              
 
                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              
 
                -    
              
 
                 
              
 
                     wxcfg = WECHAT.get('MINIAPP', {})
              
 
                 
              
@@ -521,7 +518,7 @@ def fetch_wx_room_list(request):
 
                     if rooms.count() != 0:
              
 
                         start = int(rooms[0].room_id) - 1
              
 
                 
              
 
                -    roominfos = requests.post(url=('http://api.weixin.qq.com/wxa/business/getliveinfo?access_token='+token), json={'start': 0, 'limit': 99})
              
 
                +    roominfos = requests.post(url=('http://api.weixin.qq.com/wxa/business/getliveinfo?access_token=' + token), json={'start': 0, 'limit': 99})
              
 
                 
              
 
                     roominfos = json.loads(roominfos.text).get('room_info', {})
              
 
                     for roominfo in roominfos:
              
@@ -540,9 +537,10 @@ def fetch_wx_room_list(request):
 
                         room.anchor_name = roominfo.get('anchor_name', '')
              
 
                         room.anchor_id = anchor.anchor_id
              
 
                         room.save()
              
 
                -    
              
 
                +
              
 
                     return response(200, 'Fetch wx Room List Success', u'微信直播间列表获取成功')
              
 
                 
              
 
                +
              
 
                 @logit(res=True)
              
 
                 def room_goods_list(request):
              
 
                     admin_id = request.POST.get('admin_id', '')
              
@@ -554,7 +552,7 @@ def room_goods_list(request):
 
                         administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
              
 
                     except AdministratorInfo.DoesNotExist:
              
 
                         return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
              
 
                -    
              
 
                +
              
 
                     goods_list = RoomGoodsInfo.objects.filter(status=True).order_by('-created_at')
              
 
                 
              
 
                     if room_id:
              
@@ -569,6 +567,7 @@ def room_goods_list(request):
 
                         'count': count,
              
 
                     })
              
 
                 
              
 
                +
              
 
                 def room_goods_add(request):
              
 
                     admin_id = request.POST.get('admin_id', '')
              
 
                     room_id = request.POST.get('room_id', '')
              
@@ -591,6 +590,7 @@ def room_goods_add(request):
 
                 
              
 
                     return response(200, 'Room Goods Add Success', u'直播间商品库添加成功')
              
 
                 
              
 
                +
              
 
                 def room_goods_publish(request):
              
 
                     admin_id = request.POST.get('admin_id', '')
              
 
                     room_id = request.POST.get('room_id', '')
              
@@ -606,17 +606,18 @@ def room_goods_publish(request):
 
                     secret = wxcfg.get('appsecret')
              
 
                     token = access_token(appid, secret)
              
 
                 
              
 
                -    status = requests.post(url=('https://api.weixin.qq.com/wxaapi/broadcast/room/addgoods?access_token=' + token), json={ 'ids': [goods.wx_goods_id], 'roomId': room_id}).text
              
 
                +    status = requests.post(url=('https://api.weixin.qq.com/wxaapi/broadcast/room/addgoods?access_token=' + token), json={'ids': [goods.wx_goods_id], 'roomId': room_id}).text
              
 
                     errcode = json.loads(status).get('errcode', -1)
              
 
                 
              
 
                     if errcode != 0:
              
 
                         return response(errcode, 'Room Goods Publish Fail', '直播间商品发布失败')
              
 
                -    
              
 
                +
              
 
                     room_goods.goods_status = RoomGoodsInfo.PUBLISH
              
 
                     room_goods.save()
              
 
                 
              
 
                     return response(200, 'Room Goods Publish Success', '直播间商品上架成功')
              
 
                 
              
 
                +
              
 
                 def room_goods_off(request):
              
 
                     admin_id = request.POST.get('admin_id', '')
              
 
                     room_id = request.POST.get('room_id', '')
              
@@ -629,6 +630,7 @@ def room_goods_off(request):
 
                 
              
 
                     return response(200, 'Room Goods Off Success', '直播间商品下架成功')
              
 
                 
              
 
                +
              
 
                 def room_goods_update(request):
              
 
                     admin_id = request.POST.get('admin_id', '')
              
 
                     room_id = request.POST.get('room_id', '')
              
--- a/api/mini_views.py
+++ b/api/mini_views.py
@@ -64,6 +64,7 @@ def mini_login_api(request):
 
                 
              
 
                     return response(data=user.data)
              
 
                 
              
 
                +
              
 
                 @logit(res=True)
              
 
                 @transaction.atomic
              
 
                 def mini_live_login_api(request):
              
@@ -112,7 +113,6 @@ def mini_live_login_api(request):
 
                     # Store SessionKey
              
 
                     store_session_key(appid=appid, secret=secret, session_key=session_key, unid=user.user_id, storage=RedisStorage(r))
              
 
                 
              
 
                -
              
 
                     # Update live
              
 
                     room = RoomInfo.objects.get(room_id=room_id)
              
 
                     is_new = not RoomUserInfo.objects.filter(user_id=user.user_id).exists()
              
@@ -129,7 +129,6 @@ def mini_live_login_api(request):
 
                     room_user.is_new = is_new
              
 
                     room_user.save()
              
 
                 
              
 
                -
              
 
                     return response(data=user.data)
              
 
                 
              
 
                 
              
--- a/api/urls.py
+++ b/api/urls.py
@@ -4,8 +4,8 @@ from django.conf.urls import url
 
                 from django_file_upload import views as file_views
              
 
                 
              
 
                 from api import admin_views, mini_views, oauth_views, pack_views
              
 
                -from pay import views as pay_views
              
 
                 from live import views as live_views
              
 
                +from pay import views as pay_views
              
 
                 
              
 
                 
              
 
                 urlpatterns = [
              
@@ -23,7 +23,7 @@ urlpatterns += [
 
                     url(r'^pay/wx/notify_url$', pay_views.wx_notify_url_api, name='wx_notify_url_api'),  # 支付异步通知回调地址
              
 
                 ]
              
 
                 
              
 
                -#直播相关
              
 
                +# 直播相关
              
 
                 urlpatterns += [
              
 
                     url(r'^live/anchor/detail$', live_views.anchor_detail, name='anchor_detail'),   # 微信直播间列表
              
 
                     url(r'^live/goods/detail$', live_views.room_goods_detail, name='room_goods_detail'),
              
@@ -55,15 +55,15 @@ urlpatterns += [
 
                     url(r'^admin/live/room/list$', admin_views.live_room_list, name='live_room_list'),   # 直播间列表
              
 
                 
              
 
                     url(r'^admin/live/order/list$', admin_views.live_order_list, name='live_order_list'),   # 直播间订单列表
              
 
                -    url(r'^admin/live/order/delivery$', admin_views.live_order_delivery, name='live_order_delivery'), # 直播间订单发货
              
 
                +    url(r'^admin/live/order/delivery$', admin_views.live_order_delivery, name='live_order_delivery'),  # 直播间订单发货
              
 
                 
              
 
                -    url(r'^admin/room/goods/list$', admin_views.room_goods_list, name='room_goods_list'), # 直播间商品
              
 
                -    url(r'^admin/room/goods/add$', admin_views.room_goods_add, name='room_goods_add'), #添加直播间商品
              
 
                -    url(r'^admin/room/goods/publish$', admin_views.room_goods_publish, name='room_goods_publish'), #直播间商品上架
              
 
                -    url(r'^admin/room/goods/off$', admin_views.room_goods_off, name='room_goods_off'), #直播间商品下架
              
 
                -    url(r'^admin/room/goods/update$', admin_views.room_goods_update, name='room_goods_update'), #直播间商品库存更新
              
 
                +    url(r'^admin/room/goods/list$', admin_views.room_goods_list, name='room_goods_list'),  # 直播间商品
              
 
                +    url(r'^admin/room/goods/add$', admin_views.room_goods_add, name='room_goods_add'),  # 添加直播间商品
              
 
                +    url(r'^admin/room/goods/publish$', admin_views.room_goods_publish, name='room_goods_publish'),  # 直播间商品上架
              
 
                +    url(r'^admin/room/goods/off$', admin_views.room_goods_off, name='room_goods_off'),  # 直播间商品下架
              
 
                +    url(r'^admin/room/goods/update$', admin_views.room_goods_update, name='room_goods_update'),  # 直播间商品库存更新
              
 
                 
              
 
                -    #微信直播 api
              
 
                +    # 微信直播 api
              
 
                     url(r'^admin/live/wx/room/list$', admin_views.fetch_wx_room_list, name='fetch_wx_room_list'),   # 微信直播间列表
              
 
                 ]
              
 
                 
              
--- a/live/admin.py
+++ b/live/admin.py
@@ -1,6 +1,6 @@
 
                 from django.contrib import admin
              
 
                 
              
 
                -from live.models import RoomGoodsInfo, RoomInfo, AnchorInfo, liveGoodsInfo, RoomOrderInfo, RoomUserInfo
              
 
                +from live.models import AnchorInfo, RoomGoodsInfo, RoomInfo, RoomOrderInfo, RoomUserInfo, liveGoodsInfo
              
 
                 
              
 
                 
              
 
                 class AnchorInfoAdmin(admin.ModelAdmin):
              
@@ -18,10 +18,12 @@ class liveGoodsInfoAdmin(admin.ModelAdmin):
 
                 class RoomGoodsInfoAdmin(admin.ModelAdmin):
              
 
                     list_display = ('room_id', 'anchor_id', 'goods_id', 'inventory', 'sale_infos', 'status', 'created_at', 'updated_at')
              
 
                 
              
 
                +
              
 
                 class RoomOrderInfoAdmin(admin.ModelAdmin):
              
 
                     list_display = ('order_id', 'anchor_id', 'room_id', 'goods_id', 'share_openid', 'user_id', 'total_fee', 'name', 'phone', 'address', 'tracking_number', 'pay_status', 'status', 'created_at', 'updated_at')
              
 
                     readonly_fields_exclude = ('tracking_number', )
              
 
                 
              
 
                +
              
 
                 class RoomUserInfoAdmin(admin.ModelAdmin):
              
 
                     list_display = ('room_id', 'anchor_id', 'user_id', 'openid', 'share_openid', 'status', 'created_at', 'updated_at')
              
 
                 
              
@@ -31,4 +33,4 @@ admin.site.register(RoomInfo, RoomInfoAdmin)
 
                 admin.site.register(liveGoodsInfo, liveGoodsInfoAdmin)
              
 
                 admin.site.register(RoomGoodsInfo, RoomGoodsInfoAdmin)
              
 
                 admin.site.register(RoomOrderInfo, RoomOrderInfoAdmin)
              
 
                -admin.site.register(RoomUserInfo, RoomUserInfoAdmin)
              
 
                +admin.site.register(RoomUserInfo, RoomUserInfoAdmin)
              
--- a/live/models.py
+++ b/live/models.py
@@ -1,5 +1,3 @@
 
                -import json
              
 
                -
              
 
                 from django.db import models
              
 
                 from django.utils.translation import ugettext_lazy as _
              
 
                 from django_models_ext import BaseModelMixin, upload_file_path, upload_file_url, upload_path
              
@@ -7,9 +5,9 @@ from jsonfield import JSONField
 
                 from shortuuidfield import ShortUUIDField
              
 
                 from TimeConvert import TimeConvert as tc
              
 
                 
              
 
                -from account.models import UserInfo
              
 
                 from simditor.fields import RichTextField
              
 
                 
              
 
                +
              
 
                 class AnchorInfo(BaseModelMixin):
              
 
                     anchor_id = ShortUUIDField(_('anchor_id'), max_length=32, blank=True, help_text='主播唯一标识', unique=True)
              
 
                     # 微信相关
              
@@ -20,14 +18,14 @@ class AnchorInfo(BaseModelMixin):
 
                     anchor_name = models.CharField(_('anchor_name'), max_length=255, blank=True, help_text='主播姓名', db_index=True)
              
 
                     anchor_avatar = models.ImageField(_('anchor_avatar'), upload_to=upload_path, help_text='主播头像')
              
 
                     anchor_intro = RichTextField(_('anchor_intro'), blank=True, help_text='主播介绍')
              
 
                -    
              
 
                +
              
 
                     class Meta:
              
 
                         verbose_name = _('主播信息')
              
 
                         verbose_name_plural = _('主播信息')
              
 
                 
              
 
                     def __unicode__(self):
              
 
                         return self.pk
              
 
                -    
              
 
                +
              
 
                     @property
              
 
                     def anchor_avatar_path(self):
              
 
                         return upload_file_path(self.anchor_avatar)
              
@@ -35,6 +33,7 @@ class AnchorInfo(BaseModelMixin):
 
                     @property
              
 
                     def anchor_avatar_url(self):
              
 
                         return upload_file_url(self.anchor_avatar)
              
 
                +
              
 
                     @property
              
 
                     def banner_path(self):
              
 
                         return upload_file_path(self.banner)
              
@@ -57,8 +56,8 @@ class RoomInfo(BaseModelMixin):
 
                 
              
 
                     anchor_id = models.CharField(_('anchor_id'), blank=True, max_length=32, help_text='主播唯一标识')
              
 
                     anchor_name = models.CharField(_('anchor_name'), blank=True, max_length=255, help_text='主播名称', db_index=True)
              
 
                -    
              
 
                -    # "goods": [          
              
 
                +
              
 
                +    # "goods": [
              
 
                     #     {
              
 
                     #         "cover_img": "http://mmbiz.qpic.cn/mmbiz_png/FVribAGdErI2PmyST9ZM0JLbNM48I7TH2FlrwYOlnYqGaej8qKubG1EvK0QIkkwqvicrYTzVtjKmSZSeY5ianc3mw/0?wx_fmt=png",
              
 
                     #         "url": "pages/index/index.html",
              
@@ -74,7 +73,7 @@ class RoomInfo(BaseModelMixin):
 
                 
              
 
                     def __unicode__(self):
              
 
                         return self.pk
              
 
                -    
              
 
                +
              
 
                     @property
              
 
                     def cover_img_path(self):
              
 
                         return upload_file_path(self.cover_img)
              
@@ -82,7 +81,7 @@ class RoomInfo(BaseModelMixin):
 
                     @property
              
 
                     def cover_img_url(self):
              
 
                         return upload_file_url(self.cover_img)
              
 
                -    
              
 
                +
              
 
                     @property
              
 
                     def share_img_path(self):
              
 
                         return upload_file_path(self.share_img)
              
@@ -100,7 +99,7 @@ class RoomInfo(BaseModelMixin):
 
                             'cover_img': self.wx_cover_img,
              
 
                             'share_img': self.wx_share_img,
              
 
                         }
              
 
                -       
              
 
                +
              
 
                     @property
              
 
                     def admindata(self):
              
 
                         anchor = AnchorInfo.objects.get(anchor_id=self.anchor_id)
              
@@ -117,7 +116,7 @@ class RoomInfo(BaseModelMixin):
 
                             'anchor_avatar': anchor.anchor_avatar_url
              
 
                         }
              
 
                 
              
 
                -  
              
 
                +
              
 
                 class liveGoodsInfo(BaseModelMixin):
              
 
                     goods_id = ShortUUIDField(_('goods_id'), max_length=32, blank=True, help_text='商品ID', unique=True)
              
 
                 
              
@@ -161,7 +160,7 @@ class liveGoodsInfo(BaseModelMixin):
 
                     @property
              
 
                     def goods_img_url(self):
              
 
                         return upload_file_url(self.goods_img)
              
 
                -    
              
 
                +
              
 
                     @property
              
 
                     def admindata(self):
              
 
                         return {
              
@@ -179,7 +178,6 @@ class liveGoodsInfo(BaseModelMixin):
 
                         }
              
 
                 
              
 
                 
              
 
                -
              
 
                 class RoomGoodsInfo(BaseModelMixin):
              
 
                     PUBLISH = 0
              
 
                     DRAFT = 1
              
@@ -205,7 +203,7 @@ class RoomGoodsInfo(BaseModelMixin):
 
                 
              
 
                     def __unicode__(self):
              
 
                         return self.pk
              
 
                -    
              
 
                +
              
 
                     @property
              
 
                     def admindata(self):
              
 
                         goods = liveGoodsInfo.objects.get(goods_id=self.goods_id)
              
@@ -230,6 +228,7 @@ class RoomGoodsInfo(BaseModelMixin):
 
                             'sale_count': len(self.sale_infos),
              
 
                         }
              
 
                 
              
 
                +
              
 
                 class RoomUserInfo(BaseModelMixin):
              
 
                     room_id = models.CharField(_('room_id'), max_length=32, help_text='房间唯一标识', db_index=True)
              
 
                     anchor_id = models.CharField(_('anchor_id'), max_length=32, blank=True, help_text='主播唯一标识')
              
@@ -247,6 +246,7 @@ class RoomUserInfo(BaseModelMixin):
 
                     def __unicode__(self):
              
 
                         return self.pk
              
 
                 
              
 
                +
              
 
                 class RoomOrderInfo(BaseModelMixin):
              
 
                     """
              
 
                     # Trade State of Wechat Query
              
@@ -279,7 +279,7 @@ class RoomOrderInfo(BaseModelMixin):
 
                     share_openid = models.CharField(_('share_openid'), max_length=32, blank=True, help_text='转发用户 openid')
              
 
                 
              
 
                     amount = models.IntegerField(_('amount'), default=0, help_text='数量')
              
 
                -    
              
 
                +
              
 
                     name = models.CharField(_('name'), max_length=255, blank=True, null=True, help_text='姓名')
              
 
                     phone = models.CharField(_('phone'), max_length=255, blank=True, null=True, help_text='电话')
              
 
                     province = models.CharField(_('province'), max_length=255, blank=True, null=True, help_text='省份')
              
@@ -344,4 +344,4 @@ class RoomOrderInfo(BaseModelMixin):
 
                             'total_fee': self.total_fee,
              
 
                             'pay_status': self.pay_status,
              
 
                             'paid_at': tc.local_string(utc_dt=self.paid_at, format='%Y-%m-%d %H:%M'),
              
 
                -        }
              
 
                +        }
              
--- a/live/tests.py
+++ b/live/tests.py
@@ -1,3 +1,4 @@
 
                 from django.test import TestCase
              
 
                 
              
 
                +
              
 
                 # Create your tests here.
              
--- a/live/views.py
+++ b/live/views.py
@@ -1,35 +1,34 @@
 
                -from django.shortcuts import render
              
 
                -from django_query import get_query_value
              
 
                +from django.conf import settings
              
 
                 from django.db import transaction
              
 
                -from django_response import response
              
 
                 from django.shortcuts import HttpResponse
              
 
                 from django_logit import logit
              
 
                +from django_query import get_query_value
              
 
                +from django_response import response
              
 
                 from pywe_exception import WeChatPayException
              
 
                 from pywe_pay import WeChatPay
              
 
                 from pywe_pay_notify import check_pay_notify
              
 
                 from pywe_response import WXPAY_NOTIFY_FAIL, WXPAY_NOTIFY_SUCCESS
              
 
                 from TimeConvert import TimeConvert as tc
              
 
                 
              
 
                -from django.conf import settings
              
 
                -
              
 
                -from live.models import liveGoodsInfo, RoomGoodsInfo, RoomOrderInfo, RoomInfo, AnchorInfo
              
 
                 from account.models import UserInfo
              
 
                -
              
 
                +from live.models import AnchorInfo, RoomGoodsInfo, RoomInfo, RoomOrderInfo, liveGoodsInfo
              
 
                 from utils.error.errno_utils import OrderStatusCode, UserStatusCode
              
 
                 
              
 
                +
              
 
                 WECHAT = settings.WECHAT
              
 
                 
              
 
                +
              
 
                 def anchor_detail(request):
              
 
                     anchor_id = get_query_value(request, 'anchor_id', '')
              
 
                 
              
 
                     try:
              
 
                         anchor = AnchorInfo.objects.get(anchor_id=anchor_id)
              
 
                -    except:
              
 
                +    except AnchorInfo.DoesNotExist:
              
 
                         return response()
              
 
                -    
              
 
                +
              
 
                     rooms = RoomInfo.objects.filter(anchor_id=anchor_id)
              
 
                     rooms = [room.anchorData for room in rooms]
              
 
                -    
              
 
                +
              
 
                     return response(200, 'Get Room Anchor Details Success', '获取主播详情成功', data={
              
 
                         'anchor': {
              
 
                             'anchor_id': anchor.anchor_id,
              
@@ -43,49 +42,50 @@ def anchor_detail(request):
 
                 
              
 
                 
              
 
                 def room_goods_detail(request):
              
 
                -  goods_id = get_query_value(request, 'goods_id', '')
              
 
                -  room_id = get_query_value(request, 'room_id', '')
              
 
                -  
              
 
                -  # 校验直播间和商品
              
 
                -  try:
              
 
                -    room_goods_info = RoomGoodsInfo.objects.get(goods_id=goods_id, room_id=room_id)
              
 
                -  except:
              
 
                -    return response(400001, 'Room Goods Not Found', '直播间商品不存在')
              
 
                -  
              
 
                -  try:
              
 
                -    goods_info = liveGoodsInfo.objects.get(goods_id=goods_id)
              
 
                -  except:
              
 
                -    return response(400001, 'Live Goods Not Found', '直播商品不存在')
              
 
                -
              
 
                -  return response(200, 'Get Room Goods Detail Success', '获取直播间商品成功', data={
              
 
                +    goods_id = get_query_value(request, 'goods_id', '')
              
 
                +    room_id = get_query_value(request, 'room_id', '')
              
 
                +
              
 
                +    # 校验直播间和商品
              
 
                +    try:
              
 
                +        room_goods_info = RoomGoodsInfo.objects.get(goods_id=goods_id, room_id=room_id)
              
 
                +    except RoomGoodsInfo.DoesNotExist:
              
 
                +        return response(400001, 'Room Goods Not Found', '直播间商品不存在')
              
 
                +
              
 
                +    try:
              
 
                +        goods_info = liveGoodsInfo.objects.get(goods_id=goods_id)
              
 
                +    except liveGoodsInfo.DoesNotExist:
              
 
                +        return response(400001, 'Live Goods Not Found', '直播商品不存在')
              
 
                +
              
 
                +    return response(200, 'Get Room Goods Detail Success', '获取直播间商品成功', data={
              
 
                         'goods_info': {
              
 
                -          'goods_img': goods_info.goods_img_url,
              
 
                -          'name': goods_info.name,
              
 
                -          'price_type': goods_info.price_type,
              
 
                -          'price': goods_info.price,
              
 
                -          'price2': goods_info.price2,
              
 
                -          'goods_status': room_goods_info.goods_status,
              
 
                -          'inventory': room_goods_info.inventory,
              
 
                +            'goods_img': goods_info.goods_img_url,
              
 
                +            'name': goods_info.name,
              
 
                +            'price_type': goods_info.price_type,
              
 
                +            'price': goods_info.price,
              
 
                +            'price2': goods_info.price2,
              
 
                +            'goods_status': room_goods_info.goods_status,
              
 
                +            'inventory': room_goods_info.inventory,
              
 
                         },
              
 
                         'anchor_id': room_goods_info.anchor_id,
              
 
                -      })
              
 
                +    })
              
 
                +
              
 
                 
              
 
                 def room_anchor_details(request):
              
 
                     room_id = request.POST.get('room_id', '')
              
 
                 
              
 
                     try:
              
 
                         room = RoomInfo.objects.get(room_id=room_id)
              
 
                -    except:
              
 
                +    except RoomInfo.DoesNotExist:
              
 
                         return response()
              
 
                -    
              
 
                +
              
 
                     try:
              
 
                         anchor = AnchorInfo.objects.get(anchor_id=room.anchor_id)
              
 
                -    except:
              
 
                +    except AnchorInfo.DoesNotExist:
              
 
                         return response()
              
 
                -    
              
 
                +
              
 
                     rooms = RoomInfo.objects.filter(anchor_id=room.anchor_id)
              
 
                     rooms = [room.anchorData for room in rooms]
              
 
                -    
              
 
                +
              
 
                     return response(200, 'Get Room Anchor Details Success', '获取主播详情成功', data={
              
 
                         'anchor': {
              
 
                             'anchor_id': anchor.anchor_id,
              
@@ -97,6 +97,7 @@ def room_anchor_details(request):
 
                         'rooms': rooms
              
 
                     })
              
 
                 
              
 
                +
              
 
                 @logit
              
 
                 def live_order_create(request):
              
 
                     """ 订单创建 """
              
@@ -121,32 +122,34 @@ def live_order_create(request):
 
                     # 用户校验
              
 
                     try:
              
 
                         user = UserInfo.objects.get(user_id=user_id, status=True)
              
 
                -        user.consignee_name = name
              
 
                -        user.consignee_phone = phone
              
 
                -        user.consignee_province = province
              
 
                -        user.consignee_city = city
              
 
                -        user.consignee_county = county
              
 
                -        user.consignee_address = address
              
 
                -        user.save()
              
 
                     except UserInfo.DoesNotExist:
              
 
                         return response(UserStatusCode.USER_NOT_FOUND)
              
 
                 
              
 
                +    user.consignee_name = name
              
 
                +    user.consignee_phone = phone
              
 
                +    user.consignee_province = province
              
 
                +    user.consignee_city = city
              
 
                +    user.consignee_county = county
              
 
                +    user.consignee_address = address
              
 
                +    user.save()
              
 
                +
              
 
                     # 校验直播间和商品
              
 
                     try:
              
 
                         room_goods_info = RoomGoodsInfo.objects.get(goods_id=goods_id, room_id=room_id, anchor_id=anchor_id)
              
 
                -    except:
              
 
                +    except RoomGoodsInfo.DoesNotExist:
              
 
                         return response(400001, 'Room Goods Not Found', description='直播间商品不存在')
              
 
                 
              
 
                -    #库存校验
              
 
                +    # 库存校验
              
 
                     if room_goods_info.inventory <= 0:
              
 
                         return response(400001, 'Room Goods Not En', description='商品库存不足')
              
 
                 
              
 
                     # 金额校验
              
 
                     try:
              
 
                         goods_info = liveGoodsInfo.objects.get(goods_id=goods_id)
              
 
                -        if amount * int(goods_info.price if goods_info.price_type == 1 else goods_info.price2) != total_fee:
              
 
                -            return response(404091, 'FEE Check Fail', description='金额校验失败')
              
 
                -    except:
              
 
                +    except liveGoodsInfo.DoesNotExist:
              
 
                +        return response(404091, 'FEE Check Fail', description='金额校验失败')
              
 
                +
              
 
                +    if amount * int(goods_info.price if goods_info.price_type == 1 else goods_info.price2) != total_fee:
              
 
                         return response(404091, 'FEE Check Fail', description='金额校验失败')
              
 
                 
              
 
                     # 消库存
              
@@ -198,7 +201,6 @@ def live_order_create(request):
 
                     order.save()
              
 
                 
              
 
                     wxpay_params = wxpay.jsapi.get_jsapi_params(prepay_id)
              
 
                -    
              
 
                 
              
 
                     return response(200, 'Order Create Success', '订单创建成功', {
              
 
                         'order_id': order.order_id,
              
@@ -206,6 +208,7 @@ def live_order_create(request):
 
                         'wxpay_params': wxpay_params,
              
 
                     })
              
 
                 
              
 
                +
              
 
                 def live_order_cancel(request):
              
 
                     user_id = request.POST.get('user_id', '')
              
 
                     order_id = request.POST.get('order_id', '')
              
@@ -213,24 +216,26 @@ def live_order_cancel(request):
 
                 
              
 
                     try:
              
 
                         order = RoomOrderInfo.objects.get(user_id=user_id, order_id=order_id, prepay_id=prepay_id)
              
 
                -    except:
              
 
                +    except RoomOrderInfo.DoesNotExist:
              
 
                         return response(400001, 'Order Not Found', description='直播间订单不存在')
              
 
                -    
              
 
                +
              
 
                     if order.pay_status == RoomOrderInfo.FAIL:
              
 
                         return response(200, 'Order Cancel Success', '订单取消成功')
              
 
                -    
              
 
                +
              
 
                     order.pay_status = RoomOrderInfo.FAIL
              
 
                     order.save()
              
 
                -    
              
 
                +
              
 
                     try:
              
 
                         goods_info = RoomGoodsInfo.objects.get(room_id=order.room_id, goods_id=order.goods_id, anchor_id=order.anchor_id)
              
 
                -        goods_info.inventory += order.amount
              
 
                -        goods_info.save()
              
 
                -    except:
              
 
                +    except RoomGoodsInfo.DoesNotExist:
              
 
                         return response(400001, 'Room Goods Not Found', description='直播间商品不存在')
              
 
                -    
              
 
                +
              
 
                +    goods_info.inventory += order.amount
              
 
                +    goods_info.save()
              
 
                +
              
 
                     return response(200, 'Order Cancel Success', '订单取消成功')
              
 
                 
              
 
                +
              
 
                 def order_paid_success(order):
              
 
                     if order.pay_status == RoomOrderInfo.PAID:
              
 
                         return
              
@@ -241,11 +246,13 @@ def order_paid_success(order):
 
                 
              
 
                     try:
              
 
                         goods_info = RoomGoodsInfo.objects.get(room_id=order.room_id, goods_id=order.goods_id, anchor_id=order.anchor_id)
              
 
                -        goods_info.sale_infos += [order.order_id]
              
 
                -        goods_info.save()
              
 
                -    except:
              
 
                +    except RoomGoodsInfo.DoesNotExist:
              
 
                         return
              
 
                 
              
 
                +    goods_info.sale_infos += [order.order_id]
              
 
                +    goods_info.save()
              
 
                +
              
 
                +
              
 
                 def order_paid_fail(order):
              
 
                     if order.pay_status == RoomGoodsInfo.FAIL:
              
 
                         return
              
@@ -255,11 +262,13 @@ def order_paid_fail(order):
 
                 
              
 
                     try:
              
 
                         goods_info = RoomGoodsInfo.objects.get(room_id=order.room_id, goods_id=order.goods_id, anchor_id=order.anchor_id)
              
 
                -        goods_info.inventory += order.amount
              
 
                -        goods_info.save()
              
 
                -    except:
              
 
                +    except RoomGoodsInfo.DoesNotExist:
              
 
                         return
              
 
                 
              
 
                +    goods_info.inventory += order.amount
              
 
                +    goods_info.save()
              
 
                +
              
 
                +
              
 
                 @logit
              
 
                 @transaction.atomic
              
 
                 def notify_url_api(request):
              
--- a/pay/views.py
+++ b/pay/views.py
@@ -17,12 +17,11 @@ from TimeConvert import TimeConvert as tc
 
                 from account.models import UserInfo
              
 
                 from goods.models import GoodsInfo, PackGoodsInfo, PackGoodsSaleInfo, PackInfo
              
 
                 from kol.models import KOLInfo
              
 
                -from pay.models import OrderInfo
              
 
                +from live import views as live_views
              
 
                 from live.models import RoomOrderInfo
              
 
                +from pay.models import OrderInfo
              
 
                 from utils.error.errno_utils import KOLStatusCode, OrderStatusCode, PackGoodsStatusCode, PackStatusCode, UserStatusCode
              
 
                 
              
 
                -from live import views as live_views
              
 
                -
              
 
                 
              
 
                 WECHAT = settings.WECHAT
              
 
                 
              
@@ -82,7 +81,7 @@ def wx_order_create_api(request):
 
                         except GoodsInfo.DoesNotExist:
              
 
                             continue
              
 
                         amount = amount + good.price * g.get('num', 0)
              
 
                -    
              
 
                +
              
 
                     if amount != total_fee:
              
 
                         return response(OrderStatusCode.FEE_CHECK_FAIL)
              
 
                 
              
@@ -145,6 +144,7 @@ def wx_order_create_api(request):
 
                         'wxpay_params': wxpay_params,
              
 
                     })
              
 
                 
              
 
                +
              
 
                 def order_cancel(request):
              
 
                     user_id = request.POST.get('user_id', '')
              
 
                     order_id = request.POST.get('order_id', '')
              
@@ -152,15 +152,15 @@ def order_cancel(request):
 
                 
              
 
                     try:
              
 
                         order = OrderInfo.objects.get(user_id=user_id, order_id=order_id, prepay_id=prepay_id)
              
 
                -    except:
              
 
                +    except OrderInfo.DoesNotExist:
              
 
                         return response()
              
 
                -    
              
 
                +
              
 
                     if order.pay_status == OrderInfo.FAIL:
              
 
                         return response(200, 'Order Cancel Success', '订单取消成功')
              
 
                -    
              
 
                +
              
 
                     order.pay_status = OrderInfo.FAIL
              
 
                     order.save()
              
 
                -    
              
 
                +
              
 
                     for g in order.goods_info:
              
 
                         try:
              
 
                             good = PackGoodsInfo.objects.get(pack_id=order.pack_id, good_id=g.get('good_id', ''))
              
@@ -168,9 +168,10 @@ def order_cancel(request):
 
                             good.save()
              
 
                         except PackGoodsInfo.DoesNotExist:
              
 
                             continue
              
 
                -    
              
 
                +
              
 
                     return response(200, 'Order Cancel Success', '订单取消成功')
              
 
                 
              
 
                +
              
 
                 def order_paid_success(order):
              
 
                     if order.pay_status == OrderInfo.PAID:
              
 
                         return
              
@@ -218,22 +219,20 @@ def wx_notify_url_api(request):
 
                     if not success:
              
 
                         return HttpResponse(WXPAY_NOTIFY_FAIL)
              
 
                 
              
 
                -    #尖货接龙订单
              
 
                +    # 尖货接龙订单
              
 
                     try:
              
 
                         order = OrderInfo.objects.select_for_update().get(order_id=notify_data.get('out_trade_no', ''), status=True)
              
 
                -        order.notify_msg = request.body
              
 
                -        order.transaction_id = notify_data.get('transaction_id', '')
              
 
                -        order.save()
              
 
                -
              
 
                -        result_code = notify_data.get('result_code', '')
              
 
                -        if result_code == 'SUCCESS':
              
 
                -            order_paid_success(order)
              
 
                -        else:
              
 
                -            order_paid_fail(order)
              
 
                -        
              
 
                -        return HttpResponse(WXPAY_NOTIFY_SUCCESS)
              
 
                -    except:
              
 
                +    except OrderInfo.DoesNotExist:
              
 
                         return HttpResponse(WXPAY_NOTIFY_FAIL)
              
 
                 
              
 
                +    order.notify_msg = request.body
              
 
                +    order.transaction_id = notify_data.get('transaction_id', '')
              
 
                +    order.save()
              
 
                +
              
 
                +    result_code = notify_data.get('result_code', '')
              
 
                +    if result_code == 'SUCCESS':
              
 
                +        order_paid_success(order)
              
 
                +    else:
              
 
                +        order_paid_fail(order)
              
 
                 
              
 
                     return HttpResponse(WXPAY_NOTIFY_SUCCESS)