Browse Source

待审核模板

wushaodong 4 years ago
parent
commit
6b3f392789

+ 15 - 1
apps/WechatApplet/models.py

@@ -42,7 +42,7 @@ class WechatApplet(models.Model):
         self.expires_in = expires_in
         self.save()
 
-    def sendMsg(self, openid, name, address, fault_des, no):
+    def sendFinishMsg(self, openid, name, address, fault_des, no):
         template_id = settings.WEAPP['message_template_finish']
         if not template_id:
             return
@@ -56,3 +56,17 @@ class WechatApplet(models.Model):
         }
         page = 'pages/repairList/repairList?sort=yiwangong&name=已完工'
         WeChat.sendSubscribeMessage(self.getAccessToken(), openid, template_id, page, data)
+
+    def sendWaitCheckMsg(self, openid, name, address, fault_des, no):
+        template_id = settings.WEAPP['message_template_wait_check']
+        if not template_id:
+            return
+        data = {
+            'character_string12': {'value': no},
+            'thing1':{'value':'新报修审核'},
+            'thing19':{'value':fault_des},
+            'name3':{'value': name},
+            'thing10':{'value': address},
+        }
+        page = '/pages/certificate/certificate'
+        WeChat.sendSubscribeMessage(self.getAccessToken(), openid, template_id, page, data)

+ 23 - 2
apps/wxapp/models.py

@@ -76,8 +76,29 @@ class CustomerWechat(models.Model):
         return customer
 
     @staticmethod
-    def sendMsg(user, name, address, fault_des, no):
+    def sendFinishMsg(user, name, address, fault_des, no):
+        """
+        :param user: 接收人
+        :param name: 接收人姓名
+        :param address: 地址
+        :param fault_des: 描述
+        :param no: 单号
+        """
         wechat_customer = CustomerWechat.objects.filter(customer__user=user).first()
         if wechat_customer:
             applet= WechatApplet.objects.filter(authorizer_appid=settings.WEAPP['appid']).first()
-            applet.sendMsg(wechat_customer.openid, name, address, fault_des, no)
+            applet.sendFinishMsg(wechat_customer.openid, name, address, fault_des, no)
+
+    @staticmethod
+    def sendWaitCheckMsg(user, name, address, fault_des, no):
+        """
+        :param user: 接收人
+        :param name: 下单人姓名
+        :param address: 地址
+        :param fault_des: 描述
+        :param no: 单号
+        """
+        wechat_customer = CustomerWechat.objects.filter(customer__user=user).first()
+        if wechat_customer:
+            applet= WechatApplet.objects.filter(authorizer_appid=settings.WEAPP['appid']).first()
+            applet.sendWaitCheckMsg(wechat_customer.openid, name, address, fault_des, no)

+ 7 - 1
apps/wxapp/repair_order/views.py

@@ -18,6 +18,7 @@ from apps.WechatApplet.models import WechatApplet
 from apps.wxapp.models import CustomerWechat
 from .serializers import (RepairOrderSerializer, RepairOrderListSerializer,
                           RepairOrderDetailSerializer)
+from apps.tenant.employee.models import Employee
 
 
 class RepairOrderDetailView(generics.RetrieveAPIView):
@@ -98,6 +99,11 @@ class RepairOrderViewSet(CustomModelViewSet):
     def perform_create(self, serializer):
         super(RepairOrderViewSet, self).perform_create(serializer)
         instance = serializer.instance
+        # 发送微信通知
+        emplees = Employee.objects.filter(tenant=instance.tenant, type=Employee.ADMIN)
+        for emp in emplees:
+            CustomerWechat.sendWaitCheckMsg(emp.user, instance.user.employee.name, instance.device_address,
+                               instance.fault_des, instance.no)
         validated_data = serializer.validated_data
         tenant_log(self.request.user.employee, BizLog.INSERT, u'添加报修工单[%s],id=%d' % (instance.name, instance.id),
                    validated_data)
@@ -224,7 +230,7 @@ class RepairOrderViewSet(CustomModelViewSet):
                     inspection_order.save()
 
                 # 发送微信通知
-                CustomerWechat.sendMsg(instance.user, user.employee.name, instance.device_address,
+                CustomerWechat.sendFinishMsg(instance.user, user.employee.name, instance.device_address,
                                        instance.fault_des, instance.no)
         except CustomError as e:
             return response_error(e.get_error_msg())

+ 2 - 2
apps/wxapp/serializers.py

@@ -56,7 +56,7 @@ class WechatLoginSerializer(serializers.Serializer):
                 'face': customer_wechat.customer.face,
                 'user_type': customer_wechat.customer.type,  # 用户类别,1为平台管理员,2为管理者,3检修人,4报修人
                 'forbid_baoxiu': 'true' and customer_wechat.customer.status == Employee.DISABLE or 'false',  # 是否禁用报修,
-                'emplate_id': settings.WEAPP['message_template_finish'],
+                'emplate_id': [settings.WEAPP['message_template_finish'],settings.WEAPP['message_template_wait_check'],],
             }
 
         else:
@@ -91,7 +91,7 @@ class WechatBindSerializer(serializers.Serializer):
                 'user_type': customer.type,  # 用户类别,1为平台管理员,2为管理者,3检修人,4报修人
                 'forbid_baoxiu': 'true' and customer.status == Employee.DISABLE or 'false',  # 是否禁用报修,
                 'tenant_id': tenant_id,
-                'emplate_id': settings.WEAPP['message_template_finish'],
+                'emplate_id': [settings.WEAPP['message_template_finish'],settings.WEAPP['message_template_wait_check'],],
             }
 
         else:

+ 1 - 0
ly_baoxiu_admin/settings.py

@@ -271,6 +271,7 @@ WEAPP = {
     'appid': 'wx0a4ed500a98c0507',
     'secret': '0700bb3a58cd09505e78d7c7d1781042',
     'message_template_finish': '5ucRHdj_NFmfcDVllWohAJ5OqU6bQm5EpfALxtppNBc',
+    'message_template_wait_check': 'LF--h-xq5FyprUYsHCL_W3ktVgfFZI6A1cobk911j_4',
 }
 #支付宝支付
 ALIPAY_SETTING11 = {