提交，完成 月租车，缴费

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

@@ -31,6 +31,28 @@ public class FSController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/car/parkGetMonthCardInfoByCarNo/{carNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取月租车信息（通过车牌号）", notes = "获取月租车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.parkGetMonthCardInfoByCarNo(carNo);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/car/parkGetTempCarPaymentInfoByCarNo/{carNo}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取临时车信息（通过车牌号）", notes = "获取临时车信息（通过车牌号）")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号")
+    })
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iFuShiService.parkGetTempCarPaymentInfoByCarNo(carNo);
+        return responseBean;
+    }
+
     @RequestMapping(value = "/car/apiThirdPartyMonthCardPay", method = RequestMethod.POST)
     @ApiOperation(value = "月卡续费", notes = "月卡续费")
     @ApiImplicitParams({

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

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 /**
@@ -50,10 +51,24 @@ public class HkController {
 		return responseBean;
 	}
 
+	@Deprecated
 	@RequestMapping(value = "/downloadAuthorityByDeviceUuids", method = RequestMethod.POST)
 	public ResponseBean pushHKPerson() {
 		ResponseBean responseBean = new ResponseBean();
 		responseBean = ihkService.downloadAuthorityByDeviceUuids();
 		return responseBean;
 	}
+
+	@ApiOperation(value = "门口机开门", notes = "门口机开门")
+	@ApiImplicitParams({
+			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userVerifyId", value = "用户审核房产id")
+	})
+	@RequestMapping(value = "/visual/syncControl", method = RequestMethod.GET)
+	public ResponseBean syncControl(@RequestParam("userVerifyId") Integer userVerifyId, HttpServletRequest request, HttpSession session){
+		ResponseBean responseBean = new ResponseBean();
+		responseBean = ihkService.syncControl(userVerifyId);
+		return responseBean;
+	}
+
+
 }

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

@@ -1,42 +0,0 @@
-package com.community.huiju.controller;
-
-import com.community.commom.constant.Constant;
-import com.community.commom.mode.ResponseBean;
-import com.community.commom.session.UserElement;
-import com.community.huiju.service.IVisualIntercomService;
-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.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-@RestController
-@RefreshScope
-@RequestMapping("/")
-@Api(value = "可视对讲 API", description = "可视对讲 API")
-public class VisualIntercomContrller extends BaseController {
-
-    @Autowired
-    private IVisualIntercomService iVisualIntercomService;
-
-    @ApiOperation(value = "门口机开门", notes = "门口机开门")
-    @ApiImplicitParams({
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "token")
-    })
-    @RequestMapping(value = "/visual/syncControl", method = RequestMethod.GET)
-    public ResponseBean syncControl(HttpServletRequest request, HttpSession session){
-        ResponseBean responseBean = new ResponseBean();
-        UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        responseBean = iVisualIntercomService.syncControl(userElement);
-        return responseBean;
-    }
-
-
-}

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

@@ -27,6 +27,10 @@ public class TaUserLicense {
 
     private Integer updateUser;
 
+    private Integer renewTime;
+
+    private Integer licenseType;
+
     public Integer getId() {
         return id;
     }
@@ -122,4 +126,20 @@ public class TaUserLicense {
     public void setUpdateUser(Integer updateUser) {
         this.updateUser = updateUser;
     }
+
+    public Integer getRenewTime() {
+        return renewTime;
+    }
+
+    public void setRenewTime(Integer renewTime) {
+        this.renewTime = renewTime;
+    }
+
+    public Integer getLicenseType() {
+        return licenseType;
+    }
+
+    public void setLicenseType(Integer licenseType) {
+        this.licenseType = licenseType;
+    }
 }

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

@@ -60,4 +60,18 @@ public interface IFuShiService {
      * @return
      */
     ResponseBean apiGetOfflineFee(String CarNoOrCardNo);
+
+    /**
+     * 获取月租车信息（通过车牌号）
+     * @param CarNo
+     * @return
+     */
+    ResponseBean parkGetMonthCardInfoByCarNo(String CarNo);
+
+    /**
+     * 获取临时车信息（通过车牌号）
+     * @param CarNo
+     * @return
+     */
+    ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo);
 }

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

@@ -21,4 +21,12 @@ public interface IHKService {
      */
     ResponseBean downloadAuthorityByDeviceUuids();
 
+    /**
+     * 异步反控开门 (远程开门)
+     *
+     * @param userVerifyId 审核ID
+     * @return
+     */
+    ResponseBean syncControl(Integer userVerifyId);
+
 }

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

@@ -1,22 +0,0 @@
-package com.community.huiju.service;
-
-import com.community.commom.mode.ResponseBean;
-import com.community.commom.session.UserElement;
-
-/**
- * 可视对讲的业务
- * @author weiximei
- */
-public interface IVisualIntercomService {
-
-    /**
-     * 反控开门
-     *
-     *      app端, 发送开门指令
-     *
-     * @param userElement 用户信息体
-     * @return
-     */
-    ResponseBean syncControl(UserElement userElement);
-
-}

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

@@ -159,7 +159,7 @@ public class FaceServicelimpl implements FaceServiceI {
         face.setFaceImg(faceImg);
         face.setUpdateUser(userElement.getId());
         face.setUpdateDate(new Date());
-        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
+        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
         if (resps.getCode().equals("0")) {
             resps.addSuccess((Object) faceImg);
         } else {
@@ -170,8 +170,20 @@ public class FaceServicelimpl implements FaceServiceI {
 
     /**
      * 验证图片是否为人脸，推送海康
+     * @param faceImg
+     * @param taFace
+     * @param isA
+     * @param uploadFile
+     * @param userId
+     * @param communityId
+     * @param roomNoId
+     * @param unitId
+     * @param appkey
+     * @param secret
+     * @param openapi_ip_port_http 海康服务器地址
+     * @return
      */
-    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId, Integer communityId, Integer roomNoId, Integer unitId, String  appkey, String secret) {
+    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId, Integer communityId, Integer roomNoId, Integer unitId, String  appkey, String secret, String openapi_ip_port_http) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectByPrimaryKey(userId);
         if (user.getHkUserId() == null) {
@@ -188,7 +200,7 @@ public class FaceServicelimpl implements FaceServiceI {
             Integer faceNum = (Integer) jsonObject.get("face_num");
 
             /*推送海康*/
-            String data = HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), user.getHkCardNo(), appkey, secret);
+            String data = HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), user.getHkCardNo(), appkey, secret, openapi_ip_port_http);
             /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum) {
                 if (null == data) {
@@ -220,6 +232,7 @@ public class FaceServicelimpl implements FaceServiceI {
                 map.put("personIds", String.valueOf(user.getHkUserId()));
                 map.put("deviceUuids", deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
                 map.put("type", 1);
+                map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
                 HKOpenApi.downloadFaceAndFingerInfos(map);
 
                 //可视对讲时 指定人员人脸权限下载
@@ -229,7 +242,7 @@ public class FaceServicelimpl implements FaceServiceI {
                 // TODO 根据期楼栋号，来查询出门口机
                 List<String> visualList = new ArrayList<>();
                 visualList.add("10010100000");
-                HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
+                HKOpenApi.visualIntercom(tpEquipmentTree.getOpUserUuid(), 1, userIdList, visualList, tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
             } else {
                 responseBean.addError("请录入正确图片");
             }
@@ -333,7 +346,7 @@ public class FaceServicelimpl implements FaceServiceI {
         if (null == face) {
             boolean isA = true;
             if (Constant.EFFECTIVE_STATUS.equals(taUser.getStatus())) {
-                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(),tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
+                ResponseBean responseBean = checKout(faceImg, taFace, isA, uploadFile, userid, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(),tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
                 if (responseBean.getCode().equals("0")) {
                     responseBean.addSuccess("图片录入成功");
                 } else {
@@ -433,6 +446,7 @@ public class FaceServicelimpl implements FaceServiceI {
         selectUserFaceMap.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
         selectUserFaceMap.put("appkey", tpEquipmentTree.getAppkey());
         selectUserFaceMap.put("secret", tpEquipmentTree.getSecret());
+        selectUserFaceMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         // 查询人脸信息
         HKOpenApi.selectUserFace(selectUserFaceMap);
 
@@ -442,6 +456,7 @@ public class FaceServicelimpl implements FaceServiceI {
         deleteUserMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
         deleteUserMap.put("appkey", tpEquipmentTree.getAppkey());
         deleteUserMap.put("secret", tpEquipmentTree.getSecret());
+        deleteUserMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         // 删除当前人脸设备信息
         String data= HKOpenApi.deleteUser(deleteUserMap);
         JSONObject object= JSONObject.parseObject(data);
@@ -462,6 +477,7 @@ public class FaceServicelimpl implements FaceServiceI {
         appointJurisdictionMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
         appointJurisdictionMap.put("operateType",3);
         appointJurisdictionMap.put("includeFinger",0);
+        appointJurisdictionMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
 
          HKOpenApi.appointJurisdiction(appointJurisdictionMap);
         // HKOpenApi.selectUserSynchronization();

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

@@ -41,7 +41,10 @@ public class FuShiServiceImpl implements IFuShiService {
     private Map<String,Object> getFuShiInfo(String jsonString) {
         JSONObject jsonObject = JSONObject.parseObject(jsonString);
         Map<String, Object> map = Maps.newHashMap();
-        map.put("JsonParam", jsonObject.getJSONObject("JsonParam").getInnerMap());
+        Map<String, Object> jsonParam = jsonObject.getJSONObject("JsonParam").getInnerMap();
+        // 移除优惠券
+        jsonParam.remove("CouponList");
+        map.put("JsonParam", jsonParam);
         map.put("Redirect", jsonObject.getString("Redirect"));
         map.put("DataType", jsonObject.getInteger("DataType"));
         return map;
@@ -123,4 +126,42 @@ public class FuShiServiceImpl implements IFuShiService {
         responseBean.addSuccess(map);
         return responseBean;
     }
+
+    /**
+     * 获取月租车信息（通过车牌号）
+     * @param CarNo
+     * @return
+     */
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "获取月租车信息（通过车牌号）")
+    @Override
+    public ResponseBean parkGetMonthCardInfoByCarNo(String CarNo) {
+        ResponseBean responseBean = new ResponseBean();
+        String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetMonthCardInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
+        JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
+        Map<String, Object> map = Maps.newHashMap();
+        Map<String, Object> result = jsonObject.getJSONObject("Result").getInnerMap();
+        result.remove("CouponList");
+        map.put("Result", result);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    /**
+     * 获取临时车信息（通过车牌号）
+     * @param CarNo
+     * @return
+     */
+    @LogAnnotation(value = LogEnums.DA_SU, alias = "获取临时车信息（通过车牌号）")
+    @Override
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo) {
+        ResponseBean responseBean = new ResponseBean();
+        String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetTempCarPaymentInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
+        JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
+        Map<String, Object> map = Maps.newHashMap();
+        Map<String, Object> result = jsonObject.getJSONObject("Result").getInnerMap();
+        result.remove("CouponList");
+        map.put("Result", result);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
 }

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

@@ -110,6 +110,7 @@ public class HKServiceImpl implements IHKService {
         map.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
         map.put("secret", tpEquipmentTree.getSecret());
         map.put("appkey", tpEquipmentTree.getAppkey());
+        map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         HKOpenApi.addAuthoritiesByPersonIds(map);
 
         // 下发门禁权限
@@ -120,6 +121,7 @@ public class HKServiceImpl implements IHKService {
         downloadAuthorityByPersonIdsMap.put("includeFinger",1);
         downloadAuthorityByPersonIdsMap.put("secret", tpEquipmentTree.getSecret());
         downloadAuthorityByPersonIdsMap.put("appkey", tpEquipmentTree.getAppkey());
+        downloadAuthorityByPersonIdsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
 
         //--------- 可视对讲 ----------
@@ -142,6 +144,7 @@ public class HKServiceImpl implements IHKService {
     }
 
     @Override
+    @Deprecated
     public ResponseBean downloadAuthorityByDeviceUuids() {
         ResponseBean responseBean = new ResponseBean();
         // 下发门禁权限
@@ -162,6 +165,7 @@ public class HKServiceImpl implements IHKService {
         parDept.put("pageNo", 1);
         parDept.put("pageSize", 100);
         parDept.put("deptName", Constant.DEPT_RESIDENTS);
+        parDept.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         // 部门UUID
         String deptUuid = getDeptUUID(parDept);
 
@@ -173,6 +177,7 @@ public class HKServiceImpl implements IHKService {
         parUser.put("deptUuid", deptUuid);
         parUser.put("secret", tpEquipmentTree.getSecret());
         parUser.put("appkey", tpEquipmentTree.getAppkey());
+        parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
         int errorCode = (int) resultMap.get("errorCode");
         if (errorCode == 0) {
@@ -243,6 +248,7 @@ public class HKServiceImpl implements IHKService {
         parOpenCard.put("endTime", time);
         parOpenCard.put("secret", tpEquipmentTree.getSecret());
         parOpenCard.put("appkey", tpEquipmentTree.getAppkey());
+        parOpenCard.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         JSONObject openCardJSON = JSONObject.parseObject(HKOpenApi.openCard(parOpenCard));
         int code = (int) openCardJSON.get("errorCode");
         if (code == 0) {
@@ -301,7 +307,32 @@ public class HKServiceImpl implements IHKService {
         downloadFingerMap.put("opType", 1);
         downloadFingerMap.put("personIds", map.get("personIds"));
         downloadFingerMap.put("longNums", map.get("longNums"));
+        downloadFingerMap.put("openapi_ip_port_http", map.get("openapi_ip_port_http"));
         // 可视对讲 指定人员指纹权限下载
         HKOpenApi.downloadFinger(downloadFingerMap);
     }
+
+    @Override
+    public ResponseBean syncControl(Integer userVerifyId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 查询当前的房产
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
+
+        // TODO 查询设备编号
+
+        Map<String,Object> parMap = com.beust.jcommander.internal.Maps.newHashMap();
+        parMap.put("longNums", "10010100000");
+        parMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        String data = HKOpenApi.syncControl(parMap);
+        JSONObject jsonObject = JSONObject.parseObject(data);
+        int errorCode = jsonObject.getInteger("errorCode");
+        if (errorCode == 0) {
+            responseBean.addSuccess("操作成功!");
+            return responseBean;
+        }
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
 }

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

@@ -53,6 +53,10 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
         // 获取最新的车牌信息
         getTaUserLicense(carNo, taUserLicense);
 
+        if (taUserLicense.getLicenseType().intValue() != 1) {
+            throw new WisdomException("该车牌不是月租车！");
+        }
+
         int rows = 0;
         if (null == taUserLicense.getId()) {
             rows = taUserLicenseMapper.insertSelective(taUserLicense);
@@ -129,18 +133,19 @@ public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
 
         // 获取到的车牌信息
         Map<String,Object> map = (Map<String,Object>)resultCar;
-        Integer dataType = (Integer) map.get("DataType");
-        if (dataType.intValue() != 1) {
-            throw new WisdomException("该车牌不是月租车！");
-        }
 
         Map<String,Object> jsonParam = (Map<String, Object>) map.get("JsonParam");
 
+        Integer dataType = (Integer) map.get("DataType");
+        // 车类型
+        taUserLicense.setLicenseType(dataType);
+
         taUserLicense.setLicensePlate(carNo);
         String price = String.valueOf(Double.valueOf(((BigDecimal) jsonParam.get("Cost")).toString()) * 100);
         taUserLicense.setUnitPrice(price.substring(0, price.lastIndexOf(".")));
         taUserLicense.setCreateDate(new Date());
         taUserLicense.setParkingLot(String.valueOf(jsonParam.get("ParkingName")));
+        taUserLicense.setRenewTime(Integer.valueOf(String.valueOf(jsonParam.get("RenewTime"))));
 
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
         try {

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

@@ -119,6 +119,9 @@ public class TaUserServiceImpl implements ITaUserService {
     @Autowired
     private TpEquipmentMapper tpEquipmentMapper;
 
+    @Autowired
+    private TpEquipmentTreeMapper tpEquipmentTreeMapper;
+
     /**
      * 期
      */
@@ -328,7 +331,8 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("号码已占用");
             return response;
         }
-        String data = HKOpenApi.HKpersonPhone(user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), phone);
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userElement.getCommunityId());
+        String data = HKOpenApi.HKpersonPhone(user.getHkUserId(), user.getHkPersonNo(), user.getUserName(), phone, tpEquipmentTree.getHttpServer());
         JSONObject jsonobject = JSONObject.parseObject(data);
         int errorCode = jsonobject.getInteger("errorCode");
         if (errorCode != 0) {
@@ -705,7 +709,7 @@ public class TaUserServiceImpl implements ITaUserService {
         addOrUpdateUserRole(type, response, user, false);
 
         // 推送海康
-        updateUser(response, user);
+       //  updateUser(response, user, );
 
         // 下发门禁权限
 //         HKOpenApi.downloadAuthorityByDeviceUuids();
@@ -736,7 +740,9 @@ public class TaUserServiceImpl implements ITaUserService {
      * @param response
      * @param user
      */
-    private void updateUser(ResponseBean response, TaUser user) {
+    private void updateUser(ResponseBean response, TaUser user, Integer communityId) {
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
+
         Map<String, Object> parDept = Maps.newHashMap();
         parDept.put("pageNo", 1);
         parDept.put("pageSize", 100);
@@ -751,6 +757,7 @@ public class TaUserServiceImpl implements ITaUserService {
         parUser.put("personName", user.getUserName());
         parUser.put("phoneNo", user.getLoginName());
         parUser.put("deptUuid", deptUuid);
+        parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.updateUser(parUser), HashMap.class);
         int errorCode = (int) resultMap.get("errorCode");
         if (errorCode == 0) {

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

@@ -117,7 +117,7 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
         TaUser taUser = taUserMapper.selectByPrimaryKey(userId);
         String result = HKOpenApi.temporaryRegister(visitor.getVisitorName(),visitor.getVisitorTel(),
                 Integer.valueOf(visitor.getVisitorNum()),visitor.getVisitorStartTime().getTime(),
-                visitor.getVisitorEndTime().getTime(),taUser.getHkUserId(), tpEquipmentTree.getOpUserUuid(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
+                visitor.getVisitorEndTime().getTime(),taUser.getHkUserId(), tpEquipmentTree.getOpUserUuid(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret(), tpEquipmentTree.getHttpServer());
 
         JSONObject resultJSON = JSONObject.parseObject(result);
         int errorCode = resultJSON.getInteger("errorCode");

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

@@ -1,40 +0,0 @@
-package com.community.huiju.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.beust.jcommander.internal.Maps;
-import com.community.commom.mode.ResponseBean;
-import com.community.commom.session.UserElement;
-import com.community.commom.hk.HKOpenApi;
-import com.community.huiju.service.IVisualIntercomService;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * 可视对讲的业务实现
- * @author weiximei
- */
-@Service
-public class VisualIntercomServiceImpl implements IVisualIntercomService {
-
-
-    @Override
-    public ResponseBean syncControl(UserElement userElement) {
-        ResponseBean responseBean = new ResponseBean();
-
-        // TODO 这里应该根据 小区期楼栋号查询出这个楼栋下面的门口机, 然后发送开门
-
-        Map<String,Object> parMap = Maps.newHashMap();
-        // TODO 只有一个设备, 临时固定的编号
-        parMap.put("longNums", "10010100000");
-        String data = HKOpenApi.syncControl(parMap);
-        JSONObject jsonObject = JSONObject.parseObject(data);
-        int errorCode = jsonObject.getInteger("errorCode");
-        if (errorCode == 0) {
-            responseBean.addSuccess("操作成功!");
-            return responseBean;
-        }
-        responseBean.addError("操作失败!");
-        return responseBean;
-    }
-}

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

@@ -28,6 +28,7 @@ import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -362,6 +363,18 @@ public class WxPayServiceImpl implements WxPayServiceI {
 					taUserLicense = (TaUserLicense) licenseData;
 				}
 
+				// 校验车状态
+				if (taUserLicense.getLicenseType().intValue() != 1) {
+					throw new WisdomException("异常状态，不能缴月租费!");
+				}
+
+				// 校验是否，超出缴费有效期时间
+				LocalDateTime expireDateLocalDateTime = LocalDateTime.ofInstant(taUserLicense.getExpireDate().toInstant(), ZoneId.systemDefault());
+				expireDateLocalDateTime.plusDays(taUserLicense.getRenewTime());
+				if (System.currentTimeMillis() > expireDateLocalDateTime.toEpochSecond(ZoneOffset.of("+8"))) {
+					throw new WisdomException("已超出续费时间，请找物业处理!");
+				}
+
 				TaUserLicenseOrder taUserLicenseOrder = new TaUserLicenseOrder();
 				taUserLicenseOrder.setCommunityId(userElement.getCommunityId());
 				taUserLicenseOrder.setTaUserId(userElement.getId());

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

@@ -14,10 +14,12 @@
     <result column="create_user" property="createUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
+    <result column="renew_time" property="renewTime" jdbcType="INTEGER" />
+    <result column="license_type" property="licenseType" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, ta_user_id, license_plate, order_number, expire_date, unit_price,
-    parking_lot, create_date, create_user, update_date, update_user
+    parking_lot, create_date, create_user, update_date, update_user, renew_time, license_type
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -33,15 +35,15 @@
     insert into ta_user_license (id, community_id, ta_user_id,
       license_plate, order_number, expire_date,
       unit_price, parking_lot, create_date,
-      create_user, update_date, update_user
-      )
+      create_user, update_date, update_user,
+      renew_time, license_type)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER},
       #{licensePlate,jdbcType=VARCHAR}, #{orderNumber,jdbcType=VARCHAR}, #{expireDate,jdbcType=TIMESTAMP},
       #{unitPrice,jdbcType=VARCHAR}, #{parkingLot,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP},
-      #{createUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}
-      )
+      #{createUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER},
+      #{renewTime,jdbcType=INTEGER}, #{licenseType,jdbcType=INTEGER})
   </insert>
-  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserLicense"  useGeneratedKeys="true" keyColumn="id" keyProperty="id" >
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserLicense" useGeneratedKeys="true" keyColumn="id" keyProperty="id" >
     insert into ta_user_license
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -80,6 +82,12 @@
       <if test="updateUser != null" >
         update_user,
       </if>
+      <if test="renewTime != null" >
+        renew_time,
+      </if>
+      <if test="licenseType != null" >
+        license_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -118,6 +126,12 @@
       <if test="updateUser != null" >
         #{updateUser,jdbcType=INTEGER},
       </if>
+      <if test="renewTime != null" >
+        #{renewTime,jdbcType=INTEGER},
+      </if>
+      <if test="licenseType != null" >
+        #{licenseType,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUserLicense" >
@@ -156,6 +170,12 @@
       <if test="updateUser != null" >
         update_user = #{updateUser,jdbcType=INTEGER},
       </if>
+      <if test="renewTime != null" >
+        renew_time = #{renewTime,jdbcType=INTEGER},
+      </if>
+      <if test="licenseType != null" >
+        license_type = #{licenseType,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -171,8 +191,9 @@
       create_date = #{createDate,jdbcType=TIMESTAMP},
       create_user = #{createUser,jdbcType=INTEGER},
       update_date = #{updateDate,jdbcType=TIMESTAMP},
-      update_user = #{updateUser,jdbcType=INTEGER}
+      update_user = #{updateUser,jdbcType=INTEGER},
+      renew_time = #{renewTime,jdbcType=INTEGER},
+      license_type = #{licenseType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
-
 </mapper>

CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/FuShiRequestAPI.java

@@ -189,5 +189,39 @@ public class FuShiRequestAPI {
     }
 
 
+    /**
+     * 获取月租车信息（通过车牌号）
+     * @return
+     */
+    public String parkGetMonthCardInfoByCarNo(String ParkingCode, String CarNo) {
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("ParkingCode", ParkingCode);
+        map.put("CarNo", CarNo);
+        String json = JSONObject.toJSONString(map);
+        log.info("获取月租车信息（通过车牌号） 请求参数：{}", json);
+        SignBuild signBuild = requestSign(json);
+        String result = client.doJsonPost(FushiConstant.PARK_GETMONTHCARDINFOBYCARNO, json, signBuild.getSign(), signBuild.getTimestamp());
+        showException(result);
+        log.info("获取月租车信息（通过车牌号） 返回数据：{}", result);
+        return result;
+    }
+
+    /**
+     * 获取临时车信息（通过车牌号）
+     * @return
+     */
+    public String parkGetTempCarPaymentInfoByCarNo(String ParkingCode, String CarNo) {
+        Map<String, Object> map = Maps.newHashMap();
+        map.put("ParkingCode", ParkingCode);
+        map.put("CarNo", CarNo);
+        String json = JSONObject.toJSONString(map);
+        log.info("获取临时车信息（通过车牌号） 请求参数：{}", json);
+        SignBuild signBuild = requestSign(json);
+        String result = client.doJsonPost(FushiConstant.PARK_GETTEMPCARPAYMENTINFOBYCARNO, json, signBuild.getSign(), signBuild.getTimestamp());
+        showException(result);
+        log.info("获取临时车信息（通过车牌号） 返回数据：{}", result);
+        return result;
+    }
+
 
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/fushi/FushiConstant.java

@@ -26,4 +26,14 @@ public class FushiConstant {
      */
     public static final String CALCULATIONCOST_APIGETOFFLINEFEE = "/CalculationCost/ApiGetOfflineFee";
 
+    /**
+     * 获取月租车信息（通过车牌号）
+     */
+    public static final String PARK_GETMONTHCARDINFOBYCARNO = "/Park/GetMonthCardInfoByCarNo";
+
+    /**
+     * 获取临时车信息（通过车牌号）
+     */
+    public static final String PARK_GETTEMPCARPAYMENTINFOBYCARNO = "/Park/GetTempCarPaymentInfoByCarNo";
+
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKOpenApi.java

@@ -26,7 +26,7 @@ public class HKOpenApi {
      */
     public static String getMonitoryPoint(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -58,7 +58,7 @@ public class HKOpenApi {
      */
     public static String getDeptName(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_LIKE_DEPT_NAME;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_LIKE_DEPT_NAME;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -91,7 +91,7 @@ public class HKOpenApi {
      */
     public static String addUser(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADD_USER;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_ADD_USER;
         //设置APPKEY获取中心信息
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -125,7 +125,7 @@ public class HKOpenApi {
      */
     public static String openCard(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_OPEN_CARD;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_OPEN_CARD;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -157,7 +157,7 @@ public class HKOpenApi {
      */
     public static String getACDevicesByUnitUuids(Map<String, Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -188,7 +188,7 @@ public class HKOpenApi {
      */
     public static String getDoors(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GET_DOORS; // HKConstant.ITF_MONITORY_POINT;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GET_DOORS; // HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -218,7 +218,7 @@ public class HKOpenApi {
      */
     public static String getUnitsByUuids(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -248,7 +248,7 @@ public class HKOpenApi {
      */
     public static String getRegionsByUnitUuid(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_MONITORY_POINT;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_MONITORY_POINT;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -279,7 +279,7 @@ public class HKOpenApi {
      */
     public static String getDoorsByRegionUuids(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOORS_BY_REGION_UUIDS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOORS_BY_REGION_UUIDS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -307,7 +307,7 @@ public class HKOpenApi {
      */
     public static String addAuthoritiesByPersonIds(Map<String, Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ADD_AUTHORITIES_BY_PERSONIDS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ADD_AUTHORITIES_BY_PERSONIDS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -339,7 +339,7 @@ public class HKOpenApi {
      */
     public static String downloadAuthorityByDeviceUuids(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_AUTHORITY_BY_DEVICEUUIDS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOWNLOAD_AUTHORITY_BY_DEVICEUUIDS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -370,7 +370,7 @@ public class HKOpenApi {
      */
     public static String downloadAuthorityByPersonIds(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_AUTHORITY_BY_PERSONIDS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOWNLOAD_AUTHORITY_BY_PERSONIDS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -407,7 +407,7 @@ public class HKOpenApi {
     public static String getPlans(Integer pageNo, Integer pageSize, Map<String, Object> map) {
 
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETPLANS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GETPLANS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -436,7 +436,7 @@ public class HKOpenApi {
      */
     public static String downloadFaceAndFingerInfos(Map<String, Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOAD_FACE_AND_FINGERINFOS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOWNLOAD_FACE_AND_FINGERINFOS;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -468,8 +468,8 @@ public class HKOpenApi {
      * personName 名称
      * @return
      */
-    public static String HKpersonGroupId(MultipartFile faceImg,Integer personNo,String personName){
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADD_USER;
+    public static String HKpersonGroupId(MultipartFile faceImg,Integer personNo,String personName, String openapi_ip_port_http){
+        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.ITF_ADD_USER;
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         map.put("time", System.currentTimeMillis());
@@ -498,7 +498,7 @@ public class HKOpenApi {
      *  * personName 卡号
      * @return
      */
-    public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Long personNo,String personName,String cardNo, String  appkey, String secret) {
+    public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Long personNo,String personName,String cardNo, String  appkey, String secret, String openapi_ip_port_http) {
         byte [] fileByte = new byte[0];
         try {
             if (null!=faceImg) {
@@ -510,7 +510,7 @@ public class HKOpenApi {
         byte[] imgs=PicUtils.compressPicForScale(fileByte,99L,"x");
 
         String img = PicUtils.getImgStr(imgs);
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
+        String url = openapi_ip_port_http == null  ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         map.put("time", System.currentTimeMillis());
@@ -544,7 +544,7 @@ public class HKOpenApi {
      * @return
      */
     public static String updateUser(Map<String,Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -581,9 +581,9 @@ public class HKOpenApi {
      * @param personId 被访人ID
      * @return
      */
-    public static String temporaryRegister(String visitorName, String phoneNo,Integer personNum,Long startTime,Long endTime,Integer personId, String opUserUuid, String appkey, String secret){
+    public static String temporaryRegister(String visitorName, String phoneNo,Integer personNum,Long startTime,Long endTime,Integer personId, String opUserUuid, String appkey, String secret, String openapi_ip_port_http){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.TEMPORARY_REGISTER;
+        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.TEMPORARY_REGISTER;
         //设置APPKEY
         parMap.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         //设置时间参数
@@ -623,9 +623,9 @@ public class HKOpenApi {
      * @param phoneNo 电话
      * @return
      */
-    public static String HKpersonPhone(Integer personId,Long personNo,String personName,String phoneNo) {
+    public static String HKpersonPhone(Integer personId,Long personNo,String personName,String phoneNo, String openapi_ip_port_http) {
 
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
+        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         map.put("time", System.currentTimeMillis());
@@ -666,7 +666,7 @@ public class HKOpenApi {
      */
     public static String HKgetDoorDevicesByUnitUuids(Map<String, Object> map){
 
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETDOORDEVICESBYUNITUUIDS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GETDOORDEVICESBYUNITUUIDS;
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
@@ -703,7 +703,7 @@ public class HKOpenApi {
      * @return
      */
     public static String syncControl(Map<String, Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.SYNCCONTROL;
+        String url =  map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") +  HKConstant.SYNCCONTROL;
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
@@ -733,8 +733,8 @@ public class HKOpenApi {
      * @param longNums
      * @return
      */
-    public static String visualIntercom(String opUserUuid, Integer opType,List<Integer> personIds,List<String> longNums, String appkey, String secret) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOADFACE;
+    public static String visualIntercom(String opUserUuid, Integer opType,List<Integer> personIds,List<String> longNums, String appkey, String secret, String openapi_ip_port_http) {
+        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.DOWNLOADFACE;
         HashMap map = new HashMap<>();
         map.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         map.put("time", System.currentTimeMillis());
@@ -767,7 +767,7 @@ public class HKOpenApi {
      * @return
      */
     public static String addOutDoorAuth(Map<String, Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ADDOUTDOORAUTH;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ADDOUTDOORAUTH;
 
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -804,7 +804,7 @@ public class HKOpenApi {
      * @return
      */
     public static String delOutDoorAuth(Map<String, Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DELOUTDOORAUTH;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DELOUTDOORAUTH;
 
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -841,7 +841,7 @@ public class HKOpenApi {
      * @return
      */
     public static String downloadFinger(Map<String, Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.DOWNLOADFINGER;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.DOWNLOADFINGER;
 
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -872,7 +872,7 @@ public class HKOpenApi {
      * @return
      */
     public static String getUsers(Map<String, Object> map){
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETUSERS;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GETUSERS;
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
@@ -901,7 +901,7 @@ public class HKOpenApi {
      * @return
      */
     public static String getPersonInfosEx(Map<String, Object> map){
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.GETPERSONINFOSEX;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.GETPERSONINFOSEX;
         Map<String, Object> parMap = new HashMap<>();
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         parMap.put("time", System.currentTimeMillis());
@@ -928,9 +928,9 @@ public class HKOpenApi {
      *  获取默认用户UUID
      * @return
      */
-    public static String getDefaultUserUuid(String appkey, String secret){
+    public static String getDefaultUserUuid(String appkey, String secret, String openapi_ip_port_http){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADDRESS_GET_DEFAULT_USER_UUID;
+        String url = openapi_ip_port_http == null ? HKConstant.OPENAPI_IP_PORT_HTTP : openapi_ip_port_http + HKConstant.ITF_ADDRESS_GET_DEFAULT_USER_UUID;
         //设置APPKEY
         parMap.put("appkey", appkey == null?HKConstant.APPKEY:appkey);
         //设置时间参数
@@ -979,7 +979,7 @@ public class HKOpenApi {
      *     删除当前人脸设备信息
      */
     public static String deleteUser(Map<String,Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_DELETE_USER;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_DELETE_USER;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -1008,7 +1008,7 @@ public class HKOpenApi {
      *     查询当前人脸设备信息
      */
     public static String selectUserFace(Map<String,Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_SELECT_USER;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_SELECT_USER;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -1037,7 +1037,7 @@ public class HKOpenApi {
      * @return
      */
     public static String selectUserSynchronization(Map<String,Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_SELECT_USER_SDH;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_SELECT_USER_SDH;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -1064,7 +1064,7 @@ public class HKOpenApi {
      * @return
      */
     public static String appointJurisdiction(Map<String,Object> map) {
-        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_SELECT_APPOIN;
+        String url = map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http") + HKConstant.ITF_SELECT_APPOIN;
         Map<String, Object> parMap = new HashMap<String, Object>();
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
@@ -1093,5 +1093,4 @@ public class HKOpenApi {
         return data;
     }
 
-
 }

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

@@ -0,0 +1,62 @@
+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.service.ITaUserLicenseOrderService;
+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.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.HttpSession;
+
+/**
+ * <p>
+ * 月租车缴费订单表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "月租车缴费订单表", description = "月租车缴费订单表")
+public class TaUserLicenseOrderController extends BaseController {
+
+    @Autowired
+    private ITaUserLicenseOrderService iTaUserLicenseOrderService;
+
+    @RequestMapping(value = "/user/license/order", method = RequestMethod.GET)
+    @ApiOperation(value = "获取月租车缴费记录", notes = "获取月租车缴费记录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "header", name = "X-Auth-Token", value = "Token"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "licensePlate", value = "车牌号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "orderNumber", value = "订单号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "paymentName", value = "缴费人姓名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "paymentTel", value = "缴费人手机号"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageNum", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "pageSize", value = "一页多少条"),
+    })
+    public ResponseBean getAll(@RequestParam(value = "id",required = false) Integer id,
+                               @RequestParam(value = "licensePlate",required = false) String licensePlate,
+                               @RequestParam(value = "orderNumber",required = false) String orderNumber,
+                               @RequestParam(value = "paymentName",required = false) String paymentName,
+                               @RequestParam(value = "paymentTel",required = false) String paymentTel,
+                               @RequestParam(value = "pageNum",defaultValue = "1", required = false) Integer pageNum,
+                               @RequestParam(value = "pageSize" ,defaultValue = "10", required = false) Integer pageSize,
+                               HttpSession session) {
+
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = iTaUserLicenseOrderService.getAll(id, licensePlate, orderNumber, paymentName, paymentTel, pageNum, pageSize, userElement);
+        return responseBean;
+    }
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaUserLicenseOrder;
+
+/**
+ * <p>
+ * 月租车缴费订单表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface TaUserLicenseOrderMapper extends BaseMapper<TaUserLicenseOrder> {
+
+}

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

@@ -0,0 +1,118 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+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-05-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_user_license_order")
+public class TaUserLicenseOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 小区ID
+     */
+    private Integer communityId;
+
+    /**
+     * 人员ID
+     */
+    private Integer taUserId;
+
+    /**
+     * 订单号
+     */
+    private String orderNumber;
+
+    /**
+     * 支付状态  0：未支付  1: 已支付 2: 正在支付中 3:已关闭
+     */
+    private String orderStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 延期月份
+     */
+    private Integer extensionMonth;
+
+    /**
+     * 延期费用
+     */
+    private String extensionPrice;
+
+    /**
+     * 缴费手机号
+     */
+    private String paymentTel;
+
+    /**
+     * 缴费人姓名
+     */
+    private String paymentName;
+
+    /**
+     * 缴费方式 0是微信支付 2是支付宝 
+     */
+    private String paymentType;
+
+    /**
+     * 到期时间
+     */
+    private LocalDateTime expireDate;
+
+    /**
+     * 单价费用
+     */
+    private String unitPrice;
+
+    /**
+     * 停车场
+     */
+    private String parkingLot;
+
+    /**
+     * 车牌号
+     */
+    private String licensePlate;
+
+
+}

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

@@ -0,0 +1,29 @@
+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.TaUserLicenseOrder;
+
+/**
+ * <p>
+ * 月租车缴费订单表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+public interface ITaUserLicenseOrderService extends IService<TaUserLicenseOrder> {
+
+    /**
+     * 获取所有缴费记录
+     * @param id
+     * @param licensePlate
+     * @param orderNumber
+     * @param paymentName
+     * @param paymentTel
+     * @return
+     */
+    ResponseBean getAll(Integer id, String licensePlate, String orderNumber, String paymentName, String paymentTel, Integer pageNum, Integer pageSize, UserElement userElement);
+
+}

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

@@ -0,0 +1,44 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.TaUserLicenseOrder;
+import com.community.huiju.dao.TaUserLicenseOrderMapper;
+import com.community.huiju.service.ITaUserLicenseOrderService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 月租车缴费订单表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-13
+ */
+@Service
+public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrderMapper, TaUserLicenseOrder> implements ITaUserLicenseOrderService {
+
+    @Override
+    public ResponseBean getAll(Integer id, String licensePlate, String orderNumber, String paymentName, String paymentTel, Integer pageNum, Integer pageSize, UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaUserLicenseOrder> page = new Page<>();
+        page.setSize(pageSize);
+        page.setCurrent(pageNum);
+        QueryWrapper<TaUserLicenseOrder> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(id != null ,"id", id);
+        queryWrapper.like(StringUtils.isNotBlank(licensePlate), "license_plate", licensePlate);
+        queryWrapper.like(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
+        queryWrapper.like(StringUtils.isNotBlank(paymentName), "payment_name", paymentName);
+        queryWrapper.like(StringUtils.isNotBlank(paymentTel), "payment_tel", paymentTel);
+        queryWrapper.eq("community_id", userElement.getCommunityId());
+
+        IPage<TaUserLicenseOrder> orderIPage = this.page(page, queryWrapper);
+        responseBean.addSuccess(orderIPage);
+        return responseBean;
+    }
+}

CODE/smart-community/property-api/src/main/resources/mapper/TaUserLicenseOrderMapper.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.TaUserLicenseOrderMapper">
+
+</mapper>

VUECODE/smart-property-manage/src/api/license.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 查询月租车记录
+export function getLicenseAll(data) {
+  return request({
+    url: '/user/license/order',
+    method: 'get',
+    params: {
+      id: data.id,
+      licensePlate: data.licensePlate,
+      orderNumber: data.orderNumber,
+      paymentName: data.paymentName,
+      paymentTel: data.paymentTel,
+      pageNum: data.pageNum,
+      pageSize: data.pageSize
+    }
+  })
+}

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

@@ -335,6 +335,12 @@ export const constantRouterMap = [
         name: 'bill-statement-info-index',
         hidden: true,
         meta: { title: '订单详情', icon: 'table' }
+      },
+      {
+        path: '/bill/management/license',
+        component: () => import('@/views/bill/license/index'),
+        name: 'bill-license',
+        meta: { title: '月租车续费', icon: 'table' }
       }
     ]
   },

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

@@ -22,6 +22,7 @@ import message from './modules/message'
 import buildingTree from './modules/buildingTree'
 import equipment from './modules/equipment'
 import shopType from './modules/shopType'
+import license from './modules/license'
 
 Vue.use(Vuex)
 
@@ -47,7 +48,8 @@ const store = new Vuex.Store({
     message,
     buildingTree,
     equipment,
-    shopType
+    shopType,
+    license
   },
   getters
 })

VUECODE/smart-property-manage/src/store/modules/license.js

@@ -0,0 +1,23 @@
+import { getLicenseAll } from '@/api/license'
+
+const license = {
+  state: {
+
+  },
+  mutations: {
+
+  },
+  actions: {
+    GetLicenseAll({ commit }, data) {
+      return new Promise((resolve, reject) => { // 查询月租车记录
+        getLicenseAll(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    }
+  }
+}
+
+export default license

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

@@ -0,0 +1,221 @@
+<template>
+  <div id="root">
+    <el-form :inline="true" :model="listQuery" class="form-inline">
+      <el-form-item label="编号">
+        <el-input v-model="listQuery.id" placeholder="编号"/>
+      </el-form-item>
+      <el-form-item label="车牌号">
+        <el-input v-model="listQuery.licensePlate" placeholder="车牌号"/>
+      </el-form-item>
+      <el-form-item label="缴费订单号">
+        <el-input v-model="listQuery.orderNumber" placeholder="缴费订单号"/>
+      </el-form-item>
+      <el-form-item label="缴费人姓名">
+        <el-input v-model="listQuery.paymentName" placeholder="缴费人姓名"/>
+      </el-form-item>
+      <el-form-item label="缴费人手机号">
+        <el-input v-model="listQuery.paymentTel" placeholder="缴费人手机号"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="info" @click="clearQuery">清空</el-button>
+        <el-button type="primary" @click="query">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <div>
+      <el-button type="primary" @click="exportLicense">导出数据</el-button>
+    </div>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      border
+      style="width: 100%">
+      <el-table-column
+        prop="id"
+        label="编号"
+        align="center"
+        width="180"/>
+      <el-table-column
+        prop="licensePlate"
+        label="车牌号"
+        align="center"
+        width="180"/>
+      <el-table-column
+        prop="extensionMonth"
+        align="center"
+        label="续期时长（月）"/>
+      <el-table-column
+        prop="extensionPrice"
+        align="center"
+        label="续期费用（元）">
+        <template slot-scope="scope">{{ scope.row.extensionPrice / 100 }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="orderNumber"
+        align="center"
+        label="缴费订单号"/>
+      <el-table-column
+        prop="paymentTel"
+        align="center"
+        label="缴费人手机号"/>
+      <el-table-column
+        prop="paymentName"
+        align="center"
+        label="缴费人姓名"/>
+      <el-table-column
+        prop="paymentType"
+        align="center"
+        label="缴费方式">
+        <template slot-scope="scope">{{ showPayType(scope.row.paymentType) }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="expireDate"
+        align="center"
+        label="延期后到期日">
+        <template slot-scope="scope">{{ formatDate(scope.row.expireDate) }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="orderStatus"
+        align="center"
+        label="订单状态">
+        <template slot-scope="scope">{{ showStatus(scope.row.orderStatus) }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="updateDate"
+        align="center"
+        label="缴费完成时间">
+        <template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template>
+      </el-table-column>
+    </el-table>
+    <div class="block-page">
+      <el-pagination
+        :current-page="listQuery.pageNum"
+        :page-sizes="[10, 20, 40, 80]"
+        :page-size="listQuery.pageSize"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'License',
+  data() {
+    return {
+      listQuery: {
+        id: '',
+        licensePlate: '',
+        orderNumber: '',
+        paymentName: '',
+        paymentTel: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      list: [],
+      total: 0,
+      loading: false
+    }
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    formatDate(val) {
+      if (val === null || val === '') {
+        return ''
+      }
+      var value = new Date(val)
+      var year = value.getFullYear()
+      var month = value.getMonth() + 1
+      var day = value.getDate()
+      // var hour = value.getHours()
+      // var minutes = value.getMinutes()
+      // var seconds = value.getSeconds()
+      // return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds
+      return year + '-' + month + '-' + day
+    },
+    showPayType(obj) {
+      let str = ''
+      switch (obj) {
+        case '0':
+          str = '微信缴费'
+          break
+        case '1':
+          str = '线下缴费'
+          break
+        case '2':
+          str = '支付宝缴费'
+          break
+      }
+      return str
+    },
+    clearQuery() {
+      this.listQuery.id = ''
+      this.listQuery.licensePlate = ''
+      this.listQuery.orderNumber = ''
+      this.listQuery.paymentName = ''
+      this.listQuery.paymentTel = ''
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.getData()
+    },
+    query() {
+      this.listQuery.pageNum = 1
+      this.listQuery.pageSize = 10
+      this.getData()
+    },
+    getData() {
+      this.loading = true
+      this.$store.dispatch('GetLicenseAll', this.listQuery).then((res) => {
+        const resCode = res.code
+        if (resCode === '1') {
+          this.loading = false
+          this.$message.error(res.message)
+          return
+        }
+        const resData = res.data
+        this.list = resData.records
+        this.listQuery.pageNum = resData.current
+        this.listQuery.pageSize = resData.size
+        this.total = resData.total
+        this.loading = false
+      }).catch(() => {
+        console.log('error GetLicenseAll')
+        this.loading = false
+      })
+    },
+    showStatus(val) {
+      let str = ''
+      switch (val) {
+        case '0':
+          str = '未支付'
+          break
+        case '1':
+          str = '已支付'
+          break
+        case '2':
+          str = '正在支付中'
+          break
+        case '3':
+          str = '已关闭'
+          break
+      }
+      return str
+    }
+  }
+}
+</script>
+
+<style scoped>
+.form-inline {
+  margin-top: 20px;
+  margin-left: 20px;
+  margin-right: 20px;
+}
+.block-page {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>