12-01 同步线上收款优化

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

@@ -341,11 +341,32 @@ public User getNameAndMarket(Integer jwcode) {
             }
             for (GOrder gOrder : gOrders) {
                 CashRecord cashRecord = new CashRecord();
+                //构建基础信息
                 cashRecord.setOrderType(1);
                 cashRecord.setJwcode(gOrder.getJwcode());
-                cashRecord.setName(cashCollectionMapper.getNameByJwcode(gOrder.getJwcode()));
+                String name=cashCollectionMapper.getNameByJwcode(gOrder.getJwcode());
+                if (name!=null){
+                    cashRecord.setName(name);
+                }else cashRecord.setName("未知");
+
                 cashRecord.setMarket(cashCollectionMapper.getMarketByJwcode(gOrder.getJwcode()));
+                if (gOrder.getType().equals("gold")){   //充金豆
                 cashRecord.setActivity("Link日常充值");
+                cashRecord.setGoodsName("Link充值金豆");
+                    cashRecord.setRemark("Link充值金豆");
+                    cashRecord.setNumUnit("个");
+                    cashRecord.setPermanentGold(0);
+                    cashRecord.setGoodNum(gOrder.getCount());
+
+                }
+                if (gOrder.getType().equals("gold_coin")){//充金币
+                    cashRecord.setActivity("Link日常充值");
+                    cashRecord.setGoodsName("Link充值金币");
+                    cashRecord.setRemark("Link充值金币");
+                    cashRecord.setPermanentGold(gOrder.getCount());
+                    cashRecord.setGoodNum(0);
+
+                }
                 cashRecord.setOrderCode(gOrder.getOrderNo());
                 if (gOrder != null) {
                     switch (gOrder.getPayStyle()) {
@@ -374,16 +395,12 @@ public User getNameAndMarket(Integer jwcode) {
                             break;
                     }
                 }
-                cashRecord.setGoodsName("Link充值金币");
-                cashRecord.setGoodNum(0);
-                cashRecord.setPermanentGold(gOrder.getCount());
                 cashRecord.setFreeGold(0);
                 cashRecord.setPaymentCurrency("");
                 cashRecord.setPaymentAmount(BigDecimal.valueOf(0));
                 cashRecord.setPayTime(LocalDateTime.ofEpochSecond(gOrder.getSuccessTime(), 0, ZoneOffset.UTC));
                 cashRecord.setStatus(3);
                 cashRecord.setSubmitterId(99999);
-                cashRecord.setRemark("Link充值金币");
                 //存入现金库
                 cashCollectionMapper.add(cashRecord);
                 cashCollectionMapper.markSynced(gOrder.getId());

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -230,7 +230,8 @@
                success_time,ios_environment,ios_transaction_id,ios_receipt_data,
                add_time,is_synced
         from g_order
-        where is_synced=0 and state=1 and type='gold_coin' and pay_style in(3,5,6,7,9)
+        where is_synced=0 and state=1  and pay_style in(3,5,6,7,9)
+            and success_time>1765246960
         limit #{size}
     </select>
     <select id="selectById" resultType="com.example.demo.domain.vo.cash.CashCollection">