v5pay添加后台

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/ChargeRecordPartitionVo.java

@@ -42,6 +42,9 @@ public class ChargeRecordPartitionVo {
     @ExcelProperty("总充值美元")
     public BigDecimal totalUsd = BigDecimal.ZERO;
 
+    @ExcelProperty("v5pay充值美元")
+    public BigDecimal v5payUsd = BigDecimal.ZERO;
+
 }
 
 

accompany-admin/accompany-admin-service/src/main/resources/mapper/ChargeRecordAdminMapper.xml

@@ -121,6 +121,7 @@
         ifnull(sum(case when cr.channel = 'ios_pay' then amount else 0 end)/100,0) `iosUsd`,
         ifnull(sum(case when cr.charge_prod_id = 'company' then amount else 0 end)/100,0) `companyUsd`,
         ifnull(sum(case when cr.channel = 'razer' then amount else 0 end)/100,0) `razerUsd`,
+        ifnull(sum(case when cr.channel = 'v5pay' then amount else 0 end)/100,0) `v5payUsd`,
         ifnull(sum(amount)/100,0) `totalUsd`
         from charge_record cr
         inner join users u on cr.uid = u.uid

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/user/ChargeRecordAdminController.java

@@ -129,7 +129,7 @@ public class ChargeRecordAdminController extends BaseController {
         List<ChargeRecordStatisVo> statisticsList = (List<ChargeRecordStatisVo>) data.get("rows");
         // 设置下载时客户端Excel的名称
         String filename = "statistics_charge_record_total.xls";
-        List<String> fields = Arrays.asList("timeStr", "razerAmount","googleAmount", "payermaxAmount", "myCardAmount", "iosPayAmount", "companyAccount", "totalAmount");
+        List<String> fields = Arrays.asList("timeStr", "razerAmount","v5payAmount","googleAmount", "payermaxAmount", "myCardAmount", "iosPayAmount", "companyAccount", "totalAmount");
         ExcelUtils.exportExcel("充值统计数据", filename, fields, statisticsList, response);
     }
 

accompany-base/accompany-payment/accompany-payment-sdk/src/main/java/com/accompany/payment/vo/ChargeRecordStatisVo.java

@@ -49,6 +49,8 @@ public class ChargeRecordStatisVo extends BaseVo {
     public BigDecimal payermaxAmount;
     @FieldComment("razer")
     public BigDecimal razerAmount;
+    @FieldComment("v5pay")
+    public BigDecimal v5payAmount;
     @FieldComment("MyCard")
     public BigDecimal myCardAmount;
     @FieldComment("StartPay")
@@ -81,6 +83,8 @@ public class ChargeRecordStatisVo extends BaseVo {
     public BigDecimal payermaxCount;
     @FieldComment("razer笔数")
     public BigDecimal razerCount;
+    @FieldComment("v5pay笔数")
+    public BigDecimal v5payCount;
     @FieldComment("MyCard笔数")
     public Integer myCardCount;
     @FieldComment("公账笔数")

accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/ChargeRecordMapperMgr.xml

@@ -53,6 +53,7 @@
         <result column="google" property="googleAmount" jdbcType="DECIMAL"/>
         <result column="payermax" property="payermaxAmount" jdbcType="DECIMAL"/>
         <result column="razer" property="razerAmount" jdbcType="DECIMAL"/>
+        <result column="v5pay" property="v5payAmount" jdbcType="DECIMAL"/>
         <result column="my_card" property="myCardAmount" jdbcType="DECIMAL"/>
         <result column="start_pay" property="startPayAmount" jdbcType="DECIMAL"/>
         <result column="companyAccount" property="companyAccount" jdbcType="DECIMAL"/>
@@ -74,6 +75,7 @@
         <result column="googleCount" property="googleCount" jdbcType="INTEGER"/>
         <result column="payermaxCount" property="payermaxCount" jdbcType="INTEGER"/>
         <result column="razerCount" property="razerCount" jdbcType="INTEGER"/>
+        <result column="v5payCount" property="v5payCount" jdbcType="INTEGER"/>
         <result column="myCardCount" property="myCardCount" jdbcType="INTEGER"/>
     </resultMap>
 
@@ -171,6 +173,7 @@
         max(CASE a.channel WHEN 'google_play_billing' THEN a.amount ELSE 0 END ) google,
         max(CASE a.channel WHEN 'payermax' THEN a.amount ELSE 0 END ) payermax,
         max(CASE a.channel WHEN 'razer' THEN a.amount ELSE 0 END ) razer,
+        max(CASE a.channel WHEN 'v5pay' THEN a.amount ELSE 0 END ) v5pay,
         max(CASE a.channel WHEN 'MyCard' THEN a.amount ELSE 0 END ) my_card,
         max(CASE a.channel WHEN 'start_pay' THEN a.amount ELSE 0 END ) start_pay,
         max(CASE a.channel WHEN 'companyAccount' THEN a.amount ELSE 0 END ) companyAccount,
@@ -190,6 +193,7 @@
             max(CASE a.channel WHEN 'google_play_billing' THEN a.count ELSE 0 END ) googleCount,
             max(CASE a.channel WHEN 'payermax' THEN a.count ELSE 0 END ) payermaxCount,
             max(CASE a.channel WHEN 'razer' THEN a.count ELSE 0 END ) razerCount,
+            max(CASE a.channel WHEN 'v5pay' THEN a.count ELSE 0 END ) v5payCount,
             max(CASE a.channel WHEN 'MyCard' THEN a.count ELSE 0 END ) myCardCount,
             max(CASE a.channel WHEN 'start_pay' THEN a.amount ELSE 0 END ) start_pay,
             max(CASE a.channel WHEN 'companyAccount' THEN a.count ELSE 0 END ) companyAccountCount,