添加了查询积分的方法

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/integral/UseIntegral.java

@@ -0,0 +1,115 @@
+package com.iamberry.wechat.core.entity.integral;
+
+import javax.xml.crypto.Data;
+import java.io.Serializable;
+
+/**
+ * 积分使用实体类
+ */
+public class UseIntegral implements Serializable {
+
+    private static final long serialVersionUID = 8060941187906868547L;
+    private Integer useIntegralId;          //ID
+    private String userOpenId;              //用户openid
+    private Integer useType;                //积分类型
+    private Integer useIntegralType;        //使用积分类型
+    private Integer useIntegralNumber;      //使用积分数量
+    private Integer useConfigId;             //积分来源类型
+    private String useIntegralRemarks;      //备注
+    private Data useIntegralCreateTime;     //创建时间
+
+    public UseIntegral() {
+    }
+
+    public UseIntegral(Integer useIntegralId, String userOpenId,
+                       Integer useType, Integer useIntegralType,
+                       Integer useIntegralNumber, Integer useConfigId,
+                       String useIntegralRemarks, Data useIntegralCreateTime) {
+        this.useIntegralId = useIntegralId;
+        this.userOpenId = userOpenId;
+        this.useType = useType;
+        this.useIntegralType = useIntegralType;
+        this.useIntegralNumber = useIntegralNumber;
+        this.useConfigId = useConfigId;
+        this.useIntegralRemarks = useIntegralRemarks;
+        this.useIntegralCreateTime = useIntegralCreateTime;
+    }
+
+    public Integer getUseIntegralId() {
+        return useIntegralId;
+    }
+
+    public void setUseIntegralId(Integer useIntegralId) {
+        this.useIntegralId = useIntegralId;
+    }
+
+    public String getUserOpenId() {
+        return userOpenId;
+    }
+
+    public void setUserOpenId(String userOpenId) {
+        this.userOpenId = userOpenId;
+    }
+
+    public Integer getUseType() {
+        return useType;
+    }
+
+    public void setUseType(Integer useType) {
+        this.useType = useType;
+    }
+
+    public Integer getUseIntegralType() {
+        return useIntegralType;
+    }
+
+    public void setUseIntegralType(Integer useIntegralType) {
+        this.useIntegralType = useIntegralType;
+    }
+
+    public Integer getUseIntegralNumber() {
+        return useIntegralNumber;
+    }
+
+    public void setUseIntegralNumber(Integer useIntegralNumber) {
+        this.useIntegralNumber = useIntegralNumber;
+    }
+
+    public Integer getUseConfigId() {
+        return useConfigId;
+    }
+
+    public void setUseConfigId(Integer useConfigId) {
+        this.useConfigId = useConfigId;
+    }
+
+    public String getUseIntegralRemarks() {
+        return useIntegralRemarks;
+    }
+
+    public void setUseIntegralRemarks(String useIntegralRemarks) {
+        this.useIntegralRemarks = useIntegralRemarks;
+    }
+
+    public Data getUseIntegralCreateTime() {
+        return useIntegralCreateTime;
+    }
+
+    public void setUseIntegralCreateTime(Data useIntegralCreateTime) {
+        this.useIntegralCreateTime = useIntegralCreateTime;
+    }
+
+    @Override
+    public String toString() {
+        return "UseIntegral{" +
+                "useIntegralId=" + useIntegralId +
+                ", userOpenId='" + userOpenId + '\'' +
+                ", useType=" + useType +
+                ", useIntegralType=" + useIntegralType +
+                ", useIntegralNumber=" + useIntegralNumber +
+                ", useConfigid=" + useConfigId +
+                ", useIntegralRemarks='" + useIntegralRemarks + '\'' +
+                ", useIntegralCreateTime=" + useIntegralCreateTime +
+                '}';
+    }
+}

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

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

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/member/MemberService.java

@@ -137,4 +137,9 @@ public interface MemberService{
 	 */
 	List<Member> getOrdinary(Member member);
 
+	/**
+	 * 获取我的会员信息
+	 * @return
+	 */
+	Member getMyMemberInfo(String openId);
 }

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

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

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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,32 @@
+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/MemberMapper.java

@@ -123,4 +123,9 @@ public interface MemberMapper {
 	List<Member>  getOrdinary(Member member);
 
 
+	/**
+	 * 获取我的会员信息
+	 * @return
+	 */
+	Member getMyMemberInfo(String userOpenid);
 }

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

@@ -0,0 +1,21 @@
+package com.iamberry.wechat.service.mapper;
+
+import com.iamberry.wechat.core.entity.integral.UseIntegral;
+
+import java.util.List;
+
+public interface UseIntegralMapper {
+    /**
+     * 积分使用日志
+     * @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/mapper/agentMemberMapper.xml

@@ -23,7 +23,7 @@ PUBLIC
 		WHERE sales_openid=#{id} 
 		GROUP BY sales_status 
 	</select>
-	
+
 	<!-- 根据 openid查询 通过审核的 微代理申请 -->
 	<select id="getAgentMemberInfo" parameterType="String" resultType="AgentMemberDto">
 		SELECT 

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

@@ -37,6 +37,16 @@
 		user_email userEmail,
 		user_qrcode_type userQrcodeType
 	</sql>
+
+	<!-- 获取个人会员信息-->
+	<select id="getMyMemberInfo"  parameterType="String" resultType="Member" >
+		SELECT user_name,
+		user_sex,
+		user_tel,
+		user_birth_date
+		FROM 	TB_IAMBERRY_USER_USERINFO
+		WHERE user_openid = #{userOpenid}
+	</select>
 	<!-- 匹配查询会员信息 -->
 	<select id="getMemberByFuzzy" parameterType="Member" resultType="Member">
 		select 

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.iamberry.wechat.service.mapper.UseIntegralMapper">
+    <sql id="AllField">
+        use_integral_id useIntegralId,
+        user_openid userOpenId,
+        use_integral_type useIntegralType,
+        use_integral_number useIntegralNumber,
+        use_type useType,
+        use_config_id useConfigId,
+        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
+        FROM tb_iamberry_use_integral
+        WHERE user_openid=#{userOpenid}
+        ORDER BY use_integral_id DESC
+    </select>
+    <!--总使用积分-->
+    <select id="allUseIntegral" parameterType="String" resultType="int">
+        SELECT avg(use_integral_number)
+        FROM tb_iamberry_use_integral
+        WHERE user_openid=#{userOpenid}
+    </select>
+
+</mapper>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/member/MemberServiceImpl.java

@@ -13,6 +13,7 @@ import com.iamberry.wechat.service.relationship.Dao.WdRelationDao;
 import com.iamberry.wechat.service.system.dao.SystemDao;
 import com.iamberry.wechat.tools.StaticInfo;
 import org.apache.commons.lang.StringUtils;
+import org.omg.CORBA.PUBLIC_MEMBER;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -318,4 +319,13 @@ public class MemberServiceImpl implements MemberService {
 	public List<Member> getOrdinary(Member member){
 		return memberDao.getOrdinary(member);
 	}
+
+	/**
+	 * 获取我的会员信息
+	 * @return
+	 */
+	public Member getMyMemberInfo(String openId){
+		Member member=memberDao.getMyMemberInfo(openId);
+		return member;
+	}
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/member/dao/MemberDao.java

@@ -115,5 +115,9 @@ public interface MemberDao {
 	 */
 	List<Member>  getOrdinary(Member member);
 
-
+	/**
+	 * 获取我的会员信息
+	 * @return
+	 */
+	Member getMyMemberInfo(String openId);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/member/dao/imp/MemberDaoImpl.java

@@ -135,4 +135,12 @@ public class MemberDaoImpl  implements MemberDao {
 	public List<Member>  getOrdinary(Member member){
 		return memberMapper.getOrdinary(member);
 	}
+
+	/**
+	 * 获取我的会员信息
+	 * @return
+			 */
+	public Member getMyMemberInfo(String openId){
+		return memberMapper.getMyMemberInfo(openId);
+	}
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/agent/AgentHandler.java

@@ -164,5 +164,25 @@ public class AgentHandler {
 		rm.setData(member);
 		return rm;
 	}
-	
+
+	/**
+	 * 获取我的会员信息
+	 * @param req
+	 * @param openId
+	 * @return
+	 */
+	@RequestMapping("/getMyMemberInfo")
+	@ResponseBody
+	public ResultMsg getMyMemberInfo(HttpServletRequest req,
+						 @RequestParam(value="openId",defaultValue= "", required=false)String openId){
+		ResultMsg rm = new ResultMsg();
+		Member member = WechatUtils.getUserBySession(req);
+		member = memberService.getMyMemberInfo(member.getUserOpenid());
+
+		rm.setStatus(true);
+		rm.setResultCode(ResultInfo.SUCCESSCODE);
+		rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+		rm.setData(member);
+		return rm;
+	}
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/integral/UseIntegralHandler.java

@@ -0,0 +1,76 @@
+package com.iamberry.wechat.handles.integral;
+
+
+import com.auth0.jwt.internal.com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+import com.iamberry.wechat.core.entity.ResultMsg;
+import com.iamberry.wechat.core.entity.WechatUtils;
+import com.iamberry.wechat.core.entity.integral.UseIntegral;
+import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.face.integral.UseIntegralService;
+import com.iamberry.wechat.tools.NameUtils;
+import com.iamberry.wechat.tools.ResultInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.jws.soap.SOAPBinding;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 会员积分使用 Controller
+ */
+@Controller
+@RequestMapping("/wechat/userIntegral")
+public class UseIntegralHandler {
+
+    @Autowired
+    private UseIntegralService useIntegralService;
+
+    /**
+     * 积分使用日志
+     * @param req
+     * @param openid
+     * @return
+     */
+    @RequestMapping("/getUseIntegral")
+    @ResponseBody
+    public ResultMsg getUseIntegral(HttpServletRequest req,
+                                    @RequestParam(value = "openid",required=false)String openid){
+        ResultMsg rm=new ResultMsg();
+        Member m= WechatUtils.getUserBySession(req);
+        List<UseIntegral> list=useIntegralService.getUseIntegral(m.getUserOpenid());
+        System.out.println(list);
+        rm.setStatus(true);
+        rm.setResultCode(ResultInfo.SUCCESSCODE);
+        rm.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+        rm.setData(list);
+        return rm;
+    }
+
+    /**
+     * 总使用的积分
+     * @param req
+     * @param openid
+     * @return
+     */
+    @RequestMapping("/getAllUseIntegral")
+    @ResponseBody
+    public ResultMsg getAllUseIntegral(HttpServletRequest req,
+                                       @RequestParam(value = "openid",required = false)String openid){
+        ResultMsg rm=new ResultMsg();
+        Member m=WechatUtils.getUserBySession(req);
+        int allUseIntegral=useIntegralService.allUseIntegral(m.getUserOpenid());
+
+        rm.setStatus(true);
+        rm.setResultCode(ResultInfo.SUCCESSCODE);
+        rm.setMessage(NameUtils.getConfig("SUCCSSINFO"));
+        rm.setData(allUseIntegral);
+        return rm;
+    }
+
+
+
+}

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/wx/QrCodeHandler.java

@@ -13,7 +13,7 @@ import java.io.IOException;
 /**
  * Created by Administrator on 2017/12/29.
  */
-@Controller
+@Controller("scanning")
 @RequestMapping("/wechat")
 public class QrCodeHandler {
 

tooth-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -234,6 +234,9 @@
 
 		<!-- 机器 -->
 		<typeAlias type="com.iamberry.wechat.core.entity.apparatus.Apparatus" alias="Apparatus"/>
+		<!--积分-->
+
+		<typeAlias type="com.iamberry.wechat.core.entity.integral.UseIntegral" alias="UseIntegral"/>
 
 		<package name="com.iamberry.wechat.core.entity.rent"/>
 	</typeAliases>
@@ -321,5 +324,7 @@
 		<mapper resource="com/iamberry/wechat/service/mapper/machineNumberMapper.xml"/>
 		<!-- 机器 -->
 		<mapper resource="com/iamberry/wechat/service/mapper/apparatusMapper.xml"/>
+		<!--积分-->
+		<mapper resource="com/iamberry/wechat/service/mapper/useIntegralMapper.xml"/>
 	</mappers>
 </configuration>