提交 修复 缴费bug

CODE/foreign-service/src/main/java/com/community/huiju/common/base/ResponseBean.java

@@ -18,10 +18,9 @@ public class ResponseBean<T> implements Serializable {
     public ResponseBean() {
     }
 
-    public void addError(Integer code, String message, T data) {
+    public void addError(Integer code, String message) {
         this.code = code;
         this.message = message;
-        this.data = data;
     }
 
     public void addSuccess(String message) {

CODE/foreign-service/src/main/java/com/community/huiju/enums/ErroMessage.java

@@ -1,11 +0,0 @@
-package com.community.huiju.enums;
-
-/**
- * 错误消息定义
- * @author weiximei
- */
-public enum ErroMessage {
-
-
-
-}

CODE/foreign-service/src/main/java/com/community/huiju/enums/ResponseErrorsMessages.java

@@ -0,0 +1,50 @@
+package com.community.huiju.enums;
+
+/**
+ * 错误消息定义
+ * @author weiximei
+ */
+public enum ResponseErrorsMessages {
+
+    SYSTEM_ERRORS (500, "服务断网了！"),
+    NOT_PHONE(1000, "请输入正确的手机号！"),
+    NOT_USER_NAME(1001, "用户名不能为空！"),
+    ;
+
+
+    ResponseErrorsMessages(Integer code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+
+    private Integer code;
+
+    private String msg;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public String toString() {
+        return "ResponseErrorsMessages{" +
+                "code=" + code +
+                ", msg='" + msg + '\'' +
+                '}';
+    }
+
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/exception/ExceptionHandleAdice.java

@@ -1,7 +1,8 @@
 package com.community.huiju.exception;
 
 import com.community.commom.constant.Constant;
-import com.community.commom.mode.ResponseBean;
+import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.enums.ResponseErrorsMessages;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.MethodArgumentNotValidException;
@@ -25,15 +26,7 @@ public class ExceptionHandleAdice {
     public ResponseBean handleException(Exception e){
         log.error(e.getMessage(),e);
         ResponseBean response = new ResponseBean();
-        response.addError(Constant.REQUEST_ERROR,"系统异常,请稍后重试!");
-        return response;
-    }
-
-    @ExceptionHandler(RuntimeException.class)
-    public ResponseBean handleException(RuntimeException e){
-        log.error(e.getMessage(),e);
-        ResponseBean response = new ResponseBean();
-        response.addError(e.getMessage());
+        response.addError(ResponseErrorsMessages.SYSTEM_ERRORS.getCode(),ResponseErrorsMessages.SYSTEM_ERRORS.getMsg());
         return response;
     }
 
@@ -42,23 +35,7 @@ public class ExceptionHandleAdice {
     public ResponseBean handleException(WisdomException e) {
         log.error(e.getMessage(),e);
         ResponseBean response = new ResponseBean();
-        response.addError(e.getMessage());
-        return response;
-    }
-
-
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    public ResponseBean handlelllewgalParamException(MethodArgumentNotValidException e){
-        ResponseBean response = new ResponseBean();
-
-        List<ObjectError> errors  =e.getBindingResult().getAllErrors();
-        String message = "参数不合法";
-        if (errors.size() >0) {
-            message = errors.get(0).getDefaultMessage();
-        }
-
-        response.addError(message);
-
+        response.addError(e.getCode(),e.getMessage());
         return response;
     }
 

CODE/foreign-service/src/main/java/com/community/huiju/exception/WisdomException.java

@@ -1,16 +1,34 @@
 package com.community.huiju.exception;
 
 
+import lombok.Data;
+
 /**
  * @author weiximei
  */
+@Data
 public class WisdomException extends RuntimeException {
 
+    private String mes;
+
+    private Integer code;
 
     public WisdomException(String msg, Throwable t) {
         super(msg, t);
     }
 
+    public WisdomException(Integer code,String msg, Throwable t) {
+        super(msg, t);
+        this.mes = msg;
+        this.code = code;
+    }
+
+    public WisdomException(Integer code,String msg) {
+        super(msg);
+        this.mes = msg;
+        this.code = code;
+    }
+
     public WisdomException(String msg) {
         super(msg);
     }

CODE/foreign-service/src/main/java/com/community/huiju/service/ITaUserService.java

@@ -1,8 +1,14 @@
 package com.community.huiju.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.enums.ResponseErrorsMessages;
+import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.TaUser;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <p>
@@ -14,6 +20,20 @@ import com.community.huiju.model.TaUser;
  */
 public interface ITaUserService extends IService<TaUser> {
 
+    Logger log = LoggerFactory.getLogger(ITaUserService.class);
+
+    /**
+     * 检验手机号
+     * @param phone
+     */
+    default void checkPhone(String phone) {
+        log.info("{} 手机号校验结果: {}",phone, AccountValidatorUtil.isPhone(phone));
+        if (!AccountValidatorUtil.isPhone(phone)){
+            throw new WisdomException(ResponseErrorsMessages.NOT_PHONE.getCode(), ResponseErrorsMessages.NOT_PHONE.getMsg());
+        }
+    }
+
+
     /**
      * 添加用户
      * @param userName

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -21,6 +21,10 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
     @Override
     public ResponseBean addTaUser(String userName, String idCard, String gender, String phone) {
         ResponseBean responseBean = new ResponseBean();
+
+        // 校验手机号 -> 是否重复
+        checkPhone(phone);
+
         TaUser taUser = new TaUser();
         taUser.setUserName(userName);
         taUser.setIdCard(idCard);
@@ -30,7 +34,6 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         if (saveBool) {
             responseBean.addSuccess(taUser);
         }
-
         return responseBean;
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxPayServiceImpl.java

@@ -371,7 +371,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 				// 校验是否，超出缴费有效期时间
 				LocalDateTime expireDateLocalDateTime = LocalDateTime.ofInstant(taUserLicense.getExpireDate().toInstant(), ZoneId.systemDefault());
 				expireDateLocalDateTime.plusDays(taUserLicense.getRenewTime());
-				if (System.currentTimeMillis() > expireDateLocalDateTime.toEpochSecond(ZoneOffset.of("+8"))) {
+				if (taUserLicense.getRenewTime().intValue() > 0 && System.currentTimeMillis() > expireDateLocalDateTime.toEpochSecond(ZoneOffset.of("+8"))) {
 					throw new WisdomException("已超出续费时间，请找物业处理!");
 				}
 
@@ -497,6 +497,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 			}
 
 			e.setExpireDate(taUserLicense.getExpireDate());
+			e.setPaymentType(pay_type);
 
 			taUserLicenseOrderMapper.updateByPrimaryKeySelective(e);
 

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TaSysMenuController.java

@@ -63,7 +63,7 @@ public class TaSysMenuController extends BaseController {
 
 		// 判断是否启动了 8 个菜单
 		QueryWrapper<TaSysMenu> sysMenuQueryWrapper = new QueryWrapper<>();
-		sysMenuQueryWrapper.eq("status", "1");
+		sysMenuQueryWrapper.eq("status", "0");
 		sysMenuQueryWrapper.eq("community_id", userElement.getCommunityId());
 		int count = taSysMenuService.count(sysMenuQueryWrapper);
 		if (count >= 8) {

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/TaSysMenu.java

@@ -1,5 +1,6 @@
 package com.community.huiju.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -68,5 +69,10 @@ public class TaSysMenu implements Serializable {
      */
     private String explain;
 
+    /**
+     * 菜单图标
+     */
+    @TableField(exist = false)
+    private String imgUrl;
 
 }

CODE/smart-community/property-api/src/main/resources/mapper/TaSysMenuMapper.xml

@@ -4,20 +4,21 @@
 
     <select id="selectList" parameterType="integer" resultType="com.community.huiju.model.TaSysMenu" >
         SELECT
-            id,
-            community_id,
-            menu_name,
-            menu_url,
-            parent_id,
-            sort,
-            menu_type,
-            status,
-            remark,
-            `explain`
+            tas.id,
+            tas.community_id,
+            tas.menu_name,
+            tas.menu_url,
+            tas.parent_id,
+            tas.sort,
+            tas.menu_type,
+            tas.status,
+            tas.remark,
+            tas.`explain`,
+            (select menu_icon_img from ta_sys_menu_img where ta_menu_id = tas.id limit 0,1) imgUrl
         FROM
-            ta_sys_menu
+            ta_sys_menu tas
         WHERE
-            community_id = #{communityId}
+            tas.community_id = #{communityId}
     </select>
 
 </mapper>

VUECODE/smart-property-manage/src/views/systemResources/app/index.vue

@@ -39,7 +39,7 @@
             align="center"
             label="图标">
             <template slot-scope="scope">
-              <img :src="scope.row.menuUrl" width="50" height="50">
+              <img :src="scope.row.imgUrl" width="50" height="50">
             </template>
           </el-table-column>
           <el-table-column