@@ -532,3 +532,41 @@ def room_goods_add(request): |
||
532 | 532 |
room_goods.save() |
533 | 533 |
|
534 | 534 |
return response(200, 'Room Goods Add Success', u'直播间商品库添加成功') |
535 |
+ |
|
536 |
+def room_goods_publish(request): |
|
537 |
+ admin_id = request.POST.get('admin_id', '') |
|
538 |
+ room_id = request.POST.get('room_id', '') |
|
539 |
+ goods_id = request.POST.get('goods_id', '') |
|
540 |
+ anchor_id = request.POST.get('anchor_id', '') |
|
541 |
+ |
|
542 |
+ goods = liveGoodsInfo.objects.get(goods_id=goods_id) |
|
543 |
+ room_goods = RoomGoodsInfo.objects.get(goods_id=goods_id, room_id=room_id, anchor_id=anchor_id) |
|
544 |
+ |
|
545 |
+ wxcfg = WECHAT.get('MINIAPP', {}) |
|
546 |
+ |
|
547 |
+ appid = wxcfg.get('appID') |
|
548 |
+ secret = wxcfg.get('appsecret') |
|
549 |
+ token = access_token(appid, secret) |
|
550 |
+ |
|
551 |
+ 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 |
|
552 |
+ errcode = json.loads(status).get('errcode', -1) |
|
553 |
+ |
|
554 |
+ if errcode != 0: |
|
555 |
+ return response(errcode, 'Room Goods Publish Fail', '直播间商品发布失败') |
|
556 |
+ |
|
557 |
+ room_goods.goods_status = RoomGoodsInfo.PUBLISH |
|
558 |
+ room_goods.save() |
|
559 |
+ |
|
560 |
+ return response(200, 'Room Goods Publish Success', '直播间商品上架成功') |
|
561 |
+ |
|
562 |
+def room_goods_off(request): |
|
563 |
+ admin_id = request.POST.get('admin_id', '') |
|
564 |
+ room_id = request.POST.get('room_id', '') |
|
565 |
+ goods_id = request.POST.get('goods_id', '') |
|
566 |
+ anchor_id = request.POST.get('anchor_id', '') |
|
567 |
+ |
|
568 |
+ room_goods = RoomGoodsInfo.objects.get(goods_id=goods_id, room_id=room_id, anchor_id=anchor_id) |
|
569 |
+ room_goods.goods_status = RoomGoodsInfo.OFF |
|
570 |
+ room_goods.save() |
|
571 |
+ |
|
572 |
+ return response(200, 'Room Goods Off Success', '直播间商品下架成功') |
@@ -58,6 +58,8 @@ urlpatterns += [ |
||
58 | 58 |
|
59 | 59 |
url(r'^admin/room/goods/list$', admin_views.room_goods_list, name='room_goods_list'), # 直播间商品 |
60 | 60 |
url(r'^admin/room/goods/add$', admin_views.room_goods_add, name='room_goods_add'), #添加直播间商品 |
61 |
+ url(r'^admin/room/goods/publish$', admin_views.room_goods_publish, name='room_goods_publish'), #直播间商品上架 |
|
62 |
+ url(r'^admin/room/goods/off$', admin_views.room_goods_off, name='room_goods_off'), #直播间商品下架 |
|
61 | 63 |
|
62 | 64 |
#微信直播 api |
63 | 65 |
url(r'^admin/live/wx/room/list$', admin_views.fetch_wx_room_list, name='fetch_wx_room_list'), # 微信直播间列表 |
@@ -330,6 +330,7 @@ class RoomOrderInfo(BaseModelMixin): |
||
330 | 330 |
'goods_id': self.goods_id, |
331 | 331 |
'goods_name': goods.name, |
332 | 332 |
'goods_img': goods.goods_img_url, |
333 |
+ 'wx_goods_id': goods.wx_goods_id, |
|
333 | 334 |
'name': self.name, |
334 | 335 |
'phone': self.phone, |
335 | 336 |
'province': self.province, |
@@ -141,7 +141,7 @@ def live_order_create(request): |
||
141 | 141 |
# 金额校验 |
142 | 142 |
try: |
143 | 143 |
goods_info = liveGoodsInfo.objects.get(goods_id=goods_id) |
144 |
- if amount * int(goods_info.price if goods_info.price_type else goods_info.price2) != total_fee: |
|
144 |
+ if amount * int(goods_info.price if goods_info.price_type == 1 else goods_info.price2) != total_fee: |
|
145 | 145 |
return response(404091, 'FEE Check Fail', description='金额校验失败') |
146 | 146 |
except: |
147 | 147 |
return response(404091, 'FEE Check Fail', description='金额校验失败') |