添加了查询积分配置的方法

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/integral/UseIntegralService.java

@@ -1,5 +1,6 @@
 package com.iamberry.wechat.face.integral;
 
+import com.iamberry.wechat.core.entity.integral.IntegralConfig;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
 
 import java.util.List;
@@ -18,4 +19,11 @@ public interface UseIntegralService {
      * @return
      */
     int allUseIntegral(String openid);
+
+    /**
+     * 查询积分来源信息
+     * @param integralConfig
+     * @return
+     */
+    List<IntegralConfig> listIntegralConfig(IntegralConfig integralConfig);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/integral/UseIntegralServiceImpl.java

@@ -1,8 +1,9 @@
 package com.iamberry.wechat.service.integral;
 
+import com.iamberry.wechat.core.entity.integral.IntegralConfig;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
 import com.iamberry.wechat.face.integral.UseIntegralService;
-import com.iamberry.wechat.service.integral.dao.UseIntegralDao;
+import com.iamberry.wechat.service.mapper.UseIntegralMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -10,7 +11,7 @@ import java.util.List;
 @Service
 public class UseIntegralServiceImpl implements UseIntegralService {
     @Autowired
-    private UseIntegralDao useIntegralDao;
+    private UseIntegralMapper useIntegralMapper;
 
     /**
      * 积分使用日志
@@ -19,7 +20,7 @@ public class UseIntegralServiceImpl implements UseIntegralService {
      */
     @Override
     public List<UseIntegral> getUseIntegral(String openid) {
-        return useIntegralDao.getUseIntegral(openid);
+        return useIntegralMapper.getUseIntegral(openid);
     }
     /**
      * 总积分（使用）
@@ -28,6 +29,11 @@ public class UseIntegralServiceImpl implements UseIntegralService {
      */
     @Override
     public int allUseIntegral(String openid) {
-        return useIntegralDao.allUseIntegral(openid);
+        return useIntegralMapper.allUseIntegral(openid);
+    }
+
+    @Override
+    public List<IntegralConfig> listIntegralConfig(IntegralConfig integralConfig) {
+        return null;
     }
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/integral/dao/UseIntegralDao.java

@@ -1,21 +0,0 @@
-package com.iamberry.wechat.service.integral.dao;
-
-import com.iamberry.wechat.core.entity.integral.UseIntegral;
-
-import java.util.List;
-
-public interface UseIntegralDao {
-    /**
-     * 积分使用日志
-     * @param openid
-     * @return
-     */
-    List<UseIntegral> getUseIntegral(String openid);
-
-    /**
-     * 总积分（使用）
-     * @param openid
-     * @return
-     */
-    int allUseIntegral(String openid);
-}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/integral/dao/impl/UseIntegralDaoImpl.java

@@ -1,32 +0,0 @@
-package com.iamberry.wechat.service.integral.dao.impl;
-
-import com.iamberry.wechat.core.entity.integral.UseIntegral;
-import com.iamberry.wechat.service.integral.dao.UseIntegralDao;
-import com.iamberry.wechat.service.mapper.UseIntegralMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-@Service
-public class UseIntegralDaoImpl implements UseIntegralDao{
-    @Autowired
-    private UseIntegralMapper useIntegralMapper;
-    /**
-     *积分使用日志
-     * @param openid
-     * @return
-     */
-    @Override
-    public List<UseIntegral> getUseIntegral(String openid) {
-        return useIntegralMapper.getUseIntegral(openid);
-    }
-    /**
-     * 总积分（使用）
-     * @param openid
-     * @return
-     */
-    @Override
-    public int allUseIntegral(String openid) {
-        return useIntegralMapper.allUseIntegral(openid);
-    }
-}

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

@@ -1,5 +1,6 @@
 package com.iamberry.wechat.service.mapper;
 
+import com.iamberry.wechat.core.entity.integral.IntegralConfig;
 import com.iamberry.wechat.core.entity.integral.UseIntegral;
 
 import java.util.List;
@@ -18,4 +19,11 @@ public interface UseIntegralMapper {
      * @return
      */
     int allUseIntegral(String openid);
+
+    /**
+     * 查询积分来源信息
+     * @param integralConfig
+     * @return
+     */
+    List<IntegralConfig> listIntegralConfig(IntegralConfig integralConfig);
 }

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

@@ -26,4 +26,17 @@
         WHERE user_openid=#{userOpenid}
     </select>
 
+    <!-- 查询积分来源信息 -->
+    <select id="listIntegralConfig" parameterType="IntegralConfig" resultType="IntegralConfig">
+        SELECT
+          *
+        FROM
+          tb_iamberry_integral_config
+        <where>
+          <if test="integralConfigId != null and integralConfigId != ''">
+              integral_config_id = #{integralConfigId}
+          </if>
+        </where>
+    </select>
+
 </mapper>