瀏覽代碼

Merge branch 'dev' of http://192.168.136.99:3000/SERVER/AnsjerServer into bin

chenshibin 4 年之前
父節點
當前提交
67a3cfb085
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      Controller/CloudStorage.py

+ 2 - 1
Controller/CloudStorage.py

@@ -972,7 +972,7 @@ class CloudStorageView(View):
         dv_qs = Device_Info.objects.filter(userID_id=userID, UID=uid, isShare=False, isExist=1)
         if not dv_qs.exists():
             return response.json(12)
-        smqs = Store_Meal.objects.filter(commodity_code=commodity_code, type=pay_type). \
+        smqs = Store_Meal.objects.filter(commodity_code=commodity_code, pay_type=pay_type). \
             values('currency', 'price', 'content', 'day', 'commodity_type', 'title', 'content')
         if not smqs.exists():
             return response.json(10, '套餐不存在')
@@ -1063,6 +1063,7 @@ class CloudStorageView(View):
             notify_url="{SERVER_DOMAIN_SSL}cloudstorage/dowechatnotify".format(
                 SERVER_DOMAIN_SSL=SERVER_DOMAIN_SSL)
             # 获取参数
+            price = float(price)*100
             parameter_dict = pay.get_parameter(orderID, content, price, spbill_create_ip, notify_url)
             print('parameter_dict', parameter_dict)
             # parameter_dict 参数中获取MWEB_URL 调转页面在路径后面添加redirect_url