Przeglądaj źródła

feat: 修改日志

DoggyZhang 2 miesięcy temu
rodzic
commit
94e4e84711

+ 18 - 6
module/wallet/src/main/java/com/adealink/weparty/wallet/pay/PayManager.kt

@@ -177,7 +177,7 @@ class PayManager : IPayManager, IPayListener, BaseFrame<IListener>() {
             }
 
             is Rlt.Failed -> {
-                Log.d(TAG_PAY, "buyProduct fail, for querySku fail, $skuRlt")
+                Log.i(TAG_PAY, "buyProduct fail, for querySku fail, $skuRlt")
                 return skuRlt
             }
         }
@@ -187,7 +187,7 @@ class PayManager : IPayManager, IPayListener, BaseFrame<IListener>() {
             //创建订单
             val createOrderRlt = createOrder(productInfo)
             if (createOrderRlt !is Rlt.Success) {
-                Log.d(TAG_PAY, "buyProduct fail, for createOrder, $createOrderRlt")
+                Log.i(TAG_PAY, "buyProduct fail, for createOrder, $createOrderRlt")
                 return createOrderRlt
             }
             orderId = createOrderRlt.data
@@ -348,7 +348,7 @@ class PayManager : IPayManager, IPayListener, BaseFrame<IListener>() {
             }
             //查询订单
             val purchasesRlt = getPay(channel).queryPurchases()
-            Log.logRltD(TAG_PAY, "queryPurchases", purchasesRlt)
+            Log.logRltD(TAG_PAY, "queryAndHandleUnDealPurchases", purchasesRlt)
             if (purchasesRlt !is Rlt.Success) {
                 return@launch
             }
@@ -360,11 +360,15 @@ class PayManager : IPayManager, IPayListener, BaseFrame<IListener>() {
         channel: PayChannel,
         purchases: List<Purchase>
     ) {
-        Log.d(
+        Log.i(
             TAG_PAY,
-            "handleUnDealPurchases, channel:$channel, purchases:${purchases.joinToString(separator = ",") { it.getOrderId() }}"
+            "handleUnDealPurchases, channel:$channel, purchases:${purchases.joinToString(separator = ",") { "order(${it.obfuscatedProfileId() ?: ""})" }}"
         )
         purchases.forEach { purchase ->
+            Log.i(
+                TAG_PAY,
+                "handleUnDealPurchases, obfuscatedAccountId:${purchase.obfuscatedAccountId()}, isPurchased:${purchase.isPurchased()}, isAcknowledged:${purchase.isAcknowledged()}"
+            )
             val obfuscatedAccountId = purchase.obfuscatedAccountId()
             if (!obfuscatedAccountId.isNullOrEmpty() && obfuscatedAccountId != AccountModule.uid) {
                 //非当前账户订单不处理
@@ -376,14 +380,22 @@ class PayManager : IPayManager, IPayListener, BaseFrame<IListener>() {
             if (purchase.isAcknowledged()) {
                 //已经确认,直接消费
                 val consumeRlt = getPay(channel).consume(purchase.getPurchaseToken())
+                Log.i(
+                    TAG_PAY,
+                    "handleUnDealPurchases, consumeRlt: $consumeRlt"
+                )
                 return@forEach
             }
             //未确认,重走订单验证
             val productInfo = queryProductInfoBy(channel, purchase)
             if (productInfo == null) {
+                Log.i(
+                    TAG_PAY,
+                    "handleUnDealPurchases, queryProductInfoBy() fail"
+                )
                 return@forEach
             }
-            Log.d(
+            Log.i(
                 TAG_PAY,
                 "--> UnDealPurchases:${purchases.joinToString(separator = ",") { "${it.obfuscatedProfileId()}_${it.getPurchaseToken()}" }}"
             )