api/stock_views.py

@@ -4,9 +4,23 @@ from __future__ import division

                 
              

                 from django.shortcuts import HttpResponse
              

                 
              

                -from utils.stock_utils import refresh_stock_info
              

                +from stock.models import StockInfo
              

                +from utils.redis.connect import r
              

                +from utils.redis.rkeys import JDJOS_STOCK_CHANGED_SET
              

                +from utils.stock_utils import refresh_stock_info, send_stock_info
              

                 
              

                 
              

                 def refresh_stockinfo(request):
              

                     refresh_stock_info()
              

                     return HttpResponse('Refresh Success')
              

                +
              

                +
              

                +def send_stockinfo(request):
              

                +    pks = r.smembers(JDJOS_STOCK_CHANGED_SET)
              

                +    for pk in pks:
              

                +        try:
              

                +            stock = StockInfo.objects.get(pk=pk, status=True)
              

                +        except StockInfo.DoesNotExist:
              

                +            continue
              

                +        send_stock_info(stock)
              

                +    return HttpResponse('Send Success')
              

api/urls.py

@@ -15,4 +15,5 @@ urlpatterns += [

                 
              

                 urlpatterns = [
              

                     url(r'^refresh$', stock_views.refresh_stockinfo, name='refresh_stockinfo'),
              

                +    url(r'^send$', stock_views.send_stockinfo, name='send_stockinfo'),
              

                 ]
              

stock/admin.py

@@ -4,7 +4,8 @@ from django.contrib import admin

                 from django_admin import AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin
              

                 
              

                 from stock.models import StockInfo
              

                -from utils.stock_utils import update_stock_info
              

                +from utils.redis.connect import r
              

                +from utils.redis.rkeys import JDJOS_STOCK_CHANGED_SET
              

                 
              

                 
              

                 class StockInfoAdmin(AdvancedExportExcelModelAdmin, admin.ModelAdmin):
              
@@ -14,8 +15,8 @@ class StockInfoAdmin(AdvancedExportExcelModelAdmin, admin.ModelAdmin):

                 
              

                     def save_model(self, request, obj, form, change):
              

                         obj.save()
              

                -        if obj.inventoryDate and obj.estimateDate:
              

                -            update_stock_info(obj)
              

                +        if obj.inventoryDate and obj.estimateDate and ('inventoryDate' in form.changed_data or 'totalQuantity' in form.changed_data or 'estimateDate' in form.changed_data or 'totalEstimateQuantity' in form.changed_data or 'costPrice' in form.changed_data):
              

                +            r.sadd(JDJOS_STOCK_CHANGED_SET, obj.pk)
              

                 
              

                 
              

                 admin.site.register(StockInfo, StockInfoAdmin)
              

utils/redis/rkeys.py

@@ -1 +1,3 @@

                 # -*- coding: utf-8 -*-
              

                +
              

                +JDJOS_STOCK_CHANGED_SET = 'jdjos:stock:changed:set'
              

utils/stock_utils.py

@@ -67,7 +67,7 @@ def refresh_stock_info():

                             s.save()
              

                 
              

                 
              

                -def update_stock_info(stock):
              

                +def send_stock_info(stock):
              

                     jd.setDefaultAppInfo(JOS['appkey'], JOS['secret'])
              

                 
              

                     a = EdiInventorySendRequest()