解决冲突

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/UseIntegralMapper.java

@@ -1,21 +1,36 @@
 package com.iamberry.wechat.service.mapper;
 
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 public interface UseIntegralMapper {
     /**
-     * 积分使用日志
-     * @param openid
+     * 获得积分的日志
+     * @param userOpenId
+     * @return
+             */
+    List<UseIntegral> getGainIntegral(String userOpenId);
+
+    /**
+     * 获得的总积分数
+     * @param userOpenId
+     * @return
+     */
+    int allGainIntegral(String userOpenId);
+
+    /**
+     * 使用的总积分数
+     * @param userOpenId
      * @return
      */
-    List<UseIntegral> getUseIntegral(String openid);
+    int allUseIntegral(String userOpenId);
 
     /**
-     * 总积分（使用）
-     * @param openid
+     * 全部的积分日志
+     * @param userOpenId
      * @return
      */
-    int allUseIntegral(String openid);
+    List<UseIntegral> getAllIntegral(String userOpenId);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/useIntegralMapper.xml

@@ -12,18 +12,36 @@
         use_integral_remarks useIntegralRemarks,
         use_integral_create_time useIntegralCreateTime
     </sql>
-    <!--积分使用日志-->
-    <select id="getUserIntegral" parameterType="String" resultType="UseIntegral">
-        SELECT use_integral_type,use_integral_number,use_integral_create_time
+    <!--获得积分的日志-->
+    <select id="getGainIntegral" parameterType="String" resultType="UseIntegral">
+        SELECT use_config_id,use_integral_remarks,use_integral_create_time
         FROM tb_iamberry_use_integral
-        WHERE user_openid=#{userOpenid}
+        WHERE user_openid=#{userOpenid} AND use_type=1
         ORDER BY use_integral_id DESC
     </select>
-    <!--总使用积分-->
+    <!--获得的总积分数-->
+    <select id="allGainIntegral" parameterType="String" resultType="int">
+        SELECT avg(use_integral_number)
+        FROM tb_iamberry_use_integral
+        WHERE user_openid=#{userOpenid} AND use_type=1
+    </select>
+    <!--使用的总积分数-->
     <select id="allUseIntegral" parameterType="String" resultType="int">
         SELECT avg(use_integral_number)
         FROM tb_iamberry_use_integral
+        WHERE user_openid=#{userOpenid} AND use_type=2
+    </select>
+    <!--全部的积分日志-->
+    <select id="getAllIntegral" parameterType="String" resultType="UseIntegral">
+        SELECT use_integral_type,
+                use_integral_number,
+                use_type,
+                use_config_id,
+                use_integral_remarks,
+                use_integral_create_time
+        FROM tb_iamberry_use_integral
         WHERE user_openid=#{userOpenid}
+        ORDER BY use_integral_id DESC
     </select>
 
 </mapper>