Merge remote-tracking branch 'origin/milestone-20251125-多语言' into milestone-20251125-多语言

src/main/java/com/example/demo/Export/ExportServiceImpl.java

@@ -306,7 +306,7 @@ public class ExportServiceImpl implements ExportService {
 
     @Override
     public Result addExportLive(LiveDTO dto) {
-        return addExport(dto, "直播明细", "lives:queue:export_queue", "beanConsumeLive");
+        return addExport(dto, "打赏明细", "lives:queue:export_queue", "beanConsumeLive");
     }
 
     @Override

src/main/java/com/example/demo/controller/bean/BeanConsumeController.java

@@ -1,5 +1,6 @@
 package com.example.demo.controller.bean;
 
+import com.example.demo.config.interfac.Log;
 import com.example.demo.domain.vo.bean.BeanConsume;
 import com.example.demo.domain.vo.bean.BeanConsumeGold;
 import com.example.demo.domain.vo.bean.BeanRecharge;
@@ -58,6 +59,7 @@ public class BeanConsumeController {
         }
     }
     //筛选查询直播消费记录
+    @Log("查询直播消费记录")
     @PostMapping("/selectLiveBy")
     public Result selectLiveBy(@RequestBody Page page){
         try {
@@ -76,6 +78,7 @@ public class BeanConsumeController {
             return Result.error(e.toString());
         }}
       //筛选查询铁粉消费记录
+    @Log("查询铁粉消费记录")
     @PostMapping("/selectFanBy")
     public Result selectFanBy(@RequestBody Page page){
         try {
@@ -94,6 +97,7 @@ public class BeanConsumeController {
         }}
 
     //筛选查询文章消费记录
+    @Log("查询文章消费记录")
     @PostMapping("/selectArticleBy")
     public Result selectArticleBy(@RequestBody Page page){
         try {
@@ -112,6 +116,7 @@ public class BeanConsumeController {
         }}
 
     //筛选查询小黄车消费记录
+    @Log("查询小黄车消费记录")
     @PostMapping("/selectCartBy")
     public Result selectCartBy(@RequestBody Page page){
         try {

src/main/java/com/example/demo/controller/coin/ConsumeController.java

@@ -74,7 +74,7 @@ public class ConsumeController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
 
         }
 
@@ -117,7 +117,7 @@ public class ConsumeController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }
@@ -143,7 +143,7 @@ public class ConsumeController {
             return Result.success(gold);
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查数据的格式");
+            return Result.error(e.getMessage());
         }
     }
 
@@ -162,7 +162,7 @@ public class ConsumeController {
 //
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请查看后端报错信息");
+            return Result.error(e.getMessage());
         }
     }
 
@@ -200,7 +200,7 @@ public class ConsumeController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }

src/main/java/com/example/demo/controller/coin/HistoryRecordController.java

@@ -62,7 +62,7 @@ public class HistoryRecordController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
     }
     //获取新的历史记录
@@ -87,7 +87,7 @@ public class HistoryRecordController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
     }
 }

src/main/java/com/example/demo/controller/coin/RechargeController.java

@@ -110,7 +110,7 @@ public class RechargeController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }
@@ -131,7 +131,7 @@ public class RechargeController {
             Gold gold = rechargeService.statsGold(rechargeUser);
             return Result.success(gold);
         } catch (Exception e) {
-            return Result.error("请检查数据的格式");
+            return Result.error(e.getMessage());
         }
     }
 
@@ -142,7 +142,7 @@ public class RechargeController {
         try {
             return rechargeService.add(rechargeUser);
         } catch (Exception e) {
-            return Result.error("请检查数据的格式");
+            return Result.error(e.getMessage());
         }
     }
 
@@ -159,7 +159,7 @@ public class RechargeController {
                 return Result.success(rechargeService.selectBy(page.getPageNum(), page.getPageSize(), page.getRechargeUser()));
             }
         } catch (Exception e) {
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }

src/main/java/com/example/demo/controller/coin/RoleController.java

@@ -111,7 +111,7 @@ public class RoleController {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
         }
 
     }

src/main/java/com/example/demo/domain/entity/CashRecord.java

@@ -39,6 +39,7 @@ public class CashRecord implements Serializable {
     private String NumUnit;                // 数量单位 个/月/年
     private Integer permanentGold;      // 永久金币数量
     private Integer freeGold;           // 免费金币数量
+    private String payload;             //平台
 
     // 金额信息
     private String paymentCurrency;        // 付款币种

src/main/java/com/example/demo/domain/entity/GOrder.java

@@ -33,4 +33,6 @@ public class GOrder {
     private Integer addTime;        // 创建时间
     private Integer updTime;        // 更新时间
     private Integer isSynced;       // 0未同步 1已同步
+    private String firstdataIpgTransactionId;   // FirstData订单号
+
 }

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()) {
@@ -353,37 +374,39 @@ public User getNameAndMarket(Integer jwcode) {
                             cashRecord.setPayType("IOS内购");
                             cashRecord.setBankCode(gOrder.getIosTransactionId());
                             cashRecord.setReceivedMarket("3");
+                            cashRecord.setPayload("IOS");
                             break;
                         case 5:
                             cashRecord.setPayType("Stripe-链接收款");
                             cashRecord.setReceivedMarket("13");
+                            cashRecord.setPayload("Stripe");
                             break;
                         case 6:
                             cashRecord.setPayType("PaymentAsia-链接收款");
                             cashRecord.setReceivedMarket("13");
+                            cashRecord.setPayload("PaymentAsia");
                             break;
                         case 7:
                             cashRecord.setPayType("Ipay88-链接收款");
                             cashRecord.setReceivedMarket("5");
+                            cashRecord.setPayload("Ipay88");
                             break;
                         case 9:
                             cashRecord.setPayType("FistData");
                             cashRecord.setReceivedMarket("4");
+                            cashRecord.setBankCode(gOrder.getFirstdataIpgTransactionId());
+                            cashRecord.setPayload("FistData");
                             break;
                         default:
                             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">

src/main/resources/mapper/AuditMapper.xml

@@ -35,7 +35,12 @@
         where order_code = #{orderCode} and type in (0,1)
     </update>
     <select id="selectRechargeBy" resultType="com.example.demo.domain.vo.coin.RechargeAudit">
-        SELECT ugr.*,
+        SELECT ugr.id,ugr.order_code,ugr.jwcode,ugr.activity,
+        ugr.rate_id,ugr.money,ugr.sum_gold,ugr.permanent_gold,ugr.free_june,ugr.free_december,
+        ugr.task_gold,ugr.remark,ugr.pay_model,ugr.pay_platform,ugr.voucher,
+        ugr.goods_name,ugr.type,ugr.is_refund,ugr.admin_id,ugr.audit_id,
+        ugr.audit_status,ugr.reject_reason,ugr.pay_time,
+        ugr.create_time,ugr.audit_time,ugr.update_time,
         (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,
         u.name as name,
         m.name as market,
@@ -63,12 +68,18 @@
                 AND ugr.activity = #{rechargeAudit.activity}
             </if>
             <!-- 判断 market 是否不为总部且 markets 不为空 -->
-            <if test="rechargeAudit.markets != null and rechargeAudit.markets.size() > 0">
+           <!-- <if test="rechargeAudit.markets != null and rechargeAudit.markets.size() > 0">
                 AND (
                 <foreach collection="rechargeAudit.markets" item="market" open="" close="" separator=" OR ">
                     u.market = #{market}
                 </foreach>
                 )
+            </if>-->
+            <if test="rechargeAudit.markets != null and rechargeAudit.markets.size() > 0">
+                AND u.market IN
+                <foreach collection="rechargeAudit.markets" item="market" open="(" separator="," close=")">
+                    #{market}
+                </foreach>
             </if>
             <if test="rechargeAudit.payModel != null and rechargeAudit.payModel != ''">
                 AND ugr.pay_model = #{rechargeAudit.payModel}
@@ -77,7 +88,7 @@
                 AND ugr.rate_id = #{rechargeAudit.rateId}
             </if>-->
             <if test="rechargeAudit.market != null and rechargeAudit.market != ''">
-                AND  m.name = #{rechargeAudit.market}
+                AND  m.id = #{rechargeAudit.market}
             </if>
             <if test="rechargeAudit.startTime != null and rechargeAudit.endTime != null ">
                 AND ugr.audit_time between #{rechargeAudit.startTime} and #{rechargeAudit.endTime}
@@ -145,7 +156,7 @@
                 AND ugr.audit_time between #{refundAudit.startTime} and #{refundAudit.endTime}
             </if>
             <if test="refundAudit.market != null and refundAudit.market != ''">
-                AND  m.name = #{refundAudit.market}
+                AND  m.id = #{refundAudit.market}
             </if>
 
             <if test="refundAudit.auditStatus != null and refundAudit.auditStatus != ''">

src/main/resources/mapper/BeanRechargeMapper1.xml

@@ -30,7 +30,7 @@
     <select id="selectCartBy" resultType="com.example.demo.domain.vo.bean.BeanConsumeCartVo">
         select
             co.id, co.nickname,co.jwcode,m.name AS market,pd.name AS productName,co.total_money,co.source_name,co.live_name, FROM_UNIXTIME(co.created_at) AS createdAt
-        from cart_order co
+        from `order` co
                  left join user u on u.jwcode = co.jwcode
                  left join market m on m.id = u.market
                  left join product_dict pd on pd.id = co.product_id