用户反馈问题

apps/web/device/models.py

@@ -4411,10 +4411,8 @@ class FeedBack(Searchable):
         if 'orderNo' in rv['detailInfo']:
             order_no = rv['detailInfo'].get('orderNo')
             if order_no:
-                from apps.web.common.proxy import ClientConsumeModelProxy
-                order = ClientConsumeModelProxy.get_one(
-                    shard_filter = {'ownerId': self.ownerId}, orderNo = order_no)  # type: ConsumeRecord
-
+                from apps.web.user.models import ConsumeRecord
+                order = ConsumeRecord.objects.filter(ownerId=self.ownerId, orderNo = order_no).first()  # type: ConsumeRecord
                 rv['detailInfo'].update(order.info_for_feedback)
 
         if 'coins' not in rv['detailInfo'] and self.coins:

apps/web/user/models.py

@@ -6754,6 +6754,42 @@ class ConsumeRecord(Searchable):
         }
         return data
 
+    @property
+    def refund_info(self):
+        refund = self.refund
+        rv = {
+            "isRefund": refund.isPaid,
+            "refundedMoney": refund.totalAmount,
+            "fullRefund": refund.totalAmount == self.payment.totalAmount
+        }
+
+        return rv
+
+    @property
+    def info_for_feedback(self):
+        rv = {
+            'orderId': str(self.id),
+            'orderNo': self.orderNo,
+            'coins': self.coin,
+            'deviceStartTime': self.device_start_time,
+            'deviceFinishedTime': self.device_end_time
+        }
+
+        rv.update(self.device_identity_info)
+
+        rv.update(self.refund_info)
+
+        rv.update({
+            'port': self.port,
+        })
+
+        if self.isNormal:
+            rv['reason'] = self.serviceInfo.get('reason', '')
+        else:
+            rv['reason'] = self.descriptione
+
+        return rv
+
 
 class BalanceLog(Searchable):
     meta = {