bug fixes

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 个人中心
@@ -42,13 +43,9 @@ public class PersonalController {
      */
     @ResponseBody
     @RequestMapping("/touchBalance")
-    public Page<CmUserBalanceRecord> touchBalance(int year, int month, Integer index, Integer pageSize, CmUserBalanceRecord balanceRecord) {
-        if (index == null) index = 1;
-        if (pageSize == null) pageSize = 10;
-        PageHelper.startPage(index, pageSize);
-        List<CmUserBalanceRecord> list = personalService.touchBalance(year, month, balanceRecord);
-        Page<CmUserBalanceRecord> page = new Page<>(list);
-        return page;
+    public Map<String, Object> touchBalance(int year, int month, Integer index, Integer pageSize, CmUserBalanceRecord balanceRecord) {
+        Map<String, Object> map = personalService.touchBalance(index, pageSize, year, month, balanceRecord);
+        return map;
     }
 
     /**

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

@@ -1,5 +1,8 @@
 package com.caimei.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -8,6 +11,8 @@ public class CmUserBalanceRecord implements Serializable {
     private Integer userOrganizeID;  //组织id
     private String type;        // 收支类型：1收入，2支出
     private String balanceType;        // '余额类型：1余额抵扣，2多收退款到余额，3申请退款,4余额充值，5余额提现',
+    @DateTimeFormat(pattern = "yyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date addDate;        // 添加时间
     private String amount;        // 金额
     private Integer orderId;        // 主订单ID（适用余额类型1,3[类型为3多次退款存在相同记录ID则需通过退款ID唯一区分]）

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

@@ -29,4 +29,6 @@ public interface PersonalMapper {
     void deleteAddress(Integer addressID);
 
     Address findDefaultAddress(Integer userID);
+
+    Integer ableUserMoney(Integer userId);
 }

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

@@ -3,11 +3,12 @@ package com.caimei.service.user;
 import com.caimei.entity.*;
 
 import java.util.List;
+import java.util.Map;
 
 public interface PersonalService {
     Club myCentre(CmOperationUser operationUser);
 
-    List<CmUserBalanceRecord> touchBalance(int year, int month, CmUserBalanceRecord balanceRecord);
+    Map<String, Object> touchBalance(Integer index, Integer pageSize, int year, int month, CmUserBalanceRecord balanceRecord);
 
     List<Province> address();
 

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

@@ -3,12 +3,15 @@ package com.caimei.service.user.impl;
 import com.caimei.entity.*;
 import com.caimei.mapper.user.PersonalMapper;
 import com.caimei.service.user.PersonalService;
+import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class PersonalServiceImpl implements PersonalService {
@@ -21,7 +24,7 @@ public class PersonalServiceImpl implements PersonalService {
     }
 
     @Override
-    public List<CmUserBalanceRecord> touchBalance(int year, int month, CmUserBalanceRecord balanceRecord) {
+    public Map<String, Object> touchBalance(Integer index, Integer pageSize, int year, int month, CmUserBalanceRecord balanceRecord) {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.YEAR, year);
@@ -32,8 +35,16 @@ public class PersonalServiceImpl implements PersonalService {
         calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DATE));
         String endTime = format.format(calendar.getTime()) + " 23:59:59";
         balanceRecord.setEndTime(endTime);
+        if (index == null) index = 1;
+        if (pageSize == null) pageSize = 10;
+        PageHelper.startPage(index, pageSize);
         List<CmUserBalanceRecord> list = personalMapper.touchBalance(balanceRecord);
-        return list;
+        Page<CmUserBalanceRecord> page = new Page<>(list);
+        Integer ableUserMoney = personalMapper.ableUserMoney(balanceRecord.getUserId());
+        Map<String, Object> map = new HashMap();
+        map.put("page", page);
+        map.put("ableUserMoney", ableUserMoney);
+        return map;
     }
 
     @Override

src/main/resources/mapper/PersonalMapper.xml

@@ -25,11 +25,9 @@
 
     <select id="touchBalance" resultType="com.caimei.entity.CmUserBalanceRecord">
         SELECT
-        cubr.*,
-        u.ableUserMoney
+        cubr.*
         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}
@@ -42,6 +40,10 @@
         ORDER BY cubr.addDate DESC
     </select>
 
+    <select id="ableUserMoney" resultType="int">
+        SELECT ableUserMoney FROM USER WHERE userID = #{userID}
+    </select>
+
     <select id="findAllProvince" resultType="com.caimei.entity.Province">
         SELECT * FROM province WHERE validFlag = '1'
     </select>