bug fixes

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

@@ -97,12 +97,18 @@ public class LoginController {
      *
      * @param invitationCode 邀请码
      * @param userOrganizeID 组织id
-     * @return
+     * @return 0:        请输入邀请码
+     * -2:       邀请码已失效
+     * -3:       邀请码已被使用
      */
     @RequestMapping("/isEnabled")
     @ResponseBody
     public WxJsonModel isEnabled(String invitationCode, Integer userOrganizeID) {
         WxJsonModel res = WxJsonModel.newInstance();
+        String mobile = loginService.cellPhone(userOrganizeID);
+        if (invitationCode == null || invitationCode.equals("")) {
+            return res.error("0", mobile);
+        }
         CmOperationUser operationUser = loginService.isEnabled(invitationCode, userOrganizeID);
         if (operationUser == null) {
             return res.error("-1", "邀请码错误");
@@ -112,10 +118,10 @@ public class LoginController {
         calendar.setTime(operationUser.getInvitationCodeTime());
         calendar.add(Calendar.DATE, 2);
         if (operationUser.getStatus().equals("1") && date.getTime() > calendar.getTime().getTime() && operationUser.getDelFlag().equals("0")) {
-            return res.error("-2", "邀请码已失效");
+            return res.error("-2", mobile);
         }
         if (operationUser.getStatus().equals("2") && operationUser.getDelFlag().equals("0")) {
-            return res.error("-3", "邀请码已被使用");
+            return res.error("-3", mobile);
         }
         if (!operationUser.getDelFlag().equals("0")) {
             return res.error("-1", "您的账号已下线");

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

@@ -16,4 +16,6 @@ public interface LoginMapper {
     CmOperationUser query(CmOperationUser operationUser);
 
     void updateOperationUser(CmOperationUser user);
+
+    String cellPhone(Integer userOrganizeID);
 }

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

@@ -9,4 +9,6 @@ public interface LoginService {
     CmOperationUser isEnabled(String invitationCode, Integer userOrganizeID);
 
     void update(CmOperationUser operationUser);
+
+    String cellPhone(Integer userOrganizeID);
 }

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

@@ -42,4 +42,9 @@ public class LoginServiceImpl implements LoginService {
         operationUser.setUpdateTime(new Date());
         loginMapper.update(operationUser);
     }
+
+    @Override
+    public String cellPhone(Integer userOrganizeID) {
+        return loginMapper.cellPhone(userOrganizeID);
+    }
 }

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

@@ -41,6 +41,7 @@ public class PersonalServiceImpl implements PersonalService {
         List<CmUserBalanceRecord> list = personalMapper.touchBalance(balanceRecord);
         Page<CmUserBalanceRecord> page = new Page<>(list);
         Integer ableUserMoney = personalMapper.ableUserMoney(balanceRecord.getUserId());
+        if (ableUserMoney == null) ableUserMoney = 0;
         Map<String, Object> map = new HashMap();
         map.put("page", page);
         map.put("ableUserMoney", ableUserMoney);

src/main/resources/mapper/LoginMapper.xml

@@ -68,4 +68,14 @@
           AND cou.delFlag = '0'
           AND u.clubStatus = '91'
     </select>
+
+    <select id="cellPhone" resultType="string">
+        SELECT
+          contactNumber
+        FROM
+          cm_user_organize
+        WHERE
+          id = #{userOrganizeID}
+          AND delFlag = '0'
+    </select>
 </mapper>