订单手续费

Controller/PaymentCycle.py

@@ -380,7 +380,7 @@ class PaypalCycleNotify(View):
             agreement_id = paypal_body.get('billing_agreement_id')
             paypal_transaction_id = paypal_body.get('id')
             amount = paypal_body.get('amount')
-
+            fee = paypal_body['transaction_fee']['value']
             PaypalWebHookEventInsert = {
                 'webhook_event_id': json_obj.get('id'),
                 'resource_type': json_obj.get('resource_type'),
@@ -435,7 +435,7 @@ class PaypalCycleNotify(View):
                         return HttpResponse('Fail', status=500)
 
                     if order_qs[0]['create_vod']:
-                        order_qs.update(status=1, trade_no=paypal_transaction_id, updTime=nowTime)
+                        order_qs.update(status=1, trade_no=paypal_transaction_id, updTime=nowTime, fee=fee)
                     else:
                         # 是否有促销
                         expire = order_qs[0]['rank__expire']
@@ -459,7 +459,7 @@ class PaypalCycleNotify(View):
                         uid_bucket_id = self.create_vod(uid, expire, is_ai, nowTime, channel, bucketId, order_id,
                                                         userid, username)
                         order_qs.update(status=1, trade_no=paypal_transaction_id, updTime=nowTime,
-                                        uid_bucket_id=uid_bucket_id, create_vod=1,
+                                        uid_bucket_id=uid_bucket_id, create_vod=1, fee=fee,
                                         promotion_rule_id=promotion_rule_id, agreement_id=agreement_id)
                         # 核销coupon
                         if coupon_id:
@@ -518,7 +518,7 @@ class PaypalCycleNotify(View):
             # PayPal周期扣款首次扣款
             if billing_agreement.agreement_details.cycles_completed == '0':
                 if order_qs[0]['create_vod']:
-                    order_qs.update(status=1, trade_no=paypal_transaction_id, updTime=nowTime)
+                    order_qs.update(status=1, trade_no=paypal_transaction_id, updTime=nowTime, fee=fee)
                 else:
                     # 是否有促销
                     promotion = PromotionRuleModel.objects.filter(status=1, startTime__lte=nowTime,
@@ -533,7 +533,7 @@ class PaypalCycleNotify(View):
                     uid_bucket_id = self.create_vod(UID, expire, is_ai, nowTime, channel, bucketId, order_id,
                                                     userid, username)
                     order_qs.update(status=1, trade_no=paypal_transaction_id, updTime=nowTime,
-                                    uid_bucket_id=uid_bucket_id, create_vod=1,
+                                    uid_bucket_id=uid_bucket_id, create_vod=1, fee=fee,
                                     promotion_rule_id=promotion_rule_id, agreement_id=agreement_id)
                     # 核销coupon
                     if coupon_id:
@@ -600,7 +600,7 @@ class PaypalCycleNotify(View):
                                            price=amount.get('total'),
                                            currency=order_qs[0]['currency'], addTime=nowTime,
                                            updTime=nowTime, order_type=order_type,
-                                           pay_url='', isSelectDiscounts=0,
+                                           pay_url='', isSelectDiscounts=0, fee=fee,
                                            commodity_code=commodity_code, create_vod=1,
                                            commodity_type=commodity_type, rank_id=rank, paymentID='',
                                            coupon_id='', uid_bucket_id=uid_bucket_id, status=1,

Model/models.py

@@ -1846,6 +1846,7 @@ class Order_Model(models.Model):
     channel = models.SmallIntegerField(default=0, verbose_name=u'通道数')
     desc = models.CharField(max_length=50, default='', verbose_name='商品描述')
     price = models.CharField(default='', max_length=16, verbose_name='价格')
+    fee = models.CharField(default='', max_length=8, verbose_name='手续费')
     refunded_amount = models.FloatField(default=0, verbose_name=u'已退款金额')
     currency = models.CharField(blank=True, default='$', max_length=32, verbose_name=u'货币')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
@@ -2334,7 +2335,7 @@ class UidPushModel(models.Model):
     appBundleId = models.CharField(blank=True, max_length=32, verbose_name=u'appID')
     app_type = models.IntegerField(default=0, verbose_name=u'app类型 1:ios,2:安卓')
     push_type = models.IntegerField(default=0,
-                                    verbose_name=u'推送类型')  # 0: apns, 1: 安卓gcm, 2: 极光, 3:华为, 4:小米, 5:vivo, 6:oppo, 7:魅族
+                                    verbose_name=u'推送类型')  # 0: apns, 1: 安卓gcm, 2: 极光, 3:华为, 4:小米, 5:vivo, 6:oppo, 7:魅族, 8:荣耀
     token_val = models.CharField(default='', max_length=500, verbose_name=u'设备验证令牌')
     jg_token_val = models.CharField(default='', max_length=500, verbose_name=u'极光推送令牌')
     m_code = models.CharField(default='', max_length=64, verbose_name='手机唯一标识')
@@ -4205,7 +4206,6 @@ class OperatingCosts(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键id')
     order_id = models.CharField(verbose_name='订单号', default='', max_length=24, db_index=True)
     uid = models.CharField(verbose_name='设备UID', default='', max_length=20, db_index=True)
-    fee = models.CharField(verbose_name='手续费', default='', max_length=8)
     day_average_price = models.CharField(verbose_name='收入分摊/天', default='', max_length=16)  # 订单金额/订单天数
     month_average_price = models.CharField(verbose_name='收入分摊/月', default='', max_length=16)  # 收入分摊/天*当月使用天数
     purchase_quantity = models.CharField(verbose_name='购买量/月', default='', max_length=8, blank=True)
@@ -4231,7 +4231,7 @@ class OperatingCosts(models.Model):
 class UidBucketStatistics(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='设备汇总列表主键')
     uid = models.CharField(verbose_name='设备UID', default='', max_length=20, db_index=True)
-    storage_size = models.CharField(verbose_name='存储量', default='', max_length=16)  # 单位G
+    storage_size = models.CharField(verbose_name='存储量', default='', max_length=16)  # 单位M
     api_count = models.IntegerField(default=0, verbose_name='实际调用api次数')
     created_time = models.IntegerField(default=0, verbose_name='创建时间')
     time = models.IntegerField(verbose_name='时间戳', default=0)