合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -92,7 +92,7 @@ public class UserController extends BaseController {
     }
     @ApiOperation(value = "修改用户名和性别", notes = "修改用户名和性别")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户民和gender性别"),
+            @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName用户民和gender性别和idCard身份证"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
     })
@@ -137,7 +137,8 @@ public class UserController extends BaseController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName(租客或者家属 姓名) " +
                     "phone(租客或者家属 手机号) " +
                     "gender(租客或者家属 性别 1男 2女) " +
-                    "type(2租客 3家属)"),
+                    "type(2租客 3家属)" +
+                    "idCard(身份证号)"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
@@ -151,7 +152,7 @@ public class UserController extends BaseController {
         response = iTaUserService.addTenantsOrDependents(jsonObject.getString("userName"),
                 jsonObject.getString("phone"),jsonObject.getString("gender"),
                 userElement.getId(),
-                jsonObject.getInteger("type"));
+                jsonObject.getInteger("type"), jsonObject.getString("idCard"));
 
         return response;
 
@@ -163,7 +164,8 @@ public class UserController extends BaseController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id(租客或者家属 ID) userName(租客或者家属 姓名) " +
                     "phone(租客或者家属 手机号) " +
                     "gender(租客或者家属 性别 1男 2女) " +
-                    "type(2租客 3家属)"),
+                    "type(2租客 3家属)" +
+                    "idCard(身份证号)"),
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 app"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
@@ -178,7 +180,8 @@ public class UserController extends BaseController {
                 jsonObject.getString("phone"),jsonObject.getString("gender"),
                 userElement.getId(),
                 jsonObject.getInteger("type"),
-                jsonObject.getInteger("id"));
+                jsonObject.getInteger("id"),
+                jsonObject.getString("idCard"));
 
         return response;
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/VistorController.java

@@ -38,7 +38,7 @@ public class VistorController extends BaseController {
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
             @ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "parameter", value = "carLicense:车牌(数组),drivingStatus:0 是不开车 1是开车," +
-                    "visitorName:访问人姓名,visitorNum:访问人数,visitorTel:访问人电话,visitorStartTime:访问人开始时间,visitorEndTime:访问人结束时间")})
+                    "visitorName:访问人姓名,visitorNum:访问人数,visitorTel:访问人电话,visitorStartTime:访问人开始时间,visitorEndTime:访问人结束时间,payEntity:支付方式(owmer是由我承担  visitor是访客承担)")})
     public ResponseBean findVistorDetail(@PathVariable("communityId")Integer communityId, @RequestBody String parameter, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
 
@@ -68,8 +68,7 @@ public class VistorController extends BaseController {
 
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        List<TaVisitor> taVisitors = vistorServiceI.invateHis(communityId, userId);
-        responseBean.addSuccess(taVisitors);
+        responseBean = vistorServiceI.invateHis(communityId, userId);
         return  responseBean;
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaVisitorLicenseMapper.java

@@ -19,7 +19,7 @@ public interface TaVisitorLicenseMapper {
 
     int updateByPrimaryKey(TaVisitorLicense record);
 
-    void insertTaVistorLicense(TaVisitorLicense taVisitorLicense);
+    // void insertTaVistorLicense(TaVisitorLicense taVisitorLicense);
 
     List<String> findTaVistorLicenseById(Integer id);
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java

@@ -39,6 +39,9 @@ public class TaUser {
 
     private Date updateDate;
 
+    // 身份证
+    private String idCard;
+
     // 海康UserId
     private Integer hkUserId;
 
@@ -248,4 +251,12 @@ public class TaUser {
     public void setHkPersonNo(Long hkPersonNo) {
         this.hkPersonNo = hkPersonNo;
     }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpBillInvoice.java

@@ -37,6 +37,11 @@ public class TpBillInvoice {
     
     private String billName;
 
+    /**
+     * 缴费方式  0：微信支付  1：线下缴费
+     */
+    private String payType;
+
     public Integer getId() {
         return id;
     }
@@ -172,4 +177,12 @@ public class TpBillInvoice {
     public void setBillName(String billName) {
         this.billName = billName;
     }
+
+    public String getPayType() {
+        return payType;
+    }
+
+    public void setPayType(String payType) {
+        this.payType = payType;
+    }
 }

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

@@ -72,9 +72,10 @@ public interface ITaUserService {
      * @param gender
      * @param currentUserId 当前用户(业主)
      * @param type 2租客 3家属
+     * @param idCard 身份证号
      * @return
      */
-    ResponseBean addTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type);
+    ResponseBean addTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type, String idCard);
 
     /**
      * 修改租客或者家属
@@ -84,9 +85,10 @@ public interface ITaUserService {
      * @param currentUserId 当前用户(业主)
      * @param type 2租客 3家属
      * @param userId 用户ID
+     * @param idCard 身份证号
      * @return
      */
-    ResponseBean updateTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type,Integer userId);
+    ResponseBean updateTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type,Integer userId, String idCard);
 
     /**
      * 修改用户头像

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

@@ -20,5 +20,12 @@ public interface TaVistorServiceI {
      * @return
      */
     ResponseBean insertTaVistor(TaVisitor taVisitor, Integer communityId, Integer userId);
-    List<TaVisitor> invateHis(Integer communityId, Integer userId);
+
+    /**
+     * 访客邀请记录
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    ResponseBean invateHis(Integer communityId, Integer userId);
 }

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

@@ -488,7 +488,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseBean addTenantsOrDependents(String userName, String phone, String gender, Integer currentUserId, Integer type) {
+    public ResponseBean addTenantsOrDependents(String userName, String phone, String gender, Integer currentUserId, Integer type, String idCard) {
         ResponseBean response = new ResponseBean();
 
         TaUser taUser = taUserMapper.selectByPrimaryKey(currentUserId);
@@ -513,6 +513,11 @@ public class TaUserServiceImpl implements ITaUserService {
             return response;
         }
 
+        if (StringUtils.isEmpty(idCard)) {
+            response.addError("对不起! 身份证不允许为空!");
+            return response;
+        }
+
         Map<String,Object> parUserLogin = Maps.newHashMap();
         parUserLogin.put("loginName",phone);
         TaUser parUser = taUserMapper.selectByLoginName(parUserLogin);
@@ -536,6 +541,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setAcceptAgreementStatus("1");
         user.setFaceStatus("0");
         user.setRemark("这是业主添加的!");
+        user.setIdCard(idCard);
         if (StringUtils.isEmpty(userName)) {
             user.setUserName(user.getLoginName());
         }
@@ -575,7 +581,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean updateTenantsOrDependents(String userName, String phone, String gender, Integer currentUserId, Integer type,Integer userId) {
+    public ResponseBean updateTenantsOrDependents(String userName, String phone, String gender, Integer currentUserId, Integer type,Integer userId, String idCard) {
         ResponseBean response = new ResponseBean();
 
         TaUser taUser = taUserMapper.selectByPrimaryKey(currentUserId);
@@ -590,13 +596,18 @@ public class TaUserServiceImpl implements ITaUserService {
         // 当前用户的身份
         TaSysRole role = taSysRoleMapper.findRoleByUserId(taUser.getId());
         if (!"OWNER".equals(role.getRoleName())) {
-            response.addError("对不起,您不是业主,不能添加家属或租客!");
+            response.addError("对不起,您不是业主,不能修改家属或租客!");
             return response;
         }
 
         int tempType = type;
         if (tempType != 2 && type != 3) {
-            response.addError("对不起! 您只能添加家属或者租客!");
+            response.addError("对不起! 您只能修改家属或者租客!");
+            return response;
+        }
+
+        if (StringUtils.isEmpty(idCard)) {
+            response.addError("对不起! 身份证不允许为空!");
             return response;
         }
 
@@ -607,6 +618,7 @@ public class TaUserServiceImpl implements ITaUserService {
         user.setUpdateDate(new Date());
         user.setUpdateUser(currentUserId);
         user.setParentId(currentUserId);
+        user.setIdCard(idCard);
         if (StringUtils.isEmpty(userName)) {
             user.setUserName(user.getLoginName());
         }

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

@@ -82,7 +82,8 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
     }
 
     @Override
-    public List<TaVisitor> invateHis(Integer communityId, Integer userId) {
+    public ResponseBean invateHis(Integer communityId, Integer userId) {
+        ResponseBean responseBean = new ResponseBean();
         List<TaVisitor> taVisitors = taVisitorMapper.findAllVistors(communityId, userId);
 
         for (TaVisitor taVisitor : taVisitors){
@@ -91,7 +92,8 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
                 taVisitor.setCarLicense(taVisitorLicenses);
             }
         }
-        return taVisitors;
+        responseBean.addSuccess(taVisitors);
+        return responseBean;
     }
 
     /**

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

@@ -129,7 +129,8 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		tpBillInvoice.setPayName(taUser.getUserName());
 		tpBillInvoice.setPayDate(new Date());
 		tpBillInvoice.setUpdateDate(new Date());
-		// tpBillInvoice.setUpdateUser(taUser.getId());
+		// 缴费方式  0：微信支付  1：线下缴费
+		tpBillInvoice.setPayType("0");
 		tpBillInvoiceMapper.updateByPrimaryKeySelective(tpBillInvoice);
 
 		//插入流水账单表

CODE/smart-community/app-api/src/main/java/com/community/huiju/vo/TaUserVO.java

@@ -67,4 +67,7 @@ public class TaUserVO {
     /**业主ID**/
     private Integer proprietorID;
 
+    /** 身份证 **/
+    private String idCard;
+
 }

CODE/smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml

@@ -24,11 +24,12 @@
     <result column="hk_user_id" property="hkUserId" jdbcType="INTEGER" />
     <result column="hk_card_no" property="hkCardNo" jdbcType="VARCHAR" />
     <result column="face_status" property="faceStatus" jdbcType="CHAR" />
+    <result column="id_card" property="idCard" jdbcType="INTEGER"/>
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password,
     email, gender, status, remark, parent_id, accept_agreement_status, verify_status,
-    create_user, create_date, update_user, update_date, hk_person_no, hk_user_id, hk_card_no, face_status
+    create_user, create_date, update_user, update_date, hk_person_no, hk_user_id, hk_card_no, face_status, id_card
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -47,7 +48,7 @@
       status, remark, parent_id,
       accept_agreement_status, verify_status, create_user,
       create_date, update_user, update_date, hk_person_no,
-      hk_user_id, hk_card_no, face_status
+      hk_user_id, hk_card_no, face_status, id_card
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
       #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
@@ -55,7 +56,8 @@
       #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
       #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
-      #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR}
+      #{hkPersonNo,jdbcType=BIGINT}, #{hkUserId,jdbcType=INTEGER}, #{hkCardNo,jdbcType=VARCHAR}, #{faceStatus,jdbcType=CHAR},
+      #{idCard,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TaUser" useGeneratedKeys="true" keyProperty="id" >
@@ -127,6 +129,9 @@
       <if test="faceStatus != null" >
         face_status,
       </if>
+      <if test="idCard != null">
+        id_card,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -195,6 +200,9 @@
       <if test="faceStatus != null" >
         #{faceStatus,jdbcType=CHAR},
       </if>
+      <if test="idCard != null">
+        #{idCard,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUser" >
@@ -263,6 +271,9 @@
       <if test="faceStatus != null" >
         face_status = #{faceStatus,jdbcType=CHAR},
       </if>
+      <if test="idCard != null">
+        id_card = #{idCard,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -288,7 +299,8 @@
       hk_person_no = #{hkPersonNo,jdbcType=BIGINT},
       hk_user_id = #{hkUserId,jdbcType=INTEGER},
       hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
-      face_status = #{faceStatus,jdbcType=CHAR}
+      face_status = #{faceStatus,jdbcType=CHAR},
+      id_card = #{idCard,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

CODE/smart-community/app-api/src/main/resources/mapper/TpBillInvoiceMapper.xml

@@ -17,11 +17,12 @@
     <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="pay_type" property="payType" jdbcType="CHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, bill_id, building_owner_info_id, ta_user_id, bill_invoice_explain, 
     pay_price, bill_statement_id, bill_status, pay_name, pay_date, create_user, create_date, 
-    update_user, update_date
+    update_user, update_date, pay_type
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -38,13 +39,14 @@
       building_owner_info_id, ta_user_id, bill_invoice_explain, 
       pay_price, bill_statement_id, bill_status, 
       pay_name, pay_date, create_user, 
-      create_date, update_user, update_date
+      create_date, update_user, update_date, pay_type
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{billId,jdbcType=INTEGER}, 
       #{buildingOwnerInfoId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, #{billInvoiceExplain,jdbcType=VARCHAR}, 
       #{payPrice,jdbcType=INTEGER}, #{billStatementId,jdbcType=INTEGER}, #{billStatus,jdbcType=CHAR}, 
       #{payName,jdbcType=VARCHAR}, #{payDate,jdbcType=TIMESTAMP}, #{createUser,jdbcType=INTEGER}, 
-      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
+      #{payType,jdbcType=CHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.community.huiju.model.TpBillInvoice" >
@@ -95,6 +97,9 @@
       <if test="updateDate != null" >
         update_date,
       </if>
+      <if test="payType != null">
+          pay_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -142,6 +147,9 @@
       <if test="updateDate != null" >
         #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="payType != null">
+        #{payType,jdbcType=CHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TpBillInvoice" >
@@ -189,6 +197,9 @@
       <if test="updateDate != null" >
         update_date = #{updateDate,jdbcType=TIMESTAMP},
       </if>
+      <if test="payType != null">
+        pay_type = #{payType,jdbcType=CHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -207,7 +218,8 @@
       create_user = #{createUser,jdbcType=INTEGER},
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
-      update_date = #{updateDate,jdbcType=TIMESTAMP}
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      pay_type = #{payType,jdbcType=CHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/TaSysMenuMapper.java

@@ -0,0 +1,20 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.model.TaSysMenuImg;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface TaSysMenuMapper {
+	
+	List<TaSysMenu> getTaSysMenuListByCommunityId();
+	
+	int insertTaSysMenu(TaSysMenu taSysMenu);
+	
+	List<TaSysMenuImg> selectTaSysMenuImgById(@Param("taMenuId") Integer taMenuId);
+	
+	int batchInsertImg(List<TaSysMenuImg> imgList);
+}

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

@@ -0,0 +1,72 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * APP端菜单页面
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaSysMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+
+    /**
+     * 菜单链接
+     */
+    private String menuUrl;
+
+    /**
+     * 父级菜单ID
+     */
+    private Integer parentId;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 菜单类型 0 H5  1原生开发
+     */
+    private String menuType;
+
+    /**
+     * 状态 0正常 1 是停用 9 删除
+     */
+    private String status;
+
+    /**
+     * face 代表人脸录入  monitor 代表是 公区监控
+     */
+    private String remark;
+
+    /**
+     * 说明
+     */
+    private String explain;
+
+
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/model/TaSysMenuImg.java

@@ -0,0 +1,30 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * APP端菜单页面
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaSysMenuImg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    
+    private Integer taMenuId;
+    
+    private String menuIconImg;
+    
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/CommunityServiceImpl.java

@@ -1,9 +1,12 @@
 package com.community.huiju.service.impl;
 
 import com.community.commom.constant.Constant;
+import com.community.huiju.dao.TaSysMenuMapper;
 import com.community.huiju.dao.ToCommunitiesMapper;
 import com.community.huiju.dao.TpUserCommunityMapper;
 import com.community.huiju.dao.TpUserMapper;
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.model.TaSysMenuImg;
 import com.community.huiju.model.ToCommunities;
 import com.community.huiju.model.TpSysMenu;
 import com.community.huiju.model.TpSysRole;
@@ -28,7 +31,7 @@ import java.util.Map;
  * @date 2018-10-31
  */
 @Service("communityService")
-@Transactional
+@Transactional(rollbackFor = Exception.class)
 public class CommunityServiceImpl implements CommunityServiceI {
 	
 	@Autowired
@@ -40,6 +43,9 @@ public class CommunityServiceImpl implements CommunityServiceI {
 	@Autowired
 	private TpUserCommunityMapper tpUserCommunityMapper;
 	
+	@Autowired
+	private TaSysMenuMapper taSysMenuMapper;
+	
 	/**
 	 * 分页获取小区列表
 	 * @param toCommunities
@@ -79,9 +85,39 @@ public class CommunityServiceImpl implements CommunityServiceI {
 		tpUserMapper.insertSelective(tpUser);
 		//维护此用户的角色
 		addUserAndRole(tpUser.getId(), toCommunities.getId());
+		//维护这个小区的APP端的图标
+		addAppMenu(toCommunities.getId());
 		return size;
 	}
-
+	
+	/**
+	 * 维护这个小区的APP端的菜单和图标
+	 * @param communityId
+	 */
+	private void addAppMenu(Integer communityId) {
+		List<TaSysMenu>  list = taSysMenuMapper.getTaSysMenuListByCommunityId();
+		list.stream().forEach(e -> {
+			//插入APP菜单
+			TaSysMenu taSysMenu = new TaSysMenu();
+			taSysMenu.setCommunityId(communityId);
+			taSysMenu.setExplain(e.getExplain());
+			taSysMenu.setMenuName(e.getMenuName());
+			taSysMenu.setMenuType(e.getMenuType());
+			taSysMenu.setMenuUrl(e.getMenuUrl());
+			taSysMenu.setRemark(e.getRemark());
+			taSysMenu.setSort(e.getSort());
+			taSysMenu.setStatus("0");
+			taSysMenuMapper.insertTaSysMenu(taSysMenu);
+			//插入图标
+			List<TaSysMenuImg> imgList =  taSysMenuMapper.selectTaSysMenuImgById(e.getId());
+			imgList.stream().forEach(img -> {
+				img.setTaMenuId(taSysMenu.getId());
+			});
+			taSysMenuMapper.batchInsertImg(imgList);
+		});
+		
+	}
+	
 	/**
 	 * 维护住户端用户与社区关系表
 	 * @param tpUserId

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

@@ -0,0 +1,48 @@
+<?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.community.huiju.dao.TaSysMenuMapper">
+
+    <select id="getTaSysMenuListByCommunityId" resultType="com.community.huiju.model.TaSysMenu">
+        SELECT
+            t.id,
+            t.community_id AS communityId,
+            t.menu_url AS menuUrl,
+            t.menu_name AS menuName,
+            t.parent_id AS paremtId,
+            t.sort,
+            t.menu_type AS menuType,
+            t.`status`,
+            t.remark,
+            t.`explain`
+        FROM
+            ta_sys_menu t
+        WHERE
+            community_id = '-1'
+    </select>
+
+    <insert id="insertTaSysMenu" parameterType="com.community.huiju.model.TaSysMenu" useGeneratedKeys="true" keyProperty="id">
+        insert into ta_sys_menu (community_id, menu_url, menu_name, sort, menu_type,  `status`, remark, `explain`)
+    values (#{communityId,jdbcType=INTEGER}, #{menuUrl,jdbcType=VARCHAR},
+      #{menuName,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{menuType,jdbcType=VARCHAR},
+      #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{explain,jdbcType=VARCHAR})
+    </insert>
+
+    <select id="selectTaSysMenuImgById" resultType="com.community.huiju.model.TaSysMenuImg">
+        SELECT
+            id,
+            ta_menu_id as taMenuId,
+            menu_icon_img as menuIconImg
+        FROM
+            ta_sys_menu_img
+        WHERE
+            ta_menu_id = #{taMenuId,jdbcType=INTEGER}
+    </select>
+
+    <insert id="batchInsertImg" parameterType="list" >
+        insert into ta_sys_menu_img (ta_menu_id, menu_icon_img)
+        values
+        <foreach collection="list" item="item" index="index" separator="," >
+            (#{item.taMenuId,jdbcType=VARCHAR}, #{item.menuIconImg,jdbcType=VARCHAR})
+        </foreach>
+    </insert>
+</mapper>

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

@@ -0,0 +1,142 @@
+package com.community.huiju.controller;
+
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.AnnouncementTel;
+import com.community.huiju.model.Bill;
+import com.community.huiju.service.IAnnouncementTelService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 物业号码表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@RestController
+@RequestMapping("/")
+@RefreshScope
+@Api(value = "物业端号码 API", description = "物业端号码 API")
+public class AnnouncementTelController extends BaseController {
+	
+	@Autowired
+	private IAnnouncementTelService announcementTelService;
+	
+	@ApiOperation(value = "根据搜索条件获取物业端号码", notes = "根据搜索条件获取物业端号码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "name", value = "名称（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "tel", value = "号码（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "String", name = "remark", value = "备注（模糊查询）"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
+			@ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")
+	})
+	@RequestMapping(value = "/tels",method = RequestMethod.GET)
+	public ResponseBean getList(@RequestParam(value = "name", required = false) String name,
+	                            @RequestParam(value = "tel", required = false) String tel,
+	                            @RequestParam(value = "remark", required = false) String remark,
+	                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+	                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		AnnouncementTel announcementTel = new AnnouncementTel();
+		announcementTel.setCommunityId(userElement.getCommunityId());
+		announcementTel.setName(name);
+		announcementTel.setTel(tel);
+		announcementTel.setRemark(remark);
+		responseBean = announcementTelService.getTelList(announcementTel,pageNum,pageSize);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "添加物业端号码", notes = "添加物业端号码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(dataTypeClass = String.class, paramType = "AnnouncementTel", name = "announcementTel", value = "电话号码实体类"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tel/add",method = RequestMethod.POST)
+	public ResponseBean addTel(@RequestBody AnnouncementTel announcementTel, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		LocalDateTime time = LocalDateTime.now();
+		announcementTel.setCommunityId(userElement.getCommunityId());
+		announcementTel.setCreateUser(userElement.getId());
+		announcementTel.setUpdateUser(userElement.getId());
+		announcementTel.setCreateDate(time);
+		announcementTel.setUpdateDate(time);
+		boolean state = announcementTelService.save(announcementTel);
+		if (state){
+			responseBean.addSuccess("添加物业端号码成功");
+			return responseBean;
+		}
+		responseBean.addError("添加物业端号码失败");
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "根据ID修改物业端号码", notes = "根据ID修改物业端号码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body", dataType = "AnnouncementTel", name = "announcementTel", value = "电话号码实体类"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tel/update", method = RequestMethod.PUT)
+	public ResponseBean updateTel(@RequestBody AnnouncementTel announcementTel, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		announcementTel.setUpdateUser(userElement.getId());
+		announcementTel.setUpdateDate(LocalDateTime.now());
+		boolean state = announcementTelService.updateById(announcementTel);
+		if (state){
+			responseBean.addSuccess("修改物业端号码成功");
+			return responseBean;
+		}
+		responseBean.addError("修改物业端号码失败");
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "获取Id获取物业端号码详情", notes = "获取Id获取物业端号码详情")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "Path", dataType = "integer", name = "id", value = "主键Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tel/{id}",method = RequestMethod.GET)
+	public ResponseBean getNoticeById(@PathVariable(value ="id") Integer id, HttpServletRequest request){
+		ResponseBean responseBean = new ResponseBean();
+		AnnouncementTel announcementTel = announcementTelService.getById(id);
+		responseBean.addSuccess(announcementTel);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "根据ID删除物业端号码", notes = "根据ID删除物业端号码")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "Path", dataType = "integer", name = "id", value = "主键Id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token")
+	})
+	@RequestMapping(value = "/tel/delete/{id}", method = RequestMethod.DELETE)
+	public ResponseBean deleteNotice(@PathVariable(value ="id") Integer id,HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		boolean state = announcementTelService.removeById(id);
+		if (state){
+			responseBean.addSuccess("删除物业端号码成功");
+			return responseBean;
+		}
+		responseBean.addError("删除物业端号码失败");
+		return responseBean;
+	}
+}

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

@@ -80,9 +80,9 @@ public class BillController extends BaseController {
 
     @ApiOperation(value = "上传缴费项接口, 预览", notes = "上传缴费项接口, 预览")
     @PostMapping(value = "/bill/uploadExcel/get", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    public ResponseBean getUploadExcel(@RequestParam("file") MultipartFile file, @RequestParam("billExplain") String billExplain) {
+    public ResponseBean getUploadExcel(@RequestParam("file") MultipartFile file) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iBillService.getExcelData(file, billExplain);
+        responseBean = iBillService.getExcelData(file);
         return responseBean;
     }
 

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

@@ -1,6 +1,8 @@
 package com.community.huiju.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.common.base.BaseController;
@@ -12,6 +14,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -19,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpSession;
+import java.util.List;
 
 /**
  * <p>

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

@@ -0,0 +1,96 @@
+package com.community.huiju.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.service.ITaSysMenuService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
+
+/**
+ * <p>
+ * APP端菜单页面 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@RestController
+@RequestMapping("/")
+public class TaSysMenuController extends BaseController {
+	
+	@Autowired
+	private ITaSysMenuService taSysMenuService;
+	
+	@ApiOperation(value = "获取菜单列表", notes = "获取菜单列表")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+	})
+	@RequestMapping(value = "/ta/menu/list",method = RequestMethod.GET)
+	public ResponseBean getList(HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		QueryWrapper<TaSysMenu> queryWrapper =  new QueryWrapper<>();
+		queryWrapper.eq("community_id",userElement.getCommunityId());
+		List<TaSysMenu> list = taSysMenuService.list(queryWrapper);
+		responseBean.addSuccess(list);
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "启用菜单", notes = "启用菜单")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "编号id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+	})
+	@RequestMapping(value = "/ta/menu/enable/{id}",method = RequestMethod.POST)
+	public ResponseBean enableMenu(@PathVariable(value = "id") Integer id, HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TaSysMenu sysMenu = new TaSysMenu();
+		sysMenu.setId(id);
+		sysMenu.setStatus("0");
+		boolean stste = taSysMenuService.updateById(sysMenu);
+		if (stste){
+			responseBean.addSuccess("启用成功");
+			return responseBean;
+		}
+		responseBean.addSuccess("启用失败");
+		return responseBean;
+	}
+	
+	@ApiOperation(value = "停用菜单", notes = "停用菜单")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "编号id"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "Login-Type", value = "值为 web"),
+	})
+	@RequestMapping(value = "/ta/menu/disable/{id}",method = RequestMethod.POST)
+	public ResponseBean disableMenu(@PathVariable(value = "id") Integer id,HttpSession session) {
+		ResponseBean responseBean = new ResponseBean();
+		UserElement userElement = getUserElement(session);
+		TaSysMenu sysMenu = new TaSysMenu();
+		sysMenu.setId(id);
+		sysMenu.setStatus("1");
+		boolean stste = taSysMenuService.updateById(sysMenu);
+		if (stste){
+			responseBean.addSuccess("停用成功");
+			return responseBean;
+		}
+		responseBean.addSuccess("停用失败");
+		return responseBean;
+	}
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/AnnouncementTelMapper.java

@@ -0,0 +1,27 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.community.huiju.model.AnnouncementTel;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 物业号码表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+public interface AnnouncementTelMapper extends BaseMapper<AnnouncementTel> {
+	
+	/**
+	 * 分页获取电话号码
+	 * @param page
+	 * @param announcementTel
+	 * @return
+	 */
+	List<AnnouncementTel> selectListByParams(Page page,@Param("announcementTel") AnnouncementTel announcementTel);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TaSysMenuMapper.java

@@ -0,0 +1,18 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaSysMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * APP端菜单页面 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@Mapper
+public interface TaSysMenuMapper extends BaseMapper<TaSysMenu> {
+
+}

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

@@ -0,0 +1,68 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 物业号码表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tp_announcement_tel")
+public class AnnouncementTel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 电话名称
+     */
+    private String name;
+
+    private String tel;
+
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+    
+    /**
+     * 更新人
+     */
+    @TableField(exist = false)
+    private String updateName;
+
+}

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

@@ -67,7 +67,10 @@ public class BillInvoice implements Serializable {
     private Integer billStatementId;
 
     /**
-     * 缴费状态  0：未缴费  1：已线上缴费 2：已线下缴费
+     * 遗弃: 缴费状态  0：未缴费  1：已线上缴费 2：已线下缴费
+     *
+     * 缴费状态  0：未缴费  1: 已缴费 3: 正在支付中
+     *
      */
     private String billStatus;
 
@@ -111,6 +114,11 @@ public class BillInvoice implements Serializable {
      */
     private String outTradeNo;
 
+    /**
+     * 缴费方式  0：微信支付  1：线下缴费
+     */
+    private String payType;
+
     /**
      * 业主姓名
      */

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

@@ -0,0 +1,72 @@
+package com.community.huiju.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * APP端菜单页面
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaSysMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+    
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+
+    /**
+     * 菜单链接
+     */
+    private String menuUrl;
+
+    /**
+     * 父级菜单ID
+     */
+    private Integer parentId;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 菜单类型 0 H5  1原生开发
+     */
+    private String menuType;
+
+    /**
+     * 状态 0正常 1 是停用 9 删除
+     */
+    private String status;
+
+    /**
+     * face 代表人脸录入  monitor 代表是 公区监控
+     */
+    private String remark;
+
+    /**
+     * 说明
+     */
+    private String explain;
+
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IAnnouncementTelService.java

@@ -0,0 +1,27 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.AnnouncementTel;
+
+/**
+ * <p>
+ * 物业号码表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+public interface IAnnouncementTelService extends IService<AnnouncementTel> {
+	
+	/**
+	 *
+	 * 获取物业号码列表
+	 * @param announcementTel
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	ResponseBean getTelList(AnnouncementTel announcementTel, Integer pageNum, Integer pageSize);
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IBillService.java

@@ -49,7 +49,7 @@ public interface IBillService extends IService<Bill> {
 	 * @param file
 	 * @return
 	 */
-    ResponseBean getExcelData(MultipartFile file, String billExplain);
+    ResponseBean getExcelData(MultipartFile file);
 
 	/**
 	 * 上传excel, 解析 入库

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/ITaSysMenuService.java

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TaSysMenu;
+
+/**
+ * <p>
+ * APP端菜单页面 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+public interface ITaSysMenuService extends IService<TaSysMenu> {
+
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/AnnouncementTelServiceImpl.java

@@ -0,0 +1,52 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.model.AnnouncementTel;
+import com.community.huiju.dao.AnnouncementTelMapper;
+import com.community.huiju.model.Bill;
+import com.community.huiju.service.IAnnouncementTelService;
+import com.google.common.collect.Maps;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 物业号码表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-05
+ */
+@Service
+public class AnnouncementTelServiceImpl extends ServiceImpl<AnnouncementTelMapper, AnnouncementTel> implements IAnnouncementTelService {
+	
+	@Autowired
+	private AnnouncementTelMapper announcementTelMapper;
+	
+	/**
+	 * 获取物业号码列表
+	 *
+	 * @param announcementTel
+	 * @param pageNum
+	 * @param pageSize
+	 * @return
+	 */
+	@Override
+	public ResponseBean getTelList(AnnouncementTel announcementTel, Integer pageNum, Integer pageSize) {
+		ResponseBean responseBean = new ResponseBean();
+		Page page = new Page(pageNum,pageSize);
+		// 分页查询
+		List<AnnouncementTel> list = announcementTelMapper.selectListByParams(page,announcementTel);
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("list",list);
+		map.put("total",page.getTotal());
+		responseBean.addSuccess(map);
+		return responseBean;
+	}
+}

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillInvoiceServiceImpl.java

@@ -160,7 +160,8 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
                 throw new WisdomException("费用已缴，无法更改");
             }
 
-            billInvoice.setBillStatus("2");
+            billInvoice.setBillStatus("1");
+            billInvoice.setPayType("1");
             int rows = billInvoiceMapper.updateById(billInvoice);
             if (rows > 0) {
                 TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(billInvoice.getBuildingOwnerInfoId());

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java

@@ -143,7 +143,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ResponseBean getExcelData(MultipartFile file, String billExplain) {
+    public ResponseBean getExcelData(MultipartFile file) {
         ResponseBean responseBean = new ResponseBean();
         if (file == null) {
             responseBean.addError("对象不能为空");
@@ -152,9 +152,6 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
         responseBean = getExcelData(file, responseBean);
         List<TempBill> tempBills = (List<TempBill>) responseBean.getData();
-        tempBills.forEach(e -> {
-            e.setBillExplain(billExplain);
-        });
 
         Map<String, Object> map = Maps.newHashMap();
         map.put("list", tempBills);
@@ -294,7 +291,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 if (null != taUser) {
                     billInvoice.setTaUserId(taUser.getId());
                 }
-                billInvoice.setBillInvoiceExplain(bill.getBillExplain());
+                billInvoice.setBillInvoiceExplain(e.getBillExplain());
                 billInvoice.setPayPrice(e.getPayPrice());
                 billInvoice.setBillStatus("0");
                 billInvoice.setCreateUser(userElement.getId());
@@ -374,7 +371,15 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                 throw new WisdomException("第" + i + "行 业主姓名 不能为空");
             }
             String ownerName = cell.getStringCellValue().trim();
+
+            // 收费说明可以为空
             cell = getCell(row.getCell(6));
+            String billExplain = null;
+            if (null != cell) {
+                billExplain = cell.getStringCellValue().trim();
+            }
+
+            cell = getCell(row.getCell(7));
             if (null == cell) {
                 throw new WisdomException("第" + i + "行 金额 不能为空");
             }
@@ -388,6 +393,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             temp.setUnit(unit);
             temp.setRoomNo(roomNo);
             temp.setOwnerName(ownerName);
+            temp.setBillExplain(billExplain);
 
 
             if (StringUtils.isNotBlank(money)) {

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaSysMenuServiceImpl.java

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.model.TaSysMenu;
+import com.community.huiju.dao.TaSysMenuMapper;
+import com.community.huiju.service.ITaSysMenuService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * APP端菜单页面 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-03-06
+ */
+@Service
+public class TaSysMenuServiceImpl extends ServiceImpl<TaSysMenuMapper, TaSysMenu> implements ITaSysMenuService {
+
+}

CODE/smart-community/property-api/src/main/resources/mapper/AnnouncementTelMapper.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.community.huiju.dao.AnnouncementTelMapper">
+    <select id="selectListByParams" resultType="com.community.huiju.model.AnnouncementTel">
+       SELECT
+            t.id,
+            t.community_id AS communityId,
+            t.NAME,
+            t.tel,
+            t.remark,
+            t.update_date,
+            u.user_name AS updateName
+        FROM
+            tp_announcement_tel t
+            LEFT JOIN tp_user u ON t.update_user = u.id
+        WHERE
+            1 = 1
+        AND t.community_id = #{announcementTel.communityId}
+        <if test="announcementTel.tel != null and announcementTel.tel != ''">
+          AND t.tel like concat('%',#{announcementTel.tel},'%')
+        </if>
+        <if test="announcementTel.remark != null and announcementTel.remark != ''">
+          AND t.remark like concat('%',#{announcementTel.remark},'%')
+        </if>
+        <if test="announcementTel.name != null and announcementTel.name != ''">
+          AND t.name like concat('%',#{announcementTel.name},'%')
+        </if>
+    </select>
+</mapper>

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

@@ -0,0 +1,5 @@
+<?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.community.huiju.dao.TaSysMenuMapper">
+
+</mapper>

VUECODE/smart-property-manage/src/router/index.js

@@ -307,6 +307,36 @@ export const constantRouterMap = [
         meta: { title: '消息', icon: 'table' }
       }
     ]
+  },
+  {
+    path: '/systemResources',
+    component: Layout,
+    redirect: '/systemResources/index',
+    name: 'systemResources',
+    alwaysShow: true,
+    meta: { title: '系统资源', icon: 'zip' },
+    children: [
+      {
+        path: '/systemResources/app/index',
+        component: () => import('@/views/systemResources/app/index'),
+        name: 'app-index',
+        meta: { title: 'APP配置', icon: 'table' }
+      },
+      {
+        path: '/systemResources/app/property/add/index',
+        component: () => import('@/views/systemResources/app/property/add/index'),
+        name: 'property-add-index',
+        hidden: true,
+        meta: { title: '添加物业号码', icon: 'table' }
+      },
+      {
+        path: '/systemResources/app/property/edi/index',
+        component: () => import('@/views/systemResources/app/property/edi/index'),
+        name: 'property-edi-index',
+        hidden: true,
+        meta: { title: '修改物业号码', icon: 'table' }
+      }
+    ]
   }
 ]
 

VUECODE/smart-property-manage/src/views/bill/add/index.vue

@@ -22,9 +22,9 @@
             :on-exceed="handleExceed"
             :before-upload="beforeUpload"
             :data="ruleForm"
+            :action="uploadUrl"
             name="file"
             class="upload-demo"
-            :action="uploadUrl"
             multiple>
             <el-button slot="trigger" size="large" type="primary">选取文件并预览</el-button>
           </el-upload>
@@ -92,7 +92,7 @@ export default {
   },
   data() {
     return {
-      uploadUrl: process.env.BASE_API + "/bill/uploadExcel/get",
+      uploadUrl: process.env.BASE_API + '/bill/uploadExcel/get',
       ruleForm: {
         billName: '',
         billExplain: '',

VUECODE/smart-property-manage/src/views/bill/info/index.vue

@@ -128,6 +128,14 @@
           </span>
         </template>
       </el-table-column>
+      <el-table-column
+        prop="billStatus"
+        label="缴费途径"
+        align="center">
+        <template slot-scope="scope">
+          {{ showPayType(scope.row.payType) }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="payName"
         label="缴费人"
@@ -371,10 +379,7 @@ export default {
           str = '未缴费'
           break
         case '1':
-          str = '已线上缴费'
-          break
-        case '2':
-          str = '已线下缴费'
+          str = '已缴费'
           break
         case '3':
           str = '正在支付中'
@@ -466,6 +471,19 @@ export default {
       }).catch(() => {
         console.log('error ExportBillInvoiceExcel')
       })
+    },
+    showPayType(payType) { // 缴费途径
+      let str = ''
+      switch (payType) {
+        case '0':
+          str = '微信支付'
+          break
+        case '1':
+          str = '线下缴费'
+          break
+      }
+
+      return str
     }
   }
 }

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

@@ -0,0 +1,95 @@
+<template>
+  <div id="root">
+    <el-tabs v-model="activeName2" type="card" @tab-click="handleClick">
+      <el-tab-pane label="banner轮播" name="banner">banner轮播</el-tab-pane>
+      <el-tab-pane label="首页功能按钮" name="homeIndex">首页功能按钮</el-tab-pane>
+      <el-tab-pane label="物业号码" name="property">
+        <el-form :model="formInline" inline="true" class="form-inline">
+          <el-form-item label="名称">
+            <el-input v-model="formInline.name" placeholder="名称"/>
+          </el-form-item>
+          <el-form-item label="号码">
+            <el-input v-model="formInline.tel" placeholder="号码"/>
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-input v-model="formInline.remark" placeholder="备注"/>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="onSubmit">查询</el-button>
+          </el-form-item>
+        </el-form>
+        <div style="margin-left: 20px;">
+          <el-button type="primary" @click="add">添加</el-button>
+          <el-button type="warning" @click="edi">修改</el-button>
+          <el-button type="danger">删除</el-button>
+        </div>
+        <el-table
+          ref="multipleTable"
+          :data="propertyList"
+          border
+          tooltip-effect="dark"
+          style="width: 100%; margin-top: 20px;"
+          @selection-change="handleSelectionChange">
+          <el-table-column
+            type="selection"
+            width="55"/>
+          <el-table-column
+            prop="name"
+            label="名称"/>
+          <el-table-column
+            prop="tel"
+            label="号码"/>
+          <el-table-column
+            prop="remark"
+            label="备注"/>
+          <el-table-column
+            prop="updateName"
+            label="编辑人"/>
+          <el-table-column
+            prop="updateDate"
+            label="编辑时间"/>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      activeName2: 'banner', // 默认banner选项卡
+      formInline: {
+        name: '',
+        tel: '',
+        remark: ''
+      },
+      propertyList: [] // 物业数据列表
+    }
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event)
+    },
+    onSubmit() {
+      console.log('submit!')
+    },
+    handleSelectionChange(val) {
+      console.log(val)
+    },
+    add() { // 跳转添加物业号码
+      this.$router.push({ name: 'property-add-index' })
+    },
+    edi() { // 修改页面
+      this.$router.push({ name: 'property-edi-index' })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.form-inline {
+  margin-left: 20px;
+}
+</style>

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

@@ -0,0 +1,47 @@
+<template>
+  <div id="root">
+    <el-form :model="formInline" label-width="80px" class="form-class">
+      <el-form-item label="名称">
+        <el-input v-model="formInline.name"/>
+      </el-form-item>
+      <el-form-item label="号码">
+        <el-input v-model="formInline.tel"/>
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input v-model="formInline.remark"/>
+      </el-form-item>
+      <div class="button-class">
+        <el-button type="info">取消</el-button>
+        <el-button type="primary">保存</el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      formInline: {
+        name: '',
+        tel: '',
+        remark: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.form-class {
+  width: 400px;
+  margin-right: auto;
+  margin-left: auto;
+  margin-top: 20px;
+}
+.button-class {
+  display: flex;
+  justify-content: center;
+}
+</style>

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

@@ -0,0 +1,47 @@
+<template>
+  <div id="root">
+    <el-form :model="formInline" label-width="80px" class="form-class">
+      <el-form-item label="名称">
+        <el-input v-model="formInline.name"/>
+      </el-form-item>
+      <el-form-item label="号码">
+        <el-input v-model="formInline.tel"/>
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input v-model="formInline.remark"/>
+      </el-form-item>
+      <div class="button-class">
+        <el-button type="info">取消</el-button>
+        <el-button type="primary">保存</el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      formInline: {
+        name: '',
+        tel: '',
+        remark: ''
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.form-class {
+  width: 400px;
+  margin-right: auto;
+  margin-left: auto;
+  margin-top: 20px;
+}
+.button-class {
+  display: flex;
+  justify-content: center;
+}
+</style>