订阅消息消息

apps/tenant/employee/serializers.py

@@ -21,7 +21,7 @@ class EmployeeSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
     def create(self, validated_data):
-        if Employee.checkSuper(self.context['request'].user.employee.tenant):
+        if self.initial_data['type'] == Employee.SUPER and Employee.checkSuper(self.context['request'].user.employee.tenant):
             raise CustomError(u'已存在一个平台管理员，禁止操作！')
         username = self.initial_data['tel']
         # 判断用户是否已经注册登陆过
@@ -46,7 +46,7 @@ class EmployeeSerializer(serializers.ModelSerializer):
     def update(self, instance, validated_data):
         if instance.tenant != self.context['request'].user.employee.tenant:
             raise CustomError(u'禁止跨企业操作！')
-        if Employee.checkSuper(instance.tenant, instance.id):
+        if self.initial_data['type'] == Employee.SUPER and Employee.checkSuper(instance.tenant, instance.id):
             raise CustomError(u'已存在一个平台管理员，禁止操作！')
         username = self.initial_data['tel']
         if username and self.initial_data['password'].strip() != '':

apps/tenant/repair_order/models.py

@@ -213,17 +213,17 @@ class RepairOrderRecord(models.Model):
             dict['desc'] = u'挂起原因：{}'.format(self.notes)
         elif self.status == settings.FINISH:
             dispatch_time = RepairOrderRecord.objects.filter(repair_order_id=order_id,
-                                                             status=settings.DISPATCH).order_by(
-                'operation_time').first()
+                                                             status=settings.DISPATCH).order_by('operation_time').first()
             diff_time = self.operation_time - dispatch_time.operation_time
 
             hang_up = RepairOrderRecord.objects.filter(repair_order_id=order_id, status=settings.HANG_UP).first()
             if hang_up:
                 cancel_hang_up = RepairOrderRecord.objects.filter(repair_order_id=order_id,
                                                                   status=settings.CANCEL_HANG_UP).first()
-                # 挂起时间
-                hang_up_time = cancel_hang_up.operation_time - hang_up.operation_time
-                diff_time = diff_time - hang_up_time
+                if cancel_hang_up:
+                    # 挂起时间
+                    hang_up_time = cancel_hang_up.operation_time - hang_up.operation_time
+                    diff_time = diff_time - hang_up_time
 
             desc = u'维修工【{0}】完工，共用时：{1}天{2}'.format(user_name, diff_time.days, strfsecond(diff_time.seconds))
             dict['desc'] = desc

apps/wxapp/repair_order/views.py

@@ -225,7 +225,6 @@ class RepairOrderViewSet(CustomModelViewSet):
                 # 发送微信通知
                 CustomerWechat.sendMsg(instance.user, user.employee.name, instance.device_address,
                                        instance.fault_des, instance.no)
-
         except CustomError as e:
             return response_error(e.get_error_msg())
         except Exception as e:

utils/wx/wechat.py

@@ -214,9 +214,9 @@ class WeChat(object):
             'data': data
         }
         result = requests.post(url, data=json.dumps(param))
-        #print('-------------------------')
-        #result = result.json()
-        #print(result)
+        # print('-------------------------')
+        # result = result.json()
+        # print(result)
 
         #result = requests.post(url, data=json.dumps(param))
         #result = result.json()