trivial

apps/web/dealer/define.py

@@ -106,28 +106,18 @@ if settings.DEBUG and get_test_point('dealer', 'PAY_NOTIFY_URL'):
     class PAY_NOTIFY_URL(IterConstant):
         WECHAT_PAY_BACK = concat_server_end_url(
             uri = '/dealer/{}/{}_finishedPay'.format(PayAppType.WECHAT, get_test_point('dealer', 'PAY_NOTIFY_URL')))
-        SAOBEI_PAY_BACK = concat_server_end_url(
-            uri = '/dealer/{}/{}_finishedPay'.format(PayAppType.SAOBEI, get_test_point('dealer', 'PAY_NOTIFY_URL')))
-        JD_AGGRE_PAY_BACK = concat_server_end_url(
-            uri = '/dealer/{}/{}_finishedPay'.format(PayAppType.JD_AGGR, get_test_point('dealer', 'PAY_NOTIFY_URL')))
 else:
     class PAY_NOTIFY_URL(IterConstant):
         WECHAT_PAY_BACK = concat_server_end_url(uri = '/dealer/{}/finishedPay'.format(PayAppType.WECHAT))
-        SAOBEI_PAY_BACK = concat_server_end_url(uri = '/dealer/{}/finishedPay'.format(PayAppType.SAOBEI))
-        JD_AGGRE_PAY_BACK = concat_server_end_url(uri = '/dealer/{}/finishedPay'.format(PayAppType.JD_AGGR))
 
 
 if settings.DEBUG and get_test_point('dealer', 'REFUND_NOTIFY_URL'):
     class REFUND_NOTIFY_URL(IterConstant):
-        JD_AGGRE_REFUND_BACK = concat_server_end_url(
-            uri = '/dealer/{}/{}_refundOrderNotifier'.format(
-                PayAppType.JD_AGGR, get_test_point('dealer', 'REFUND_NOTIFY_URL')))
         WECHAT_REFUND_BACK = concat_server_end_url(
             uri = '/dealer/{}/{}_refundOrderNotifier'.format(
                 PayAppType.WECHAT, get_test_point('dealer', 'REFUND_NOTIFY_URL')))
 else:
     class REFUND_NOTIFY_URL(IterConstant):
-        JD_AGGRE_REFUND_BACK = concat_server_end_url(uri = '/dealer/{}/refundOrderNotifier'.format(PayAppType.JD_AGGR))
         WECHAT_REFUND_BACK = concat_server_end_url(uri = '/dealer/{}/refundOrderNotifier'.format(PayAppType.WECHAT))
 
 DEALER_BIND_WECHAT_URL = concat_server_end_url(uri = '/dealer/verifyNewWechatBindingCallback')

apps/web/report/ledger.py

@@ -186,10 +186,6 @@ class IncomeStrategy(object):
         if not self._payment_gateway:
             self._payment_gateway = PaymentGateway.clone_from_order(self._record)  # type: PaymentGateway
 
-        if self._payment_gateway.pay_app_type == PayAppType.JD_AGGR and isinstance(
-                self._payment_gateway.occupant, Dealer):
-            return self._dealer.agentMerProfitShare
-
         return self._dealer.agentProfitShare
 
     @property
@@ -201,10 +197,6 @@ class IncomeStrategy(object):
         if not self._payment_gateway:
             self._payment_gateway = PaymentGateway.clone_from_order(self._record)  # type: PaymentGateway
 
-        if self._payment_gateway.pay_app_type == PayAppType.JD_AGGR and isinstance(
-                self._payment_gateway.occupant, Dealer):
-            raise ValueError(u"厂商配置错误（10001）")
-
         return self._dealer.my_agent.managerProfitShare
 
     @staticmethod

apps/web/user/conf.py

@@ -15,7 +15,7 @@ class USER_AUTH_REDIRECT_URL(IterConstant):
     WECHAT_AUTH_BASE = concat_server_end_url(uri = '/user/wechat/auth/base')
 
     WECHAT_MANAGER_AUTH_BASE = concat_server_end_url(uri = '/user/wechat/managerAuth/base')
-    WECHAT_MANAGER_AUTH_USER = concat_server_end_url(uri= '/user/wechat/managerAuth/user')
+    WECHAT_MANAGER_AUTH_USER = concat_server_end_url(uri = '/user/wechat/managerAuth/user')
 
     WECHAT_USER_CENTER_AUTH_BASE = concat_server_end_url(uri = '/user/wechat/center/auth/base')
     WECHAT_USER_CENTER_AUTH_USER = concat_server_end_url(uri = '/user/wechat/center/auth/user')
@@ -36,48 +36,19 @@ if settings.DEBUG and get_test_point('user', 'PAY_NOTIFY_URL'):
             PayAppType.WECHAT, get_test_point('user', 'PAY_NOTIFY_URL')))
         ALI_PAY_BACK = concat_server_end_url(uri = '/user/{}/{}_finishedPay'.format(
             PayAppType.ALIPAY, get_test_point('user', 'PAY_NOTIFY_URL')))
-        SAOBEI_PAY_BACK = concat_server_end_url(uri = '/user/{}/{}_finishedPay'.format(
-            PayAppType.SAOBEI, get_test_point('user', 'PAY_NOTIFY_URL')))
-        DLB_PAY_BACK = concat_server_end_url(uri = '/user/{}/{}_finishedPay'.format(
-            PayAppType.DLB, get_test_point('user', 'PAY_NOTIFY_URL')))
-        JD_AGGRE_PAY_BACK = concat_server_end_url(uri = '/user/{}/{}_finishedPay'.format(
-            PayAppType.JD_AGGR, get_test_point('user', 'PAY_NOTIFY_URL')))
-        YS_PAY_BACK = concat_server_end_url(uri = '/user/{}/{}_finishedPay'.format(
-            PayAppType.YS, get_test_point('user', 'PAY_NOTIFY_URL')))
-        RCU_PAY_BACK = concat_server_end_url(uri = '/user/{}/{}_finishedPay'.format(
-            PayAppType.RCU, get_test_point('user', 'PAY_NOTIFY_URL')))
-        JDOPEN_PAY_BACK = concat_server_end_url(uri = '/user/{}/{}_finishedPay'.format(
-            PayAppType.JD_OPEN, get_test_point('user', 'PAY_NOTIFY_URL')))
 else:
     class PAY_NOTIFY_URL(IterConstant):
-        WECHAT_PAY_BACK = concat_server_end_url(uri='/user/{}/finishedPay'.format(PayAppType.WECHAT))
-        ALI_PAY_BACK = concat_server_end_url(uri='/user/{}/finishedPay'.format(PayAppType.ALIPAY))
-        SAOBEI_PAY_BACK = concat_server_end_url(uri='/user/{}/finishedPay'.format(PayAppType.SAOBEI))
-        DLB_PAY_BACK = concat_server_end_url(uri='/user/{}/finishedPay'.format(PayAppType.DLB))
-        JD_AGGRE_PAY_BACK = concat_server_end_url(uri='/user/{}/finishedPay'.format(PayAppType.JD_AGGR))
-        YS_PAY_BACK = concat_server_end_url(uri='/user/{}/finishedPay'.format(PayAppType.YS))
-        RCU_PAY_BACK = concat_server_end_url(uri='/user/{}/finishedPay'.format(PayAppType.RCU))
-        JDOPEN_PAY_BACK = concat_server_end_url(uri='/user/{}/finishedPay'.format(PayAppType.JD_OPEN))
+        WECHAT_PAY_BACK = concat_server_end_url(uri = '/user/{}/finishedPay'.format(PayAppType.WECHAT))
+        ALI_PAY_BACK = concat_server_end_url(uri = '/user/{}/finishedPay'.format(PayAppType.ALIPAY))
 
 if settings.DEBUG and get_test_point('user', 'REFUND_NOTIFY_URL'):
     class REFUND_NOTIFY_URL(IterConstant):
-        JD_AGGRE_REFUND_BACK = concat_server_end_url(
-            uri = '/user/{}/{}_refundOrderNotifier'.format(
-                PayAppType.JD_AGGR, get_test_point('user', 'REFUND_NOTIFY_URL')))
         WECHAT_REFUND_BACK = concat_server_end_url(
             uri = '/user/{}/{}_refundOrderNotifier'.format(
                 PayAppType.WECHAT, get_test_point('user', 'REFUND_NOTIFY_URL')))
-        JDOPEN_REFUND_BACK = concat_server_end_url(
-            uri = '/user/{}/{}_refundOrderNotifier'.format(
-                PayAppType.JD_OPEN, get_test_point('user', 'REFUND_NOTIFY_URL')))
 else:
     class REFUND_NOTIFY_URL(IterConstant):
-        JD_AGGRE_REFUND_BACK = concat_server_end_url(uri = '/user/{}/refundOrderNotifier'.format(PayAppType.JD_AGGR))
         WECHAT_REFUND_BACK = concat_server_end_url(uri = '/user/{}/refundOrderNotifier'.format(PayAppType.WECHAT))
-        JDOPEN_REFUND_BACK = concat_server_end_url(uri = '/user/{}/refundOrderNotifier'.format(PayAppType.JD_OPEN))
-
-
-
 
 HUAWEI_ACCESS_URL = 'https://login.cloud.huawei.com/oauth2/v2/authorize?response_type' \
-                    '=code&client_id=100259545&redirect_uri=http%3a%2f%2fwww.washpayer.com%2fuser%2fhuaweiAccess&scope=https%3A%2F%2Fwww.huawei.com%2Fauth%2Faccount%2Fbase.profile'
+                    '=code&client_id=100259545&redirect_uri=http%3a%2f%2fwww.washpayer.com%2fuser%2fhuaweiAccess&scope=https%3A%2F%2Fwww.huawei.com%2Fauth%2Faccount%2Fbase.profile'

script/utils/cashdesk.py

@@ -17,7 +17,6 @@ from apps.web.user.transaction import post_pay
 if TYPE_CHECKING:
     from apps.web.core.payment.wechat import WechatPaymentGateway
     from apps.web.core.payment.ali import AliPayGateway
-    from apps.web.core.payment.saobei import SaobeiPaymentGateway
 
 PROJECT_ROOT = os.path.join(os.path.abspath(os.path.split(os.path.realpath(__file__))[0] + "/.."), '..')
 sys.path.insert(0, PROJECT_ROOT)

script/utils/modify_platform_pay_type.py

@@ -23,18 +23,10 @@ pay_type = {
         ROLE.agent: {
             AppPlatformType.ALIPAY: PayAppType.ALIPAY,
             AppPlatformType.WECHAT: PayAppType.WECHAT,
-            AppPlatformType.JD: PayAppType.JD_AGGR
         },
         ROLE.dealer: {
-            AppPlatformType.ALIPAY: PayAppType.SAOBEI,
-            AppPlatformType.WECHAT: PayAppType.SAOBEI,
-            AppPlatformType.JD: PayAppType.JD_AGGR
         },
         ROLE.myuser: {
-            AppPlatformType.ALIPAY: PayAppType.JD_AGGR,
-            AppPlatformType.WECHAT: PayAppType.JD_AGGR,
-            AppPlatformType.JD: PayAppType.JD_AGGR,
-            AppPlatformType.WECHAT_MINI: PayAppType.WECHAT_MINI
         }
     }