jiaweiqi 3 жил өмнө
parent
commit
650b8367aa

+ 5 - 1
apps/activity/models.py

@@ -109,7 +109,7 @@ class SplitAccount(models.Model):
         '''手动申请分账(在自动申请分账失败后  手动申请分账)'''
         spc = SplitAccountFuc(app.authorizer_appid, app.agent_num, app.cert_serial_no, app.apiv3_key)
         # 状态是"待分账" 的查询分账  (状态是默认的怎么处理?没有申请过的  查询分账结果会报错--如果返回错误信息根据错误信息 如果没有发现该订单就重新申请  其他原因就不再申请)
-        if spd.status == SplitAccountDetail.PENDING:
+        if spd.status == SplitAccountDetail.PENDING or spd.status == SplitAccountDetail.DEFAULT:
             self.splictAccountQuery(spc, pay.transaction_id, self.no, spd)
 
             if spd.status == SplitAccountDetail.SUCCESS:
@@ -178,6 +178,10 @@ class SplitAccount(models.Model):
                 detail.save()
 
     def splitAccount(self, app, spd, spr, pay):
+        print('------------666')
+        print(spd.id)
+        print(spr.id)
+        print(pay.id)
         '''自动分账  支付成功后自动分账'''
         if pay.status != Pay.CONFIRM:
             return

+ 1 - 1
apps/activity/serializers.py

@@ -117,7 +117,7 @@ class OrderSerializer(serializers.ModelSerializer):
                 if account_detail:
                     if account_detail.status == SplitAccountDetail.PENDING:
                         return '1'   # 显示 刷新分账结果按钮
-                    elif account_detail.status == SplitAccountDetail.CLOSED:
+                    elif account_detail.status == SplitAccountDetail.CLOSED or account_detail.status == SplitAccountDetail.DEFAULT:
                         return '2'   # 显示  分账按钮
                     else:
                         return ''

+ 5 - 0
util/wechatpay.py

@@ -59,8 +59,13 @@ class SplitAccountFuc(object):
 
             params['receivers'].append(receiver_item)
 
+        print('------------------------111')
+        print(params)
+
         code, message = self._core.request(path, SplitAccountTool.POST, data=params)
         result = json.loads(message)
+        print('--------------------2222')
+        print(result)
         if code != 200:
             raise CustomError(u'[{}]分账失败!原因:{}'.format(out_order_no, result))
         return result