修改积分接口

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/member/MemberIntegral.java

@@ -1,94 +0,0 @@
-package com.iamberry.wechat.core.entity.member;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 会员积分表
- * Created by liuzhiwei on 2017/12/29.
- */
-public class MemberIntegral implements Serializable {
-
-    private static final long serialVersionUID = -2581070161725499643L;
-    private Integer memberId;               //会员ID
-    private Integer rankRuleId;             //等级ID
-    private String userOpenid;              //用户openId
-    private Integer memberStatus;           //状态
-    private Integer memberAllIntegral;      //总积分
-    private Integer memberSurplusIntegral;  //剩余积分
-    private Integer memberUsedIntegral;     //已用积分
-    private Date memberCreateTime;          //创建时间
-    private Date memberUpdateTime;          //更新时间
-
-    public Integer getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Integer memberId) {
-        this.memberId = memberId;
-    }
-
-    public Integer getRankRuleId() {
-        return rankRuleId;
-    }
-
-    public void setRankRuleId(Integer rankRuleId) {
-        this.rankRuleId = rankRuleId;
-    }
-
-    public String getUserOpenid() {
-        return userOpenid;
-    }
-
-    public void setUserOpenid(String userOpenid) {
-        this.userOpenid = userOpenid;
-    }
-
-    public Integer getMemberStatus() {
-        return memberStatus;
-    }
-
-    public void setMemberStatus(Integer memberStatus) {
-        this.memberStatus = memberStatus;
-    }
-
-    public Integer getMemberAllIntegral() {
-        return memberAllIntegral;
-    }
-
-    public void setMemberAllIntegral(Integer memberAllIntegral) {
-        this.memberAllIntegral = memberAllIntegral;
-    }
-
-    public Integer getMemberSurplusIntegral() {
-        return memberSurplusIntegral;
-    }
-
-    public void setMemberSurplusIntegral(Integer memberSurplusIntegral) {
-        this.memberSurplusIntegral = memberSurplusIntegral;
-    }
-
-    public Integer getMemberUsedIntegral() {
-        return memberUsedIntegral;
-    }
-
-    public void setMemberUsedIntegral(Integer memberUsedIntegral) {
-        this.memberUsedIntegral = memberUsedIntegral;
-    }
-
-    public Date getMemberCreateTime() {
-        return memberCreateTime;
-    }
-
-    public void setMemberCreateTime(Date memberCreateTime) {
-        this.memberCreateTime = memberCreateTime;
-    }
-
-    public Date getMemberUpdateTime() {
-        return memberUpdateTime;
-    }
-
-    public void setMemberUpdateTime(Date memberUpdateTime) {
-        this.memberUpdateTime = memberUpdateTime;
-    }
-}

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,14 @@
 package com.iamberry.wechat.service.integral;
 
+import com.iamberry.wechat.core.entity.PageBean;
+import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.integral.IntegralConfig;
+import com.iamberry.wechat.core.entity.integral.MemberIntegral;
 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 com.iamberry.wechat.tools.NameUtils;
+import com.iamberry.wechat.tools.ResultInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -10,24 +16,50 @@ import java.util.List;
 @Service
 public class UseIntegralServiceImpl implements UseIntegralService {
     @Autowired
-    private UseIntegralDao useIntegralDao;
+    private UseIntegralMapper useIntegralMapper;
 
     /**
-     * 积分使用日志
-     * @param openid
+     * 获取会员信息.会员等级名称
+     * @param openId
      * @return
      */
     @Override
-    public List<UseIntegral> getUseIntegral(String openid) {
-        return useIntegralDao.getUseIntegral(openid);
+    public MemberIntegral getMemberInfoAndRankName(String openId) {
+        return useIntegralMapper.getMemberInfoAndRankName(openId);
     }
+
     /**
-     * 总积分（使用）
+     * 获得的总积分数
+     * @param userOpenId
+     * @return
+     */
+    @Override
+    public int getGainIntegralCount(String userOpenId) {
+        return useIntegralMapper.getGainIntegralCount(userOpenId);
+    }
+
+    /**
+     * 使用的总积分数
      * @param openid
      * @return
      */
     @Override
-    public int allUseIntegral(String openid) {
-        return useIntegralDao.allUseIntegral(openid);
+    public int getUseIntegralCount(String openid) {
+        return useIntegralMapper.getUseIntegralCount(openid);
+    }
+
+    /**
+     * 全部积分记录
+     * @param useIntegral
+     * @return
+     */
+    @Override
+    public List<UseIntegral> listIntegralInfo(UseIntegral useIntegral) {
+        return useIntegralMapper.listIntegralInfo(useIntegral);
+    }
+
+    @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 org.springframework.stereotype.Repository;
 
@@ -25,6 +26,14 @@ public interface UseIntegralMapper {
      * @param userOpenId
      * @return
      */
+    int allUseIntegral(String openid);
+
+    /**
+     * 查询积分来源信息
+     * @param integralConfig
+     * @return
+     */
+    List<IntegralConfig> listIntegralConfig(IntegralConfig integralConfig);
     int allUseIntegral(String userOpenId);
 
     /**

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

@@ -44,4 +44,17 @@
         ORDER BY use_integral_id DESC
     </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>