4.18 修改bug

src/main/java/com/example/demo/config/Mysql1DataSourceConfig.java

@@ -20,20 +20,24 @@ import javax.sql.DataSource;
 @Configuration
 public class Mysql1DataSourceConfig {
 
-    @Bean(name = "mysql1DataSource")
-//    @Primary
-    public DataSource mysql1DataSource() {
-        HikariDataSource dataSource = new HikariDataSource();
-        dataSource.setJdbcUrl("jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&characterEncoding=UTF-8");
-        dataSource.setUsername("hwgold");
-        dataSource.setPassword("AGX4Z3YMxiCG3GR2");
-        dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
-        dataSource.setMaximumPoolSize(10);
-        dataSource.setPoolName("mysql1HikariCP");
-        log.info("mysql1 DataSource initialized with pool-name: {}", dataSource.getPoolName());
-        return dataSource;
-    }
-
+//    @Bean(name = "mysql1DataSource")
+////    @Primary
+//    public DataSource mysql1DataSource() {
+//        HikariDataSource dataSource = new HikariDataSource();
+//        dataSource.setJdbcUrl("jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&characterEncoding=UTF-8");
+//        dataSource.setUsername("hwgold");
+//        dataSource.setPassword("AGX4Z3YMxiCG3GR2");
+//        dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+//        dataSource.setMaximumPoolSize(10);
+//        dataSource.setPoolName("mysql1HikariCP");
+//        log.info("mysql1 DataSource initialized with pool-name: {}", dataSource.getPoolName());
+//        return dataSource;
+//    }
+@Bean(name = "mysql1DataSource")
+@ConfigurationProperties(prefix = "spring.datasource.mysql1")
+public DataSource mysql2DataSource() {
+    return DataSourceBuilder.create().type(HikariDataSource.class).build();
+}
     @Bean(name = "mysql1SqlSessionFactory")
 //    @Primary
     public SqlSessionFactory mysql1SqlSessionFactory(@Qualifier("mysql1DataSource") DataSource dataSource,

src/main/java/com/example/demo/controller/DouController.java

@@ -2,10 +2,7 @@ package com.example.demo.controller;
 
 
 
-import com.example.demo.domain.dou.Records;
-import com.example.demo.domain.dou.Searchinfo;
-import com.example.demo.domain.dou.SpendTotal;
-import com.example.demo.domain.dou.YveTotal;
+import com.example.demo.domain.dou.*;
 import com.example.demo.domain.vo.Page;
 import com.example.demo.domain.vo.Result;
 import com.example.demo.sevice.DouService;
@@ -93,4 +90,8 @@ public class DouController {
     public Result getSpendTotal(@RequestBody SpendTotal spendTotal){
         return Result.success(douService.getSpendTotal(spendTotal));
     }
+    @RequestMapping("/getRechargeTotal")
+    public Result getRechargeTotal(@RequestBody RechargeTotal rechargeTotal){
+        return Result.success(douService.getRechargeTotal(rechargeTotal));
+    }
 }

src/main/java/com/example/demo/domain/dou/RechargeTotal.java

@@ -0,0 +1,30 @@
+package com.example.demo.domain.dou;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RechargeTotal {
+    private String token;
+    private Integer jwcode;
+    private String OrderNo;
+    private String type;
+    private BigDecimal priceTotal;
+    private Integer countTotal;
+    private Integer payStyle;
+    private String deptName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+}

src/main/java/com/example/demo/domain/dou/SpendTotal.java

@@ -14,14 +14,24 @@ import java.util.Date;
 public class SpendTotal {
     private String token;
     private Integer SpendTotal;
+    private String jwcode;
+    private String nickname;
+    private String ipAddress;
+    private Integer jinbi;
+    private Integer jinbiFree;
+    private Integer jinbiBuy;
+    private Integer jinbiCostTotal;
+    private String sortField;
+    private String sortOrder;
+    private String sourceName;
+    private String content;
+    private Integer payType;
+    private Integer sourceType;
+    private Integer time;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date startTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
-    private String jwcode;
-    private String sourceName;
-    private Integer payType;
-    private String ipAddress;
 }

src/main/java/com/example/demo/mapperPay/PayMapper.java

@@ -1,6 +1,7 @@
 package com.example.demo.mapperPay;
 
 import com.example.demo.domain.dou.Pay;
+import com.example.demo.domain.dou.RechargeTotal;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -10,5 +11,6 @@ public interface PayMapper {
     List<Pay> getPay(Pay pay);
     List<String> getPayIp();
     List<String> getStyle();
+    RechargeTotal getRechargeTotal(RechargeTotal rechargeTotal);
 
 }

src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java

@@ -158,4 +158,9 @@ public class DouServiceImpl implements DouService {
     public Integer getSpendTotal(SpendTotal spendTotal) {
         return douMapper.getSpendTotal(spendTotal);
     }
+
+    @Override
+    public RechargeTotal getRechargeTotal(RechargeTotal rechargeTotal) {
+        return payMapper.getRechargeTotal(rechargeTotal);
+    }
 }

src/main/java/com/example/demo/sevice/DouService.java

@@ -22,4 +22,5 @@ public interface DouService {
     List<Spend> getSpend(Spend spend);
     Object searchSpend(Integer pageNum, Integer pageSize, Spend spend);
     Integer getSpendTotal(SpendTotal spendTotal);
+    RechargeTotal getRechargeTotal(RechargeTotal rechargeTotal);
 }

src/main/resources/application.yml

@@ -3,8 +3,16 @@ spring:
     deserialization:
       fail-on-unknown-properties: false
   datasource:
+#    mysql1:
+#      jdbc-url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai
+#      username: hwgold
+#      password: AGX4Z3YMxiCG3GR2
+#      driver-class-name: com.mysql.cj.jdbc.Driver
+#      hikari:
+#        pool-name: mysql1HikariCP
+#        maximum-pool-size: 10
     mysql1:
-      jdbc-url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai
+      jdbc-url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai
       username: hwgold
       password: AGX4Z3YMxiCG3GR2
       driver-class-name: com.mysql.cj.jdbc.Driver

src/main/resources/mapperLink/DouMapper.xml

@@ -114,7 +114,6 @@
     </select>
     <select id="getSpendTotal" resultType="java.lang.Integer">
         SELECT
-        SELECT
         sum(fy.money) as SpendTotal
         FROM fx_member fm
         LEFT JOIN fx_yaoqing_records fy ON fm.id = fy.uid

src/main/resources/mapperPay/PayMapper.xml

@@ -39,4 +39,30 @@ LEFT JOIN member_info as mi on go.jwcode = mi.jwcode
     <select id="getStyle" resultType="java.lang.String">
         SELECT DISTINCT `name` FROM g_pay_style
     </select>
+    <select id="getRechargeTotal" resultType="com.example.demo.domain.dou.RechargeTotal">
+        SELECT
+        sum(price) as priceTotal,
+        sum(count) as countTotal
+        FROM g_order as go
+        <where>
+            <if test="jwcode != null">
+                and go.jwcode = #{jwcode}
+            </if>
+            <if test="orderNo != null and orderNo.length > 0">
+                and go.order_no = #{orderNo}
+            </if>
+            <if test="type != null and type.length > 0">
+                and go.type = #{type}
+            </if>
+            <if test="payStyle != null and payStyle.length > 0">
+                and  go.pay_style = #{payStyle}
+            </if>
+            <if test="deptName !=null and deptName.length > 0">
+                and mi.deptName = #{deptName}
+            </if>
+            <if test="startTime != null and endTime != null">
+                and FROM_UNIXTIME(go.success_time) BETWEEN #{startTime} AND #{endTime}
+            </if>
+        </where>
+    </select>
 </mapper>