个人中心

src/main/java/com/caimei/controller/user/LoginController.java

@@ -83,7 +83,7 @@ public class LoginController {
         if (operationUser == null) {
             return res.error("-1", "游客,请登录");
         }
-        return res.error("1", "登录成功");
+        return res.success("1", operationUser);
     }
 
     /**
@@ -166,6 +166,6 @@ public class LoginController {
         }
         operationUser.setOpenid(openid);
         loginService.update(operationUser);
-        return res.error("1", "注册并登录成功");
+        return res.success("1", operationUser);
     }
 }

src/main/java/com/caimei/controller/user/PersonalController.java

@@ -1,9 +1,16 @@
 package com.caimei.controller.user;
 
+import com.caimei.entity.Club;
+import com.caimei.entity.CmOperationUser;
+import com.caimei.entity.CmUserBalanceRecord;
+import com.caimei.entity.WxJsonModel;
 import com.caimei.service.user.PersonalService;
 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.ResponseBody;
+
+import java.util.List;
 
 /**
  * 个人中心
@@ -14,4 +21,40 @@ public class PersonalController {
     @Autowired
     private PersonalService personalService;
 
+    /**
+     * 我的个人显示数据
+     *
+     * @param operationUser
+     * @return
+     */
+    @RequestMapping("/myCentre")
+    @ResponseBody
+    public WxJsonModel myCentre(CmOperationUser operationUser) {
+        WxJsonModel res = WxJsonModel.newInstance();
+        Club club = personalService.myCentre(operationUser);
+        return res.success("1", club);
+    }
+
+    /**
+     * 账户余额明细
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/touchBalance")
+    public List<CmUserBalanceRecord> touchBalance(int year, int month, CmUserBalanceRecord balanceRecord) {
+        List<CmUserBalanceRecord> list = personalService.touchBalance(year, month, balanceRecord);
+        return list;
+    }
+
+    /**
+     * 收货地址管理
+     */
+    @ResponseBody
+    @RequestMapping("/address")
+    public void address() {
+
+
+    }
+
 }

src/main/java/com/caimei/entity/Club.java

@@ -0,0 +1,78 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+
+public class Club implements Serializable {
+    private Integer clubID;
+    private Integer userID;
+    private Integer clubTypeID;//会所类型
+    private String name;//会所名称
+    private String headpic; //门头照
+    private Double ableUserMoney; //账户实际可用余额
+    private String contactNumber;   //联系我们
+    private String introduction;    //关于我们
+
+    public Integer getClubID() {
+        return clubID;
+    }
+
+    public void setClubID(Integer clubID) {
+        this.clubID = clubID;
+    }
+
+    public Integer getUserID() {
+        return userID;
+    }
+
+    public void setUserID(Integer userID) {
+        this.userID = userID;
+    }
+
+    public Integer getClubTypeID() {
+        return clubTypeID;
+    }
+
+    public void setClubTypeID(Integer clubTypeID) {
+        this.clubTypeID = clubTypeID;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getHeadpic() {
+        return headpic;
+    }
+
+    public void setHeadpic(String headpic) {
+        this.headpic = headpic;
+    }
+
+    public Double getAbleUserMoney() {
+        return ableUserMoney;
+    }
+
+    public void setAbleUserMoney(Double ableUserMoney) {
+        this.ableUserMoney = ableUserMoney;
+    }
+
+    public String getContactNumber() {
+        return contactNumber;
+    }
+
+    public void setContactNumber(String contactNumber) {
+        this.contactNumber = contactNumber;
+    }
+
+    public String getIntroduction() {
+        return introduction;
+    }
+
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
+}

src/main/java/com/caimei/entity/CmUserBalanceRecord.java

@@ -0,0 +1,142 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CmUserBalanceRecord implements Serializable {
+    private Integer userId;        // 用户ID
+    private Integer userOrganizeID;  //组织id
+    private String type;        // 收支类型：1收入，2支出
+    private String balanceType;        // '余额类型：1余额抵扣，2多收退款到余额，3申请退款,4余额充值，5余额提现',
+    private Date addDate;        // 添加时间
+    private String amount;        // 金额
+    private Integer orderId;        // 主订单ID（适用余额类型1,3[类型为3多次退款存在相同记录ID则需通过退款ID唯一区分]）
+    private Integer receiptId;        // 收款ID（适用余额类型2）
+    private Integer returnedId;        // 退货退款ID（适用余额类型3）
+    private Integer withdrawalsId;        // 用户提现ID
+    private String remark;        // 备注
+    private String userName; //用户名称
+    private String ableUserMoney;//用户可用余额
+    private String startTime;   //开始时间
+    private String endTime;     //结束时间
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getUserOrganizeID() {
+        return userOrganizeID;
+    }
+
+    public void setUserOrganizeID(Integer userOrganizeID) {
+        this.userOrganizeID = userOrganizeID;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getBalanceType() {
+        return balanceType;
+    }
+
+    public void setBalanceType(String balanceType) {
+        this.balanceType = balanceType;
+    }
+
+    public Date getAddDate() {
+        return addDate;
+    }
+
+    public void setAddDate(Date addDate) {
+        this.addDate = addDate;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getReceiptId() {
+        return receiptId;
+    }
+
+    public void setReceiptId(Integer receiptId) {
+        this.receiptId = receiptId;
+    }
+
+    public Integer getReturnedId() {
+        return returnedId;
+    }
+
+    public void setReturnedId(Integer returnedId) {
+        this.returnedId = returnedId;
+    }
+
+    public Integer getWithdrawalsId() {
+        return withdrawalsId;
+    }
+
+    public void setWithdrawalsId(Integer withdrawalsId) {
+        this.withdrawalsId = withdrawalsId;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getAbleUserMoney() {
+        return ableUserMoney;
+    }
+
+    public void setAbleUserMoney(String ableUserMoney) {
+        this.ableUserMoney = ableUserMoney;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+}

src/main/java/com/caimei/mapper/user/PersonalMapper.java

@@ -1,8 +1,16 @@
 package com.caimei.mapper.user;
 
+import com.caimei.entity.Club;
+import com.caimei.entity.CmOperationUser;
+import com.caimei.entity.CmUserBalanceRecord;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface PersonalMapper {
 
+    Club myCentre(CmOperationUser operationUser);
+
+    List<CmUserBalanceRecord> touchBalance(CmUserBalanceRecord balanceRecord);
 }

src/main/java/com/caimei/service/user/PersonalService.java

@@ -1,4 +1,13 @@
 package com.caimei.service.user;
 
+import com.caimei.entity.Club;
+import com.caimei.entity.CmOperationUser;
+import com.caimei.entity.CmUserBalanceRecord;
+
+import java.util.List;
+
 public interface PersonalService {
+    Club myCentre(CmOperationUser operationUser);
+
+    List<CmUserBalanceRecord> touchBalance(int year, int month, CmUserBalanceRecord balanceRecord);
 }

src/main/java/com/caimei/service/user/impl/PersonalServiceImpl.java

@@ -1,13 +1,40 @@
 package com.caimei.service.user.impl;
 
+import com.caimei.entity.Club;
+import com.caimei.entity.CmOperationUser;
+import com.caimei.entity.CmUserBalanceRecord;
 import com.caimei.mapper.user.PersonalMapper;
 import com.caimei.service.user.PersonalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.List;
+
 @Service
 public class PersonalServiceImpl implements PersonalService {
     @Autowired
     private PersonalMapper personalMapper;
 
+    @Override
+    public Club myCentre(CmOperationUser operationUser) {
+        return personalMapper.myCentre(operationUser);
+    }
+
+    @Override
+    public List<CmUserBalanceRecord> touchBalance(int year, int month, CmUserBalanceRecord balanceRecord) {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.YEAR, year);
+        calendar.set(Calendar.MONTH, month - 1);
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getMinimum(Calendar.DATE));
+        String startTime = format.format(calendar.getTime()) + " 00:00:00";
+        balanceRecord.setStartTime(startTime);
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DATE));
+        String endTime = format.format(calendar.getTime()) + " 23:59:59";
+        balanceRecord.setEndTime(endTime);
+        List<CmUserBalanceRecord> list = personalMapper.touchBalance(balanceRecord);
+        return list;
+    }
 }

src/main/resources/mapper/LoginMapper.xml

@@ -8,7 +8,7 @@
           cou.*
         FROM
           cm_operation_user cou
-          LEFT JOIN USER u ON u.clubID = cou.clubID
+          LEFT JOIN USER u ON u.userID = cou.userID
         WHERE
           cou.openid = #{openid}
           AND cou.userOrganizeID = #{userOrganizeID}
@@ -38,6 +38,7 @@
           status = #{status}
         WHERE
           invitationCode = #{invitationCode}
+          AND userOrganizeID = #{userOrganizeID}
           AND delFlag = '0'
     </update>
 
@@ -52,14 +53,15 @@
           delFlag = #{delFlag}
         WHERE
           openid = #{openid}
+          AND userOrganizeID = #{userOrganizeID}
     </update>
 
-    <select id="query" parameterType="com.caimei.entity.CmOperationUser">
+    <select id="query" parameterType="com.caimei.entity.CmOperationUser" resultType="com.caimei.entity.CmOperationUser">
         SELECT
           cou.*
         FROM
           cm_operation_user cou
-          LEFT JOIN USER u ON u.clubID = cou.clubID
+          LEFT JOIN USER u ON u.userID = cou.userID
         WHERE
           cou.openid = #{openid}
           AND cou.userOrganizeID = #{userOrganizeID}

src/main/resources/mapper/PersonalMapper.xml

@@ -0,0 +1,45 @@
+<?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.caimei.mapper.user.PersonalMapper">
+    <select id="myCentre" parameterType="com.caimei.entity.CmOperationUser" resultType="com.caimei.entity.Club">
+        SELECT
+          c.name,
+          c.userID,
+          c.clubID,
+          c.headpic,
+          u.ableUserMoney,
+          cuo.contactNumber,
+          cuo.introduction
+        FROM
+          cm_operation_user cou
+          LEFT JOIN USER u ON u.userID = cou.userID
+          LEFT JOIN club c ON u.clubID = c.clubID
+          LEFT JOIN cm_user_organize cuo ON cuo.id=cou.userOrganizeID
+        WHERE
+          cou.openid = #{openid}
+          AND cou.userOrganizeID = #{userOrganizeID}
+          AND cou.delFlag = '0'
+    </select>
+
+    <select id="touchBalance" resultType="com.caimei.entity.CmUserBalanceRecord">
+        SELECT
+        cubr.*,
+        u.ableUserMoney
+        FROM
+        cm_user_balance_record cubr
+        LEFT JOIN USER u ON cubr.userId = u.userID
+        <where>
+            <if test="balanceType != null and balanceType != ''">
+                AND cubr.balanceType = #{balanceType}
+            </if>
+            AND cubr.addDate <![CDATA[ >= ]]> #{startTime}
+            AND cubr.addDate <![CDATA[ <= ]]> #{endTime}
+            AND cubr.userId = #{userId}
+            AND cubr.delFlag = '0'
+        </where>
+        ORDER BY cubr.addDate DESC
+    </select>
+
+</mapper>

src/main/resources/mapper/PersonalService.xml

@@ -1,7 +0,0 @@
-<?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.caimei.mapper.user.PersonalMapper">
-
-</mapper>