10-21 未知地区改为非网

src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.UUID;
 
@@ -245,35 +246,39 @@ public class CashCollectionServiceImpl implements CashCollectionService {
                 cashRecord.setJwcode(gOrder.getJwcode());
                 cashRecord.setName(cashCollectionMapper.getNameByJwcode(gOrder.getJwcode()));
                 cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(gOrder.getJwcode()));
-                cashRecord.setActivity("Link充值金币");
+                cashRecord.setActivity("Link日常充值");
                 cashRecord.setOrderCode(gOrder.getOrderNo());
                 if (gOrder != null) {
                     switch (gOrder.getPayStyle()) {
                         case 3:
                             cashRecord.setPayType("IOS内购");
                             cashRecord.setBankCode(gOrder.getIosTransactionId());
-                            break;
-                        case 4:
-                            cashRecord.setPayType("Paypal");
-                            cashRecord.setBankCode(gOrder.getPaypalOrderId());
+                            cashRecord.setReceivedMarket("3");
                             break;
                         case 5:
                             cashRecord.setPayType("Stripe-链接收款");
+                            cashRecord.setReceivedMarket("13");
                             break;
                         case 6:
                             cashRecord.setPayType("PaymentAsia-链接收款");
+                            cashRecord.setReceivedMarket("13");
                             break;
                         case 7:
                             cashRecord.setPayType("Ipay88-链接收款");
+                            cashRecord.setReceivedMarket("5");
                             break;
                         case 9:
                             cashRecord.setPayType("FistData");
+                            cashRecord.setReceivedMarket("4");
                             break;
                         default:
                             break;
                     }
                 }
                 cashRecord.setGoodsName("Link充值金币");
+                cashRecord.setPermanentGold(gOrder.getCount());
+                cashRecord.setPayTime(java.time.LocalDateTime.ofInstant(java.time.Instant.ofEpochMilli(gOrder.getSuccessTime()), java.time.ZoneId.systemDefault()));
+               // cashCollectionMapper.
             }
         }return "同步成功";
     }}

src/main/java/com/example/demo/serviceImpl/coin/WorkbenchServiceImpl.java

@@ -63,7 +63,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
                 allMarkets.remove("总部");
                 // 固定顺序
                 List<String> fixed = Arrays.asList(
-                        "新加坡", "马来西亚", "香港", "加拿大", "泰国", "越南HCM", "韩国", "未知"
+                        "新加坡", "马来西亚", "香港", "加拿大", "泰国", "越南HCM", "韩国", "非网"
                 );
 
                 // 先放固定顺序（存在的才放）

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -200,7 +200,7 @@
                success_time,ios_environment,ios_transaction_id,ios_receipt_data,
                paypal_order_id,add_time,is_synced
         from g_order
-        where is_synced=0 and state=1 and type='gold_coin'
+        where is_synced=0 and state=1 and type='gold_coin' and pay_style in(3,5,6,7,9)
         limit #{size}
     </select>
 </mapper>