trivial

apps/web/dealer/models.py

@@ -24,7 +24,7 @@ from apilib.systypes import IterConstant
 from apilib.utils_string import cn
 from apilib.utils_url import add_query
 from apps.web.agent.models import Agent, MoniAppPoint
-from apps.web.common.models import UserSearchable, MonthlyPackageTemp
+from apps.web.common.models import UserSearchable, MonthlyPackageTemp, RefundOrderBase
 from apps.web.common.models import WithdrawRecord, CapitalUser, Balance
 from apps.web.common.transaction import OrderNoMaker, OrderMainType, DealerPaySubType, WITHDRAW_PAY_TYPE, RefundSubType
 from apps.web.constant import TYPE_ADJUST_USER_VIRTUAL_CARD, DEALER_CONSUMPTION_AGG_KIND, \
@@ -37,7 +37,7 @@ from apps.web.core.models import BoundOpenInfo
 from apps.web.core.payment import WithdrawGateway
 from apps.web.dealer.constant import TodoDone, TodoTypeEnum, LinkageSwitchEnum
 from apps.web.dealer.define import DEALER_INCOME_SOURCE, DEALER_INCOME_TYPE, DealerConst, \
-    DEALER_INCOME_SOURCE_TRANSLATION
+    DEALER_INCOME_SOURCE_TRANSLATION, REFUND_NOTIFY_URL
 from apps.web.device.models import Device, Group, GroupDict, DeviceType
 from apps.web.helpers import get_app, get_user_manager_agent
 from apps.web.utils import concat_dealer_access_entry_url, concat_front_end_url, concat_server_end_url
@@ -1723,10 +1723,8 @@ class RefundDealerRechargeRecord(RefundOrderBase):
 
     @property
     def notify_url(self):
-        if self.pay_app_type in [PayAppType.WECHAT, PayAppType.WECHAT_MINI]:
+        if self.pay_app_type in [PayAppType.WECHAT]:
             return REFUND_NOTIFY_URL.WECHAT_REFUND_BACK
-        elif self.pay_app_type == PayAppType.JD_AGGR:
-            return REFUND_NOTIFY_URL.JD_AGGRE_REFUND_BACK
         elif self.pay_app_type == PayAppType.JD_OPEN:
             return REFUND_NOTIFY_URL.JDOPEN_REFUND_BACK
         else:

library/jd/pay.py

@@ -455,15 +455,13 @@ class JDAggrePay(object):
         :param amount:
         :return:
         """
-        from apps.web.user.conf import REFUND_NOTIFY_URL
         params = {
             "merchantNo": str(self.merchant_no),
             "businessCode": "AGGRE",
             "version": "V3.0",
             "outTradeNo": str(outTradeNo),
             "outRefundNo": str(outRefundNo),
-            "amount": amount,
-            "notifyUrl": REFUND_NOTIFY_URL.JD_AGGRE_REFUND_BACK
+            "amount": amount
         }
 
         billSplitList = kwargs.get("billSplitList")