修复 bug，完成 月租车APP 端接口

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/perproties/PayNotifyPerproties.java

@@ -16,11 +16,11 @@ public class PayNotifyPerproties {
     /**
      * 微信回调
      */
-    private String wxNotify;
+    private String wxBillNotify;
 
     /**
      * 支付宝回调
      */
-    private String aliNotify;
+    private String aliBillNotify;
 
 }

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

@@ -0,0 +1,68 @@
+package com.community.huiju.controller;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.service.ITaUserLicenseService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpSession;
+
+@RestController
+@RefreshScope
+@RequestMapping("/")
+@Api(value = "用户车牌操作的API",description = "用户车牌操作的API")
+public class UserLicenseController extends BaseController {
+
+    @Autowired
+    private ITaUserLicenseService iTaUserLicenseService;
+
+    @ApiOperation(value = "关联车牌", notes = "关联车牌")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNo", value = "车牌号"),
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "/license/associated/{carNo}", method = RequestMethod.POST)
+    public ResponseBean associatedLicense(@PathVariable("carNo") String carNo, HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserLicenseService.associatedLicense(userElement, carNo);
+        return responseBean;
+    }
+
+    @ApiOperation(value = "用户所有车牌", notes = "用户所有车牌")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
+    })
+    @RequestMapping(value = "/license/user/all", method = RequestMethod.GET)
+    public ResponseBean getAllUserLicense(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserLicenseService.getAllUserLicense(userElement);
+
+        return responseBean;
+    }
+
+    @ApiOperation(value = "用户删除车牌", notes = "用户删除车牌")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "车牌id")
+    })
+    @RequestMapping(value = "/license/user/{id}", method = RequestMethod.DELETE)
+    public ResponseBean deleteUserLicense(@PathVariable("id") Integer id,HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        UserElement userElement = getUserElement(session);
+        responseBean = iTaUserLicenseService.deleteUserLicense(userElement, id);
+
+        return responseBean;
+    }
+
+}

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

@@ -0,0 +1,52 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaUserLicense;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TaUserLicenseMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaUserLicense record);
+
+    int insertSelective(TaUserLicense record);
+
+    TaUserLicense selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaUserLicense record);
+
+    int updateByPrimaryKey(TaUserLicense record);
+
+    /**
+     * 根据用户id 和 小区id 和 车牌号 进行查询
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_license where community_id=#{communityId} and ta_user_id = #{userId} and license_plate = #{licensePlate}")
+    TaUserLicense selectByUserIdAndCommunityIdAndLicensePlate(@Param("communityId") Integer communityId, @Param("userId") Integer userId, @Param("licensePlate") String licensePlate);
+
+    /**
+     * 根据用户id  和 小区 进行查询
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_license where community_id=#{communityId} and ta_user_id = #{userId}")
+    List<TaUserLicense> selectAllByCommunityIdAndUserId(@Param("communityId") Integer communityId, @Param("userId") Integer userId);
+
+
+    /**
+     * 根据用户id 和 小区id 和 车牌id 进行查询
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_license where community_id=#{communityId} and ta_user_id = #{userId} and id = #{id}")
+    TaUserLicense selectByUserIdAndCommunityIdAndLicenseId(@Param("communityId") Integer communityId, @Param("userId") Integer userId, @Param("id") Integer id);
+
+}

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

@@ -0,0 +1,32 @@
+package com.community.huiju.dao;
+
+import com.community.huiju.model.TaUserLicenseOrder;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface TaUserLicenseOrderMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TaUserLicenseOrder record);
+
+    int insertSelective(TaUserLicenseOrder record);
+
+    TaUserLicenseOrder selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TaUserLicenseOrder record);
+
+    int updateByPrimaryKey(TaUserLicenseOrder record);
+
+    /**
+     * 缴费记录
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from ta_user_license_order where community_id = #{communityId} and ta_user_id = #{userId} and order_status = 1")
+    List<TaUserLicenseOrder> selectRecords(@Param("communityId") Integer communityId, @Param("userId") Integer userId);
+}

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

@@ -0,0 +1,125 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaUserLicense {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserId;
+
+    private String licensePlate;
+
+    private String orderNumber;
+
+    private Date expireDate;
+
+    private String unitPrice;
+
+    private String parkingLot;
+
+    private Date createDate;
+
+    private Integer createUser;
+
+    private Date updateDate;
+
+    private Integer updateUser;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public String getLicensePlate() {
+        return licensePlate;
+    }
+
+    public void setLicensePlate(String licensePlate) {
+        this.licensePlate = licensePlate == null ? null : licensePlate.trim();
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber == null ? null : orderNumber.trim();
+    }
+
+    public Date getExpireDate() {
+        return expireDate;
+    }
+
+    public void setExpireDate(Date expireDate) {
+        this.expireDate = expireDate;
+    }
+
+    public String getUnitPrice() {
+        return unitPrice;
+    }
+
+    public void setUnitPrice(String unitPrice) {
+        this.unitPrice = unitPrice == null ? null : unitPrice.trim();
+    }
+
+    public String getParkingLot() {
+        return parkingLot;
+    }
+
+    public void setParkingLot(String parkingLot) {
+        this.parkingLot = parkingLot == null ? null : parkingLot.trim();
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+}

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

@@ -0,0 +1,185 @@
+package com.community.huiju.model;
+
+import java.util.Date;
+
+public class TaUserLicenseOrder {
+    private Integer id;
+
+    private Integer communityId;
+
+    private Integer taUserId;
+
+    private String orderNumber;
+
+    private String orderStatus;
+
+    private Integer createUser;
+
+    private Date createDate;
+
+    private Integer updateUser;
+
+    private Date updateDate;
+
+    private Integer extensionMonth;
+
+    private String extensionPrice;
+
+    private String paymentTel;
+
+    private String paymentName;
+
+    private String paymentType;
+
+    private Date expireDate;
+
+    private String unitPrice;
+
+    private String parkingLot;
+
+    private String licensePlate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(Integer communityId) {
+        this.communityId = communityId;
+    }
+
+    public Integer getTaUserId() {
+        return taUserId;
+    }
+
+    public void setTaUserId(Integer taUserId) {
+        this.taUserId = taUserId;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber == null ? null : orderNumber.trim();
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus == null ? null : orderStatus.trim();
+    }
+
+    public Integer getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Integer createUser) {
+        this.createUser = createUser;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Integer updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getExtensionMonth() {
+        return extensionMonth;
+    }
+
+    public void setExtensionMonth(Integer extensionMonth) {
+        this.extensionMonth = extensionMonth;
+    }
+
+    public String getExtensionPrice() {
+        return extensionPrice;
+    }
+
+    public void setExtensionPrice(String extensionPrice) {
+        this.extensionPrice = extensionPrice == null ? null : extensionPrice.trim();
+    }
+
+    public String getPaymentTel() {
+        return paymentTel;
+    }
+
+    public void setPaymentTel(String paymentTel) {
+        this.paymentTel = paymentTel == null ? null : paymentTel.trim();
+    }
+
+    public String getPaymentName() {
+        return paymentName;
+    }
+
+    public void setPaymentName(String paymentName) {
+        this.paymentName = paymentName == null ? null : paymentName.trim();
+    }
+
+    public String getPaymentType() {
+        return paymentType;
+    }
+
+    public void setPaymentType(String paymentType) {
+        this.paymentType = paymentType == null ? null : paymentType.trim();
+    }
+
+    public Date getExpireDate() {
+        return expireDate;
+    }
+
+    public void setExpireDate(Date expireDate) {
+        this.expireDate = expireDate;
+    }
+
+    public String getUnitPrice() {
+        return unitPrice;
+    }
+
+    public void setUnitPrice(String unitPrice) {
+        this.unitPrice = unitPrice == null ? null : unitPrice.trim();
+    }
+
+    public String getParkingLot() {
+        return parkingLot;
+    }
+
+    public void setParkingLot(String parkingLot) {
+        this.parkingLot = parkingLot == null ? null : parkingLot.trim();
+    }
+
+    public String getLicensePlate() {
+        return licensePlate;
+    }
+
+    public void setLicensePlate(String licensePlate) {
+        this.licensePlate = licensePlate == null ? null : licensePlate.trim();
+    }
+}

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

@@ -47,7 +47,7 @@ public class TpBillInvoice {
     /**
      * 转换后金额，用于支付
      */
-    private Double sumPayPrice;
+    private String sumPayPrice;
 
     public Integer getId() {
         return id;
@@ -193,11 +193,11 @@ public class TpBillInvoice {
         this.payType = payType;
     }
 
-    public Double getSumPayPrice() {
+    public String getSumPayPrice() {
         return sumPayPrice;
     }
 
-    public void setSumPayPrice(Double sumPayPrice) {
+    public void setSumPayPrice(String sumPayPrice) {
         this.sumPayPrice = sumPayPrice;
     }
 }

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

@@ -35,7 +35,7 @@ public class TpBillOrder {
     /**
      * 订单总额
      */
-    private Double sumPrice;
+    private String sumPrice;
 
     /**
      * 缴费单集合
@@ -130,14 +130,6 @@ public class TpBillOrder {
         this.payPhone = payPhone;
     }
 
-    public Double getSumPrice() {
-        return sumPrice;
-    }
-
-    public void setSumPrice(Double sumPrice) {
-        this.sumPrice = sumPrice;
-    }
-
     public List<TpBillInvoice> getBillList() {
         return billList;
     }
@@ -145,4 +137,12 @@ public class TpBillOrder {
     public void setBillList(List<TpBillInvoice> billList) {
         this.billList = billList;
     }
+
+    public String getSumPrice() {
+        return sumPrice;
+    }
+
+    public void setSumPrice(String sumPrice) {
+        this.sumPrice = sumPrice;
+    }
 }

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

@@ -0,0 +1,18 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+
+/**
+ * 月租车订单
+ */
+public interface ITaUserLicenseOrderService {
+
+    /**
+     * 车辆缴费记录
+     * @param userElement
+     * @return
+     */
+    ResponseBean selectRecords(UserElement userElement);
+
+}

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

@@ -0,0 +1,34 @@
+package com.community.huiju.service;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+
+/**
+ * 月租车 业务
+ */
+public interface ITaUserLicenseService {
+
+
+    /**
+     * 关联车牌
+     * @param carNo
+     * @return
+     */
+    ResponseBean associatedLicense(UserElement userElement, String carNo);
+
+    /**
+     * 获取用户所有车牌
+     * @param userElement
+     * @return
+     */
+    ResponseBean getAllUserLicense(UserElement userElement);
+
+    /**
+     * 用户删除车牌
+     * @param userElement
+     * @param licenseId
+     * @return
+     */
+    ResponseBean deleteUserLicense(UserElement userElement, Integer licenseId);
+
+}

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

@@ -10,7 +10,7 @@ import com.community.commom.session.UserElement;
 public interface TaUserVerifyServicel {
 
     /**
-     * 获取当前 一个待审核或审核不通过房产 的数据
+     * 获取当前 一个房产审核数据 的数据
      * @param userVerifyId
      * @return
      */

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

@@ -10,9 +10,10 @@ public interface WxPayServiceI {
 	 * 微信支付统一下单
 	 * @return
 	 * @param outTradeNo
+	 * @param type 订单类型  car 车缴费 , bill 物业缴费
 	 * @param userElement
 	 */
-	Map<String, String> wxUnifiedOrder(String outTradeNo, UserElement userElement) throws Exception;
+	Map<String, String> wxUnifiedOrder(String outTradeNo, String type, UserElement userElement) throws Exception;
 	
 	/**
 	 * 支付成功的回调

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

@@ -105,7 +105,7 @@ public class AliPayServiceImpl implements AliPayServiceI {
 		model.setTotalAmount(BigDecimal.valueOf(Long.valueOf(payPrice)).divide(new BigDecimal(100)).toString());
 		model.setProductCode("QUICK_MSECURITY_PAY");
 		request.setBizModel(model);
-		request.setNotifyUrl(payNotifyPerproties.getAliNotify());
+		request.setNotifyUrl(payNotifyPerproties.getAliBillNotify());
 		try {
 			//这里和普通的接口调用不同，使用的是sdkExecute
 			AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);

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

@@ -13,6 +13,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
@@ -70,7 +71,7 @@ public class BillServiceImpl implements BillServiceI {
 		List<Map<String,Object>> billsList = tpBillInvoiceMapper.getBillsList(userElement.getCommunityId(), userElement.getRoomNoId(), payType);
 		billsList.forEach(e-> {
 			String payPrice = String.valueOf(e.get("payPrice"));
-			Double payPriceDouble = Double.parseDouble(payPrice) / 100;
+			String payPriceDouble = BigDecimal.valueOf(Long.valueOf(payPrice)).divide(new BigDecimal(100)).toString();
 			e.put("payPrice", payPriceDouble);
 		});
 		Map<String,Object> result = Maps.newHashMap();
@@ -88,7 +89,7 @@ public class BillServiceImpl implements BillServiceI {
 	public Map<String, Object> getBillInvoiceDetail(Integer communityId,Integer billInvoiceId) {
 		Map<String, Object> billInvoiceDetail = tpBillInvoiceMapper.getBillInvoiceDetail(communityId, billInvoiceId);
 		String payPrice = String.valueOf(billInvoiceDetail.get("payPrice"));
-		Double payPriceDouble = Double.parseDouble(payPrice) / 100;
+		String payPriceDouble = BigDecimal.valueOf(Long.valueOf(payPrice)).divide(new BigDecimal(100)).toString();
 		billInvoiceDetail.put("payPrice", payPriceDouble);
 		return billInvoiceDetail;
 	}
@@ -109,10 +110,11 @@ public class BillServiceImpl implements BillServiceI {
 
 			// 缴费组
 			List<TpBillInvoice> tpBillInvoices = orderList.stream().map(billOrder -> tpBillInvoiceMapper.selectByIdBillInvoiceInfo(billOrder.getTpBillInvoiceId())).collect(Collectors.toList());
-			tpBillInvoices.forEach( billInvoice -> billInvoice.setSumPayPrice(Double.parseDouble(billInvoice.getPayPrice() + "") / 100));
+			tpBillInvoices.forEach( billInvoice -> billInvoice.setSumPayPrice(BigDecimal.valueOf(Long.valueOf(billInvoice.getPayPrice())).divide(new BigDecimal(100)).toString()));
 
 			// 所有缴费组的总额
-			Double billCountPrice = Double.parseDouble(tpBillInvoices.stream().map(billCount -> billCount.getPayPrice()).count() + "") / 100;
+			String billCountPrice = BigDecimal.valueOf(Long.valueOf(tpBillInvoices.stream().map(billCount -> billCount.getPayPrice()).count())).divide(new BigDecimal(100)).toString();
+
 
 			e.setBillList(tpBillInvoices);
 			e.setSumPrice(billCountPrice);
@@ -141,10 +143,10 @@ public class BillServiceImpl implements BillServiceI {
 		}
 		// 每个缴费单数据
 		List<TpBillInvoice> tpBillInvoices = billOrderList.stream().map(e -> tpBillInvoiceMapper.selectByIdBillInvoiceInfo(e.getTpBillInvoiceId())).collect(Collectors.toList());
-		tpBillInvoices.forEach(e -> e.setSumPayPrice(Double.parseDouble(e.getPayPrice() + "") / 100));
+		tpBillInvoices.forEach(e -> e.setSumPayPrice(BigDecimal.valueOf(Long.valueOf(e.getPayPrice())).divide(new BigDecimal(100)).toString()));
 
 		// 这个订单总额
-		Double billCountPrice = Double.parseDouble(tpBillInvoices.stream().map(e -> e.getPayPrice()).count() + "") / 100;
+		String billCountPrice = BigDecimal.valueOf(Long.valueOf(tpBillInvoices.stream().map(e -> e.getPayPrice()).count())).divide(new BigDecimal(100)).toString();
 
 		// 因为订单号是多条，取第一条即可
 		TpBillOrder tpBillOrder = billOrderList.get(0);

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

@@ -0,0 +1,38 @@
+package com.community.huiju.service.impl;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TaUserLicenseOrderMapper;
+import com.community.huiju.model.TaUserLicenseOrder;
+import com.community.huiju.service.ITaUserLicenseOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 月租车 订单业务
+ */
+@Service
+@Slf4j
+public class TaUserLicenseOrderServiceImpl implements ITaUserLicenseOrderService {
+
+    @Autowired
+    private TaUserLicenseOrderMapper taUserLicenseOrderMapper;
+
+    @Override
+    public ResponseBean selectRecords(UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+        List<TaUserLicenseOrder> taUserLicenseOrders = taUserLicenseOrderMapper.selectRecords(userElement.getCommunityId(), userElement.getId());
+
+        taUserLicenseOrders.forEach(e->{
+            e.setExtensionPrice(BigDecimal.valueOf(Long.valueOf(String.valueOf(e.getExtensionPrice()))).divide(new BigDecimal(100)).toString());
+            e.setUnitPrice(BigDecimal.valueOf(Long.valueOf(String.valueOf(e.getUnitPrice()))).divide(new BigDecimal(100)).toString());
+        });
+
+        responseBean.addSuccess(taUserLicenseOrders);
+        return responseBean;
+    }
+}

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

@@ -0,0 +1,139 @@
+package com.community.huiju.service.impl;
+
+import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
+import com.community.huiju.dao.TaUserLicenseMapper;
+import com.community.huiju.exception.WisdomException;
+import com.community.huiju.model.TaUserLicense;
+import com.community.huiju.service.IFuShiService;
+import com.community.huiju.service.ITaUserLicenseService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.SimpleFormatter;
+import java.util.stream.Collectors;
+
+/**
+ * 月租车 业务
+ * @author weiximei
+ */
+@Service
+@Slf4j
+public class TaUserLicenseServiceImpl implements ITaUserLicenseService {
+
+    @Autowired
+    private TaUserLicenseMapper taUserLicenseMapper;
+
+    @Autowired
+    private IFuShiService iFuShiService;
+
+    @Override
+    public ResponseBean associatedLicense(UserElement userElement, String carNo) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TaUserLicense taUserLicense = taUserLicenseMapper.selectByUserIdAndCommunityIdAndLicensePlate(userElement.getCommunityId(), userElement.getId(), carNo);
+        if (null == taUserLicense) {
+            taUserLicense = new TaUserLicense();
+        }
+
+        taUserLicense.setCommunityId(userElement.getCommunityId());
+        taUserLicense.setTaUserId(userElement.getId());
+        taUserLicense.setCreateUser(userElement.getId());
+        taUserLicense.setCreateDate(new Date());
+
+        // 获取最新的车牌信息
+        getTaUserLicense(carNo, taUserLicense);
+
+        int rows = 0;
+        if (null == taUserLicense.getId()) {
+            rows = taUserLicenseMapper.insertSelective(taUserLicense);
+        } else {
+            rows = taUserLicenseMapper.updateByPrimaryKeySelective(taUserLicense);
+        }
+
+
+        if (rows > 0) {
+            responseBean.addSuccess(taUserLicense);
+            return responseBean;
+        }
+
+        responseBean.addError("操作失败!");
+        return responseBean;
+    }
+
+
+    @Override
+    public ResponseBean getAllUserLicense(UserElement userElement) {
+        ResponseBean responseBean = new ResponseBean();
+        List<TaUserLicense> taUserLicenses = taUserLicenseMapper.selectAllByCommunityIdAndUserId(userElement.getCommunityId(), userElement.getId());
+
+        //1. 查询所有车牌
+        //2. 更新车牌信息
+
+        taUserLicenses = taUserLicenses.stream().map(e-> {
+            TaUserLicense taUserLicense = getTaUserLicense(e.getLicensePlate(), e);
+            taUserLicenseMapper.updateByPrimaryKeySelective(taUserLicense);
+            return taUserLicense;
+        }).collect(Collectors.toList());
+
+        responseBean.addSuccess(taUserLicenses);
+        return responseBean;
+    }
+
+    /**
+     * 获取最新的车牌信息
+     * @param carNo
+     * @return
+     */
+    private TaUserLicense getTaUserLicense(String carNo, TaUserLicense taUserLicense) {
+
+        // 查询车牌
+        ResponseBean responseBean = iFuShiService.getParkInfoByCarNo(carNo);
+        Object resultCar = responseBean.getData();
+        if (null == resultCar) {
+            throw new WisdomException("无此车牌记录！");
+        }
+
+        // 获取车牌的最新信息，并替换旧数据
+
+        // 获取到的车牌信息
+        Map<String,Object> map = (Map<String,Object>)resultCar;
+        Map<String,Object> jsonParam = (Map<String, Object>) map.get("JsonParam");
+
+        taUserLicense.setLicensePlate(carNo);
+        taUserLicense.setUnitPrice(BigDecimal.valueOf(Long.valueOf(String.valueOf(jsonParam.get("Cost")))).multiply(new BigDecimal(100)).toString());
+        taUserLicense.setCreateDate(new Date());
+        taUserLicense.setParkingLot(String.valueOf(jsonParam.get("ParkingName")));
+
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        try {
+            taUserLicense.setExpireDate(simpleDateFormat.parse(String.valueOf(jsonParam.get("EndTime"))));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        return taUserLicense;
+    }
+
+    @Override
+    public ResponseBean deleteUserLicense(UserElement userElement, Integer licenseId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        TaUserLicense taUserLicense = taUserLicenseMapper.selectByUserIdAndCommunityIdAndLicenseId(userElement.getCommunityId(), userElement.getId(), licenseId);
+        if (null == taUserLicense) {
+            responseBean.addError("没有关联此车牌！");
+            return responseBean;
+        }
+
+        taUserLicenseMapper.deleteByPrimaryKey(licenseId);
+        responseBean.addSuccess("操作成功！");
+        return responseBean;
+    }
+}

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

@@ -194,9 +194,10 @@ public class TaUserServiceImpl implements ITaUserService {
         }
 
         String code = jsonObject.getString("code");
-
-        // 校验手机号 和验证码
-        iCode.checkPhoneAndCode(user.getLoginName(), code);
+        if (StringUtils.isNotBlank(code)) {
+            // 校验手机号 和验证码
+            iCode.checkPhoneAndCode(user.getLoginName(), code);
+        }
 
         // 开始注册
         user.setCreateDate(new Date());
@@ -405,7 +406,8 @@ public class TaUserServiceImpl implements ITaUserService {
          * 判断是否 是业主，如果业主就连着 楼栋资料库 信息修改
          */
 
-        TaSysRole sysRole = taSysRoleMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getUserVerifyId());
+        TaSysRole sysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
 
         BeanTools.copyProperties(user, taUser);
         int result = taUserMapper.updateByPrimaryKeySelective(taUser);

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

@@ -93,7 +93,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         TaUserVerify taUserVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
         TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(taUserVerify.getRoleId());
         taUserVerify.setRoleName(taSysRole.getRoleName());
-        if ("2".equals(taUserVerify.getVerifyStatus())) {
+        if ("2".equals(taUserVerify.getVerifyStatus()) || "1".equals(taUserVerify.getVerifyStatus())) {
 
             // 开始查询 业主
             TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddressAndRoleId(taUserVerify.getCommunityId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());

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

@@ -72,25 +72,12 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Map<String, String> wxUnifiedOrder(String orderNo, UserElement userElement) throws Exception {
+	public Map<String, String> wxUnifiedOrder(String orderNo, String type, UserElement userElement) throws Exception {
 		HfWxConfig config = new HfWxConfig();
 		WXPay wxpay = new WXPay(config);
-		
-		//获取支付金额
-		List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByOrderBumber(orderNo);
-		if (CollectionUtils.isEmpty(billOrderList)){
-			throw new Exception("订单不存在");
-		}
-		// 检测订单是否 已关闭
-		billOrderList.forEach(e-> {
-			if ("3".equals(e.getOrderStatus())) {
-				throw new WisdomException("无法支付已关闭的订单!");
-			}
-		});
 
-		// 计算金额
-		Integer payPrice = billOrderList.stream().mapToInt(e -> tpBillInvoiceMapper.selectByPrimaryKey(e.getTpBillInvoiceId()).getPayPrice()).sum();
-		
+		Map<String, Object> orderPriceAndNotifyUrl = getOrderPriceAndNotifyUrl(type, orderNo);
+
 		//下单
 		Map<String, String> data = new HashMap<String, String>();
 		data.put("body", "缴费");
@@ -99,11 +86,11 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		data.put("device_info", "");
 		data.put("fee_type", "CNY");
 		//金额 后台计算
-		data.put("total_fee", String.valueOf(payPrice));
+		data.put("total_fee", String.valueOf(orderPriceAndNotifyUrl.get("payPrice")));
 		//终端IP
 		data.put("spbill_create_ip", "123.12.12.123");
 		//回调地址
-		data.put("notify_url", payNotifyPerproties.getWxNotify());
+		data.put("notify_url", String.valueOf(orderPriceAndNotifyUrl.get("notifyUrl")));
 		// 此处指定为APP支付
 		data.put("trade_type", "APP");
 		Map<String, String> resp = wxpay.unifiedOrder(data);
@@ -135,7 +122,45 @@ public class WxPayServiceImpl implements WxPayServiceI {
 
 		return secondSignData;
 	}
-	
+
+	/**
+	 * 根据订单类型获取 金额 和 回调地址
+	 * @param type
+	 * @param orderNo
+	 * @return
+	 * @throws Exception
+	 */
+	private Map<String,Object> getOrderPriceAndNotifyUrl(String type, String orderNo) throws Exception {
+		Map<String,Object> orderMap = Maps.newHashMap();
+
+		// 物业缴费
+		if ("bill".equals(type)) {
+			//获取支付金额
+			List<TpBillOrder> billOrderList = tpBillOrderMapper.selectByOrderBumber(orderNo);
+			if (CollectionUtils.isEmpty(billOrderList)){
+				throw new Exception("订单不存在");
+			}
+			// 检测订单是否 已关闭
+			billOrderList.forEach(e-> {
+				if ("3".equals(e.getOrderStatus())) {
+					throw new WisdomException("无法支付已关闭的订单!");
+				}
+			});
+			// 计算金额
+			Integer payPrice = billOrderList.stream().mapToInt(e -> tpBillInvoiceMapper.selectByPrimaryKey(e.getTpBillInvoiceId()).getPayPrice()).sum();
+
+			orderMap.put("orderNo", orderNo);
+			orderMap.put("payPrice", String.valueOf(payPrice));
+			orderMap.put("notifyUrl", payNotifyPerproties.getWxBillNotify());
+
+		} else if ("car".equals(type)) {
+
+		}
+
+		return orderMap;
+	}
+
+
 	/**
 	 * 支付成功的回调
 	 *

CODE/smart-community/app-api/src/main/resources/application.yml

@@ -52,10 +52,10 @@ weixin:
 
 # 支付回调
 pay-notify:
-  wx-notify: http://106.14.20.193:8086/app-api/wxNotify
-  ali-notify: http://106.14.20.193:8086/app-api/aliPayNotify
-#  wx-notify: http://ycapi.jcjyhn.com/app-api/wxNotify
-#  ali-notify: http://ycapi.jcjyhn.com/app-api/aliPayNotify
+  wx-bill-notify: http://106.14.20.193:8086/app-api/wxNotify
+  ali-bill-notify: http://106.14.20.193:8086/app-api/aliPayNotify
+#  wx-bill-notify: http://ycapi.jcjyhn.com/app-api/wxNotify
+#  ali-bill-notify: http://ycapi.jcjyhn.com/app-api/aliPayNotify
 
 # 大苏
 da-su:

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

@@ -0,0 +1,178 @@
+<?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.TaUserLicenseMapper" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaUserLicense" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="license_plate" property="licensePlate" jdbcType="VARCHAR" />
+    <result column="order_number" property="orderNumber" jdbcType="VARCHAR" />
+    <result column="expire_date" property="expireDate" jdbcType="TIMESTAMP" />
+    <result column="unit_price" property="unitPrice" jdbcType="VARCHAR" />
+    <result column="parking_lot" property="parkingLot" jdbcType="VARCHAR" />
+    <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
+    <result column="update_user" property="updateUser" 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
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_user_license
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_user_license
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaUserLicense" useGeneratedKeys="true" keyColumn="id" keyProperty="id" >
+    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
+      )
+    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}
+      )
+  </insert>
+  <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" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="licensePlate != null" >
+        license_plate,
+      </if>
+      <if test="orderNumber != null" >
+        order_number,
+      </if>
+      <if test="expireDate != null" >
+        expire_date,
+      </if>
+      <if test="unitPrice != null" >
+        unit_price,
+      </if>
+      <if test="parkingLot != null" >
+        parking_lot,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="licensePlate != null" >
+        #{licensePlate,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNumber != null" >
+        #{orderNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="expireDate != null" >
+        #{expireDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="unitPrice != null" >
+        #{unitPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="parkingLot != null" >
+        #{parkingLot,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUserLicense" >
+    update ta_user_license
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="licensePlate != null" >
+        license_plate = #{licensePlate,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNumber != null" >
+        order_number = #{orderNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="expireDate != null" >
+        expire_date = #{expireDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="unitPrice != null" >
+        unit_price = #{unitPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="parkingLot != null" >
+        parking_lot = #{parkingLot,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaUserLicense" >
+    update ta_user_license
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      license_plate = #{licensePlate,jdbcType=VARCHAR},
+      order_number = #{orderNumber,jdbcType=VARCHAR},
+      expire_date = #{expireDate,jdbcType=TIMESTAMP},
+      unit_price = #{unitPrice,jdbcType=VARCHAR},
+      parking_lot = #{parkingLot,jdbcType=VARCHAR},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      create_user = #{createUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+</mapper>

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

@@ -0,0 +1,248 @@
+<?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" >
+  <resultMap id="BaseResultMap" type="com.community.huiju.model.TaUserLicenseOrder" >
+    <id column="id" property="id" jdbcType="INTEGER" />
+    <result column="community_id" property="communityId" jdbcType="INTEGER" />
+    <result column="ta_user_id" property="taUserId" jdbcType="INTEGER" />
+    <result column="order_number" property="orderNumber" jdbcType="VARCHAR" />
+    <result column="order_status" property="orderStatus" jdbcType="VARCHAR" />
+    <result column="create_user" property="createUser" jdbcType="INTEGER" />
+    <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="extension_month" property="extensionMonth" jdbcType="INTEGER" />
+    <result column="extension_price" property="extensionPrice" jdbcType="VARCHAR" />
+    <result column="payment_tel" property="paymentTel" jdbcType="VARCHAR" />
+    <result column="payment_name" property="paymentName" jdbcType="VARCHAR" />
+    <result column="payment_type" property="paymentType" jdbcType="VARCHAR" />
+    <result column="expire_date" property="expireDate" jdbcType="TIMESTAMP" />
+    <result column="unit_price" property="unitPrice" jdbcType="VARCHAR" />
+    <result column="parking_lot" property="parkingLot" jdbcType="VARCHAR" />
+    <result column="license_plate" property="licensePlate" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    id, community_id, ta_user_id, order_number, order_status, create_user, create_date, 
+    update_user, update_date, extension_month, extension_price, payment_tel, payment_name, 
+    payment_type, expire_date, unit_price, parking_lot, license_plate
+  </sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from ta_user_license_order
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    delete from ta_user_license_order
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.community.huiju.model.TaUserLicenseOrder" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+    insert into ta_user_license_order (id, community_id, ta_user_id, 
+      order_number, order_status, create_user, 
+      create_date, update_user, update_date, 
+      extension_month, extension_price, payment_tel, 
+      payment_name, payment_type, expire_date, 
+      unit_price, parking_lot, license_plate
+      )
+    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{taUserId,jdbcType=INTEGER}, 
+      #{orderNumber,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, #{createUser,jdbcType=INTEGER}, 
+      #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP}, 
+      #{extensionMonth,jdbcType=INTEGER}, #{extensionPrice,jdbcType=VARCHAR}, #{paymentTel,jdbcType=VARCHAR}, 
+      #{paymentName,jdbcType=VARCHAR}, #{paymentType,jdbcType=VARCHAR}, #{expireDate,jdbcType=TIMESTAMP}, 
+      #{unitPrice,jdbcType=VARCHAR}, #{parkingLot,jdbcType=VARCHAR}, #{licensePlate,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.community.huiju.model.TaUserLicenseOrder" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+    insert into ta_user_license_order
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        id,
+      </if>
+      <if test="communityId != null" >
+        community_id,
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id,
+      </if>
+      <if test="orderNumber != null" >
+        order_number,
+      </if>
+      <if test="orderStatus != null" >
+        order_status,
+      </if>
+      <if test="createUser != null" >
+        create_user,
+      </if>
+      <if test="createDate != null" >
+        create_date,
+      </if>
+      <if test="updateUser != null" >
+        update_user,
+      </if>
+      <if test="updateDate != null" >
+        update_date,
+      </if>
+      <if test="extensionMonth != null" >
+        extension_month,
+      </if>
+      <if test="extensionPrice != null" >
+        extension_price,
+      </if>
+      <if test="paymentTel != null" >
+        payment_tel,
+      </if>
+      <if test="paymentName != null" >
+        payment_name,
+      </if>
+      <if test="paymentType != null" >
+        payment_type,
+      </if>
+      <if test="expireDate != null" >
+        expire_date,
+      </if>
+      <if test="unitPrice != null" >
+        unit_price,
+      </if>
+      <if test="parkingLot != null" >
+        parking_lot,
+      </if>
+      <if test="licensePlate != null" >
+        license_plate,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="communityId != null" >
+        #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="orderNumber != null" >
+        #{orderNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="orderStatus != null" >
+        #{orderStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="extensionMonth != null" >
+        #{extensionMonth,jdbcType=INTEGER},
+      </if>
+      <if test="extensionPrice != null" >
+        #{extensionPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentTel != null" >
+        #{paymentTel,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentName != null" >
+        #{paymentName,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentType != null" >
+        #{paymentType,jdbcType=VARCHAR},
+      </if>
+      <if test="expireDate != null" >
+        #{expireDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="unitPrice != null" >
+        #{unitPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="parkingLot != null" >
+        #{parkingLot,jdbcType=VARCHAR},
+      </if>
+      <if test="licensePlate != null" >
+        #{licensePlate,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUserLicenseOrder" >
+    update ta_user_license_order
+    <set >
+      <if test="communityId != null" >
+        community_id = #{communityId,jdbcType=INTEGER},
+      </if>
+      <if test="taUserId != null" >
+        ta_user_id = #{taUserId,jdbcType=INTEGER},
+      </if>
+      <if test="orderNumber != null" >
+        order_number = #{orderNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="orderStatus != null" >
+        order_status = #{orderStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        create_user = #{createUser,jdbcType=INTEGER},
+      </if>
+      <if test="createDate != null" >
+        create_date = #{createDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        update_user = #{updateUser,jdbcType=INTEGER},
+      </if>
+      <if test="updateDate != null" >
+        update_date = #{updateDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="extensionMonth != null" >
+        extension_month = #{extensionMonth,jdbcType=INTEGER},
+      </if>
+      <if test="extensionPrice != null" >
+        extension_price = #{extensionPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentTel != null" >
+        payment_tel = #{paymentTel,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentName != null" >
+        payment_name = #{paymentName,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentType != null" >
+        payment_type = #{paymentType,jdbcType=VARCHAR},
+      </if>
+      <if test="expireDate != null" >
+        expire_date = #{expireDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="unitPrice != null" >
+        unit_price = #{unitPrice,jdbcType=VARCHAR},
+      </if>
+      <if test="parkingLot != null" >
+        parking_lot = #{parkingLot,jdbcType=VARCHAR},
+      </if>
+      <if test="licensePlate != null" >
+        license_plate = #{licensePlate,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.community.huiju.model.TaUserLicenseOrder" >
+    update ta_user_license_order
+    set community_id = #{communityId,jdbcType=INTEGER},
+      ta_user_id = #{taUserId,jdbcType=INTEGER},
+      order_number = #{orderNumber,jdbcType=VARCHAR},
+      order_status = #{orderStatus,jdbcType=VARCHAR},
+      create_user = #{createUser,jdbcType=INTEGER},
+      create_date = #{createDate,jdbcType=TIMESTAMP},
+      update_user = #{updateUser,jdbcType=INTEGER},
+      update_date = #{updateDate,jdbcType=TIMESTAMP},
+      extension_month = #{extensionMonth,jdbcType=INTEGER},
+      extension_price = #{extensionPrice,jdbcType=VARCHAR},
+      payment_tel = #{paymentTel,jdbcType=VARCHAR},
+      payment_name = #{paymentName,jdbcType=VARCHAR},
+      payment_type = #{paymentType,jdbcType=VARCHAR},
+      expire_date = #{expireDate,jdbcType=TIMESTAMP},
+      unit_price = #{unitPrice,jdbcType=VARCHAR},
+      parking_lot = #{parkingLot,jdbcType=VARCHAR},
+      license_plate = #{licensePlate,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

CODE/smart-community/community-common/target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.3.9
+version=0.0.1
+groupId=com.community
+artifactId=community-common

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,45 @@
+com\community\commom\redis\RedisTemplate.class
+com\community\commom\redis\RedisConfiguration.class
+com\community\commom\utils\OssUtil.class
+com\community\commom\redis\SingleRedisTemplate.class
+com\community\commom\hk\entity\MonitoryPoint$MonitoryPointList.class
+com\community\commom\utils\EnumUtils.class
+com\community\commom\hk\HttpClientSSLUtils$2.class
+com\community\commom\redis\RedisJsonSerializer.class
+com\community\commom\uuid\IdGen.class
+com\community\commom\hk\PicUtils.class
+com\community\commom\utils\BeanTools.class
+com\community\commom\hk\HttpClientSSLUtils.class
+com\community\commom\session\UserElement.class
+com\community\commom\utils\CommonUtils.class
+com\community\commom\hk\test\OpenapiTest.class
+com\community\commom\redis\RedisSerializer.class
+com\community\commom\fushi\error\FuShiException.class
+com\community\commom\hk\entity\MonitoryPoint$MonitoryPointData.class
+com\community\commom\utils\StringConverter.class
+com\community\commom\fushi\FuShiRequestAPI.class
+com\community\commom\fushi\FushiConstant.class
+com\community\commom\mode\ResponseBean.class
+com\community\commom\fushi\Base64.class
+com\community\commom\utils\DESUtils.class
+com\community\commom\redis\FastJsonSerializer.class
+com\community\commom\utils\DateUtils.class
+com\community\commom\utils\HttpClientUtils.class
+com\community\commom\constant\Constant.class
+com\community\commom\hk\entity\MonitoryPoint.class
+com\community\commom\utils\CookieUtil.class
+com\community\commom\hk\HKConstant.class
+com\community\commom\mode\HkResponseBean.class
+com\community\commom\ailiyun\AESDecode.class
+com\community\commom\uuid\IdGen$IdGenHolder.class
+com\community\commom\utils\PayPriceUtils.class
+com\community\commom\fushi\FuShiHttpClient.class
+com\community\commom\hk\HttpClientSSLUtils$1.class
+com\community\commom\fushi\FuShiRequestAPI$SignBuild.class
+com\community\commom\utils\MD5Utils.class
+com\community\commom\redis\RedisObjectSerializer.class
+com\community\commom\utils\QRCodeGeneratorUtils.class
+com\community\commom\redis\SerializationFailedException.class
+com\community\commom\hk\Digests.class
+com\community\commom\hk\HKOpenApi.class
+com\community\commom\utils\AccountValidatorUtil.class

CODE/smart-community/community-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,39 @@
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisJsonSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\ailiyun\AESDecode.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HttpClientSSLUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\fushi\Base64.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\fushi\FuShiHttpClient.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\PayPriceUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DateUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\HttpClientUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\DESUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\BeanTools.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\OssUtil.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisObjectSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\EnumUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\fushi\FuShiRequestAPI.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\entity\MonitoryPoint.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisTemplate.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\HkResponseBean.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\PicUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SerializationFailedException.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CommonUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\MD5Utils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HKConstant.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\session\UserElement.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\SingleRedisTemplate.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\fushi\error\FuShiException.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\Digests.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\HKOpenApi.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\hk\test\OpenapiTest.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\QRCodeGeneratorUtils.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\RedisConfiguration.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\AccountValidatorUtil.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\uuid\IdGen.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\mode\ResponseBean.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\fushi\FushiConstant.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\StringConverter.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\redis\FastJsonSerializer.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\constant\Constant.java
+E:\weiximei\smartCommunity\CODE\smart-community\community-common\src\main\java\com\community\commom\utils\CookieUtil.java