Merge branch 'hqz' of http://39.101.133.168:8807/yanjiaqing/gold_java into ljl

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

@@ -20,7 +20,7 @@ public class Pay {
     private String nickname;
     private BigDecimal price;
     private Integer count;
-    private Integer payStyle;
+    private String payStyle;
     private Integer state;
     private Integer platfrom;
     private Integer successTime;

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

@@ -19,7 +19,7 @@ public class RechargeTotal {
     private String type;
     private BigDecimal priceTotal;
     private Integer countTotal;
-    private Integer payStyle;
+    private String payStyle;
     private String deptName;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
     @DateTimeFormat(pattern = "yyyy-MM-dd")

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

@@ -37,4 +37,5 @@ public class Spend implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
     private String room;
+    private Integer sourceType;
 }

src/main/resources/mapperLink/DouMapper.xml

@@ -83,7 +83,7 @@
         fm.nickname,
         fy.content,
         fy.pay_type,
-        fy.source_type AS good,
+        fy.source_type,
         fm.jwcode,
         fm.ip_address,
         fy.money_free,
@@ -109,10 +109,10 @@
         <if test="sourceName != null and sourceName.length > 0">
             AND fy.source_name = #{sourceName}
         </if>
-        <if test="payType != null and payType.length > 0">
+        <if test="payType != null">
             AND fy.pay_type = #{payType}
         </if>
-        <if test="good != null and good.length > 0">
+        <if test="sourceType != null">
             AND fy.source_type = #{good}
         </if>
         <if test="startTime != null and endTime != null">
@@ -144,10 +144,10 @@
             <if test="sourceName != null and sourceName.length > 0">
                 AND fy.source_name = #{sourceName}
             </if>
-            <if test="payType != null and payType.length > 0">
+            <if test="payType != null">
                 AND fy.pay_type = #{payType}
             </if>
-            <if test="sourceType != null and sourceType.length > 0">
+            <if test="sourceType != null ">
                 AND fy.source_type = #{sourceType}
             </if>
             <if test="startTime != null and endTime != null">

src/main/resources/mapperPay/PayMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.demo.mapperPay.PayMapper">
     <select id="getPay" resultType="com.example.demo.domain.dou.Pay">
-        SELECT go.jwcode,mi.name,mi.deptName,mi.shopName,go.type,go.order_no,go.price,go.count,gps.`name`,go.success_time from g_order as go
+        SELECT gps.`name` as payStyle,go.jwcode,mi.name,mi.deptName,mi.shopName,go.type,go.order_no,go.price,go.count,gps.`name`,go.success_time from g_order as go
 LEFT JOIN member_info as mi on go.jwcode = mi.jwcode
             LEFT JOIN g_pay_style gps on go.pay_style=gps.id
         <where>
@@ -18,7 +18,7 @@ LEFT JOIN member_info as mi on go.jwcode = mi.jwcode
                 and go.type = #{type}
             </if>
             <if test="payStyle != null and payStyle.length > 0">
-                and  go.pay_style = #{payStyle}
+                and  gps.`name` = #{payStyle}
             </if>
             <if test="deptName !=null and deptName.length > 0">
                 and mi.deptName = #{deptName}
@@ -44,6 +44,7 @@ LEFT JOIN member_info as mi on go.jwcode = mi.jwcode
         sum(price) as priceTotal,
         sum(count) as countTotal
         FROM g_order as go
+        LEFT JOIN g_pay_style gps on go.pay_style=gps.id
         <where>
             <if test="jwcode != null">
                 and go.jwcode = #{jwcode}
@@ -55,7 +56,7 @@ LEFT JOIN member_info as mi on go.jwcode = mi.jwcode
                 and go.type = #{type}
             </if>
             <if test="payStyle != null and payStyle.length > 0">
-                and  go.pay_style = #{payStyle}
+                and  gps.`name` = #{payStyle}
             </if>
             <if test="deptName !=null and deptName.length > 0">
                 and mi.deptName = #{deptName}