Merge branch 'feature_zjb_pay' of…

Merge branch 'feature_zjb_pay' of ssh://gitlab.yidianling.com:2224/xuzhenzhao/ydl-packages into feature_zjb_pay

packages/toolkit/__tests__/payment/notHaveBalance.test.ts

@@ -36,10 +36,7 @@ beforeAll(async () => {
      */
     Utils.setCookie(UID, '130960056')
     Utils.setCookie(ACCESS_TOKEN, 'eccf89e37fb96ef67c4c2cfbe53a05ceMjIwNw')
-    globalDatabase.payment = new Payment({
-        wx_appId: "wx2bc3e1648beb8caa",
-        zfb_appId: "2021002115687047"
-    })
+    globalDatabase.payment = new Payment({supportCombination: true})
 })
 
 

packages/toolkit/__tests__/payment/units.test.ts

@@ -2,6 +2,21 @@ import {describe, expect, test} from '@jest/globals'
 import {BACK_ORDER_ID, BACK_PAY_ID, PayChannel, PayError, PayErrorMessage, Payment, PayType} from "@/Payment/Payment";
 
 describe('测试： 创建实例', () => {
+    test('supportCombination', () => {
+        const payment1 = new Payment({
+            supportCombination: false
+        })
+        expect(payment1.supportCombination).toBe(false)
+
+        const payment2 = new Payment({
+            supportCombination: true
+        })
+        expect(payment2.supportCombination).toBe(true)
+
+        const payment3 = new Payment()
+        expect(payment3.supportCombination).toBe(true)
+    })
+
     test('payChannels', () => {
         const payment = new Payment({
             payChannels: [PayChannel.WX_MWEB, PayChannel.WX_JSAPI]
@@ -33,12 +48,21 @@ test('测试订单查询链接', () => {
     expect(backUrl).toContain(window.location.origin)
 })
 
-test('测试价格计算', () => {
-    const payment = new Payment();
-    const goodsPrice = 0.01;
-    const payType = PayType.WECHAT;
-    const {payAmount, payBalance} = payment.computeAmount(goodsPrice, payType)
-    expect(payAmount).toBe(0.01)
+test('测试组合支付价格计算', () => {
+    const payment = new Payment()
+    const goodsPrice = 0.3
+    const balance = 0.1
+    const {payAmount, payBalance} = payment.computeAmount(goodsPrice, balance)
+    expect(payAmount).toBe(0.2)
+    expect(payBalance).toBe(0.1)
+})
+
+test('测试非组合支付价格计算', () => {
+    const payment = new Payment({supportCombination: false})
+    const goodsPrice = 0.3
+    payment.balance = 0.1
+    const {payAmount, payBalance} = payment.computeAmount(goodsPrice)
+    expect(payAmount).toBe(0.3)
     expect(payBalance).toBe(0)
 })
 

packages/toolkit/src/Payment/Defined.ts

@@ -16,7 +16,8 @@ export type BackInfo = {
 export type OrderStateCallBack = (params: BackInfo & { isPay: boolean }) => void
 
 export type PaymentParams = {
-    payChannels?: PayChannel[]
+    payChannels?: PayChannel[],
+    supportCombination?: boolean
 }
 
 export enum PayType {
@@ -113,14 +114,12 @@ export enum PayErrorMessage {
     WECHAT_REDIRECT_URL_MISSING= `请填写微信回调地址页面 'redirectUrl`,
     WECHAT_REDIRECT_URL_ENCODE = 'redirectUrl需要encode',
     WECHAT_PAY_CHANNEL_MISSING =`缺少渠道参数：'WX_MWEB','WX_JSAPI'`,
-    WECHAT_APPID_MISSING = '缺少微信APPID入参',
     ALIPAY_QUIT_URL_MISSING = `缺少支付失败回调地址：'quitUrl'`,
     ALIPAY_RETURN_URL_MISSING =  `缺少支付成功回调地址：'returnUrl'`,
     ALIPAY_PAY_CHANNEL_MISSING = `缺少持的渠道参数：'ALI_WAP'`,
     WECHAT_JSSDK_PAY_ERROR = '微信JSSDK支付失败',
     WECHAT_H5_PAY_BREAK = '微信h5支付中断',
     ALIPAY_H5_PAY_BREAK = '支付宝支付中断',
-    ALIPAY_APPID_MISSING = '缺少微信APPID入参',
 }
 
 export type ToPayReturns = {

packages/toolkit/src/Payment/Payment.ts

@@ -82,12 +82,15 @@ const requestForJava = defaultRequest
 export class Payment {
     balance = 0;
     limitPayChannels: PayChannel[] = [];
-
+    supportCombination: boolean = true
     constructor(paymentParams?: PaymentParams) {
         this.limitPayChannels = paymentParams?.payChannels ?? Object.keys(PayChannel).map(key => key) as PayChannel[];
+        if (typeof paymentParams?.supportCombination === 'boolean') {
+            this.supportCombination = typeof paymentParams?.supportCombination === 'boolean' && paymentParams.supportCombination
+        }
     }
 
-    public async getBalance(): Promise<number> {
+    async getBalance(): Promise<number> {
         try {
             const {data: res} = await requestForPhp.post(MY_BALANCE, {balance: 1})
             if (res.data && res.data.balance) {
@@ -98,8 +101,11 @@ export class Payment {
             return 0
         }
     }
+    getPayMethodList (totalAmount:number) {
+        return this.supportCombination ? this.getPayMethodListForCombination(totalAmount) : this.getPayMethodListForNotCombination(totalAmount)
+    }
 
-    public getPayMethodList(totalAmount: number): PayMethod[] {
+    private getPayMethodListForNotCombination(totalAmount: number): PayMethod[] {
         return FULL_PAY_METHODS.filter(({value}) => {
             switch (value) {
                 case PayType.BALANCE:
@@ -123,16 +129,47 @@ export class Payment {
             return item
         })
     }
+    private getPayMethodListForCombination(totalAmount: number): PayMethod[] {
+        return FULL_PAY_METHODS.filter(({value}) => {
+            switch (value) {
+                case PayType.BALANCE:
+                    return this.balance > 0
+                case PayType.WECHAT:
+                    return this.balance === 0 && !Utils.isAlipay()
+                case PayType.WECHAT_BALANCE:
+                    return this.balance > 0 && this.balance < totalAmount && !Utils.isAlipay()
+                case PayType.ALIPAY:
+                    return this.balance === 0 && !Utils.isWechat()
+                case PayType.ALIPAY_BALANCE:
+                    return this.balance > 0 && this.balance < totalAmount && !Utils.isWechat()
+                case PayType.HUABEI:
+                    return this.balance === 0 && !Utils.isWechat()
+                case PayType.HUABEI_BALANCE:
+                    return this.balance > 0 && this.balance < totalAmount && !Utils.isWechat()
+            }
+        }).map(item => {
+            const {payBalance} = this.computeAmount(totalAmount, this.balance)
+            switch (item.value) {
+                case PayType.BALANCE:
+                    return {
+                        ...item,
+                        label: `余额支付(¥${payBalance})`,
+                        disabled: this.balance > 0 && this.balance < totalAmount
+                    }
+            }
+            return item
+        })
+    }
 
-    computeAmount(totalAmount: number, payType: PayType): { payAmount: number, payBalance: number } {
+    computeAmount(totalAmount: number, balance: number = 0): { payAmount: number, payBalance: number } {
         let payBalance = 0, payAmount = 0
-        if(payType == PayType.BALANCE){
-            payBalance = totalAmount;
-            payAmount = 0;
-        }
-        else{
-            payBalance = 0;
-            payAmount = totalAmount;
+        if (balance === 0) {
+            payAmount = totalAmount
+        } else if (balance > 0 && balance < totalAmount && this.supportCombination) {
+            payBalance = balance
+            payAmount = subtract(bignumber(totalAmount), bignumber(balance)).toNumber()
+        } else {
+            payBalance = totalAmount
         }
         return {payAmount, payBalance}
     }
@@ -206,7 +243,7 @@ export class Payment {
             orderId,
             payType,
             payId,
-            ...this.computeAmount(totalAmount, payType),
+            ...this.computeAmount(totalAmount, this.balance),
         }
         if (payChannel !== null) {
             doUnifiedParams.payChannel = payChannel
@@ -214,7 +251,7 @@ export class Payment {
         const res = await requestForJava.post<DoUnifiedParams, DefaultResponse>(UNIT_PAY, doUnifiedParams)
         if (res.code !== '200') return {errorMessage: res.msg as any, success: false, errorType: PayError.BACKEND}
         if (params.payType === PayType.BALANCE && res.data) {
-            return {success: res.data.result, errorType: PayError.BALANCE} //返回回调地址
+            return {success: res.data.result, errorType: PayError.BALANCE}
         } else if (payChannel === PayChannel.WX_JSAPI) {
             const isPaySucc = await this.wechatPayJSSDK(res.data.content)
             return {