....

apps/WechatApplet/models.py

@@ -59,7 +59,7 @@ class WechatApplet(models.Model):
 
     def generateActivityCode(self, customer_id, activity_id):
         '''生成海报二维码'''
-        filename = "{}{}_{}.png".format("activiytCode/", activity_id, customer_id)
+        filename = "{}{}_{}.png".format("wxacode/", activity_id, customer_id)
         full_filename = "{}/{}".format(settings.MEDIA_ROOT, filename)
         if os.path.exists(full_filename):
             return filename
@@ -68,7 +68,7 @@ class WechatApplet(models.Model):
         return filename
 
     def generateActivityWXappCode(self, activity_id):
-        filename = "{}_{}.png".format("activiytCode/", activity_id)
+        filename = "{}_{}.png".format("wxacode/", activity_id)
         full_filename = "{}/{}".format(settings.MEDIA_ROOT, filename)
         if os.path.exists(full_filename):
             return filename

apps/activity/serializers.py

@@ -209,6 +209,8 @@ class ActivitySerializer(serializers.ModelSerializer):
     def factory(user, data, id=None):
         if id:
             instance = Activity.getById(id)
+            if not data['branch']:
+                data['branch'] = instance.branch_id
         else:
             instance = None
         serializer = ActivitySerializer(instance, data=data)

util/wechatpay.py

@@ -14,7 +14,7 @@ from apps.foundation.models import BizLog
 # 微信支付sign_type
 WEIXIN_SIGN_TYPE = 'MD5'
 # 服务器IP地址
-WEIXIN_SPBILL_CREATE_IP = '139.9.148.181'
+WEIXIN_SPBILL_CREATE_IP = '81.70.58.181'
 # 微信支付用途
 WEIXIN_BODY = u'小程序支付'
 # 微信统一下单URL
@@ -22,7 +22,7 @@ WEIXIN_UNIFIED_ORDER_URL = 'https://api.mch.weixin.qq.com/pay/unifiedorder'
 # 微信查询订单URL
 WEIXIN_QUERY_ORDER_URL = 'https://api.mch.weixin.qq.com/pay/orderquery'
 # 微信支付回调API
-WEIXIN_CALLBACK_API = 'https://lsr.zzly.vip/api/wechat_notify/'
+WEIXIN_CALLBACK_API = 'https://jpm.zzly.vip/api/wechat_notify/'
 
 
 class SplitAccountFuc(object):

util/wx/wechat.py

@@ -281,7 +281,7 @@ class WeChat(object):
             "is_hyaline": True,
         }
         result = requests.post(url, json=data)
-        upload_path = PathAndRename("activiytCode/")
+        upload_path = PathAndRename("wxacode/")
         filename = "{}{}_{}.png".format(upload_path.path, activity_id, customer_id)
         filename = filename.lower()
         full_filename = "%s%s" % (settings.MEDIA_ROOT, filename)
@@ -300,7 +300,7 @@ class WeChat(object):
             "is_hyaline": True,
         }
         result = requests.post(url, json=data)
-        upload_path = PathAndRename("activiytCode/")
+        upload_path = PathAndRename("wxacode/")
         filename = "{}_{}.png".format(upload_path.path, activity_id)
         filename = filename.lower()
         full_filename = "%s%s" % (settings.MEDIA_ROOT, filename)