完成业务

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

@@ -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/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/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/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/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)) {

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

@@ -285,6 +285,22 @@ 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' }
+      }
+    ]
   }
 ]
 

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,29 @@
+<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-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Index',
+  data() {
+    return {
+      activeName2: 'banner' // 默认banner选项卡
+    }
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>