完成 月租车 临时车 缴费记录

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

@@ -23,14 +23,16 @@ public class FSController extends BaseController {
     @ApiOperation(value = "获取停车信息（通过车牌号）", notes = "获取停车信息（通过车牌号）")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
-    public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo) {
+    public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo,
+                                           @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iFuShiService.getParkInfoByCarNo(carNo);
+        responseBean = iFuShiService.getParkInfoByCarNo(carNo, communityId);
         return responseBean;
     }
 
@@ -38,14 +40,16 @@ public class FSController extends BaseController {
     @ApiOperation(value = "获取月租车信息（通过车牌号）", notes = "获取月租车信息（通过车牌号）")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
-    public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo) {
+    public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo,
+                                                    @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iFuShiService.parkGetMonthCardInfoByCarNo(carNo);
+        responseBean = iFuShiService.parkGetMonthCardInfoByCarNo(carNo, communityId);
         return responseBean;
     }
 
@@ -53,14 +57,16 @@ public class FSController extends BaseController {
     @ApiOperation(value = "获取临时车信息（通过车牌号）", notes = "获取临时车信息（通过车牌号）")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
-    public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo) {
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo,
+                                                         @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iFuShiService.parkGetTempCarPaymentInfoByCarNo(carNo);
+        responseBean = iFuShiService.parkGetTempCarPaymentInfoByCarNo(carNo, communityId);
         return responseBean;
     }
 
@@ -73,10 +79,10 @@ public class FSController extends BaseController {
 //                    "CarNo车牌号;" +
 //                    "CardNo停车卡号;" +
 //                    "RechargeAmt充值续费金额;"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "Phone", value = "手机号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "RenewDayType", value = "续费日期类型( 3:年 2:月 1:日, 选入对应的数字)"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "RenewDay", value = "续费日期数目"),
@@ -84,6 +90,7 @@ public class FSController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CarNo", value = "车牌号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CardNo", value = "停车卡号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "RechargeAmt", value = "充值续费金额"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "communityId", value = "小区Id"),
     })
     public ResponseBean apiThirdPartyMonthCardPay(@RequestParam(value = "Phone") String Phone,
                                                   @RequestParam(value = "RenewDayType") String RenewDayType,
@@ -91,10 +98,11 @@ public class FSController extends BaseController {
                                                   @RequestParam(value = "PayStyle") String PayStyle,
                                                   @RequestParam(value = "CarNo") String CarNo,
                                                   @RequestParam(value = "CardNo", required = false) String CardNo,
-                                                  @RequestParam(value = "RechargeAmt") String RechargeAmt) {
+                                                  @RequestParam(value = "RechargeAmt") String RechargeAmt,
+                                                  @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = iFuShiService.apiThirdPartyMonthCardPay(Phone, RenewDayType,
-                RenewDay, PayStyle, CarNo, CardNo, RechargeAmt);
+                RenewDay, PayStyle, CarNo, CardNo, RechargeAmt, communityId);
         return responseBean;
     }
 
@@ -109,10 +117,10 @@ public class FSController extends BaseController {
 //                    "CarNo车牌号;" +
 //                    "CardNo停车卡号;" +
 //                    "CouponList使用的优惠券列表"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "Amount", value = "应缴金额（单位元）"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "ActualAmount", value = "实缴金额（单位元）"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "DeductionAmount", value = "抵扣金额（单位元）"),
@@ -121,6 +129,7 @@ public class FSController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CarNo", value = "车牌号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CardNo", value = "停车卡号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "CouponList", value = "使用的优惠券列表"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "communityId", value = "小区Id"),
     })
     public ResponseBean apiThirdPartyTemporaryCardPay(@RequestParam(value = "Amount") String Amount,
                                                       @RequestParam(value = "ActualAmount") String ActualAmount,
@@ -129,10 +138,11 @@ public class FSController extends BaseController {
                                                       @RequestParam(value = "PayStyle") String PayStyle,
                                                       @RequestParam(value = "CarNo") String CarNo,
                                                       @RequestParam(value = "CardNo",  required = false) String CardNo,
-                                                      @RequestParam(value = "CouponList", required = false) String CouponList) {
+                                                      @RequestParam(value = "CouponList", required = false) String CouponList,
+                                                      @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         responseBean = iFuShiService.apiThirdPartyTemporaryCardPay(Amount, ActualAmount, DeductionAmount,
-                Reason, PayStyle, CarNo, CardNo, CouponList);
+                Reason, PayStyle, CarNo, CardNo, CouponList, communityId);
         return responseBean;
     }
 
@@ -140,15 +150,17 @@ public class FSController extends BaseController {
     @RequestMapping(value = "/car/apiGetOfflineFee/{carNoOrCardNo}", method = RequestMethod.GET)
     @ApiOperation(value = "获取线下算费结果", notes = "获取线下算费结果")
     @ApiImplicitParams({
-        @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNoOrCardNo" , value = "车牌号码或卡号"),
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "carNoOrCardNo" , value = "车牌号码或卡号"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "communityId", value = "小区Id"),
     })
-    public ResponseBean apiGetOfflineFee(@PathVariable("carNoOrCardNo") String carNoOrCardNo) {
+    public ResponseBean apiGetOfflineFee(@PathVariable("carNoOrCardNo") String carNoOrCardNo,
+                                         @RequestParam(value = "communityId") Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
-        responseBean = iFuShiService.apiGetOfflineFee(carNoOrCardNo);
+        responseBean = iFuShiService.apiGetOfflineFee(carNoOrCardNo, communityId);
         return responseBean;
     }
 

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

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaTemporaryLicenseOrder;
+
+/**
+ * <p>
+ * 临时车缴费表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface TaTemporaryLicenseOrderMapper extends BaseMapper<TaTemporaryLicenseOrder> {
+
+}

CODE/foreign-service/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-28
+ */
+public interface TaUserLicenseOrderMapper extends BaseMapper<TaUserLicenseOrder> {
+
+}

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

@@ -0,0 +1,119 @@
+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;
+import java.util.Date;
+
+/**
+ * <p>
+ * 临时车缴费表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_temporary_license_order")
+public class TaTemporaryLicenseOrder 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: 正在支付中
+     */
+    private String orderStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+    /**
+     * 缴费手机号
+     */
+    private String paymentTel;
+
+    /**
+     * 缴费人姓名
+     */
+    private String paymentName;
+
+    /**
+     * 缴费方式 1是支付宝 2是微信支付
+     */
+    private String paymentType;
+
+    /**
+     * 实缴金额
+     */
+    private String actualAmount;
+
+    /**
+     * 抵扣金额
+     */
+    private String deductionAmount;
+
+    /**
+     * 应缴金额
+     */
+    private String amount;
+
+    /**
+     * 停车场
+     */
+    private String parkingLot;
+
+    /**
+     * 车牌号
+     */
+    private String licensePlate;
+
+    /**
+     * 来源
+     */
+    private String sourceFrom;
+
+
+}

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

@@ -0,0 +1,124 @@
+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;
+import java.util.Date;
+
+/**
+ * <p>
+ * 月租车缴费订单表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@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 Date createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateDate;
+
+    /**
+     * 延期月份
+     */
+    private Integer extensionMonth;
+
+    /**
+     * 延期费用
+     */
+    private String extensionPrice;
+
+    /**
+     * 缴费手机号
+     */
+    private String paymentTel;
+
+    /**
+     * 缴费人姓名
+     */
+    private String paymentName;
+
+    /**
+     * 缴费方式 0是微信支付 2是支付宝 
+     */
+    private String paymentType;
+
+    /**
+     * 到期时间
+     */
+    private Date expireDate;
+
+    /**
+     * 单价费用
+     */
+    private String unitPrice;
+
+    /**
+     * 停车场
+     */
+    private String parkingLot;
+
+    /**
+     * 车牌号
+     */
+    private String licensePlate;
+
+    /**
+     * 来源
+     */
+    private String sourceFrom;
+
+
+}

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

@@ -13,7 +13,7 @@ public interface IFuShiService {
      * @param carNo
      * @return
      */
-    ResponseBean getParkInfoByCarNo(String carNo);
+    ResponseBean getParkInfoByCarNo(String carNo, Integer communityId);
 
     /**
      * 第三方月卡上发续费
@@ -26,7 +26,7 @@ public interface IFuShiService {
      * @param RechargeAmt 充值续费金额
      * @return
      */
-    ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt);
+    ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt, Integer communityId);
 
 
     /**
@@ -52,26 +52,26 @@ public interface IFuShiService {
      *
      * @return
      */
-    ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList);
+    ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList, Integer communityId);
 
     /**
      * 获取线下算费结果
      * @param CarNoOrCardNo 车牌号码或卡号
      * @return
      */
-    ResponseBean apiGetOfflineFee(String CarNoOrCardNo);
+    ResponseBean apiGetOfflineFee(String CarNoOrCardNo, Integer communityId);
 
     /**
      * 获取月租车信息（通过车牌号）
      * @param CarNo
      * @return
      */
-    ResponseBean parkGetMonthCardInfoByCarNo(String CarNo);
+    ResponseBean parkGetMonthCardInfoByCarNo(String CarNo, Integer communityId);
 
     /**
      * 获取临时车信息（通过车牌号）
      * @param CarNo
      * @return
      */
-    ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo);
+    ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo, Integer communityId);
 }

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

@@ -0,0 +1,18 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.model.TaTemporaryLicenseOrder;
+
+/**
+ * <p>
+ * 临时车缴费表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface ITaTemporaryLicenseOrderService extends IService<TaTemporaryLicenseOrder> {
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.model.TaUserLicenseOrder;
+
+/**
+ * <p>
+ * 月租车缴费订单表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+public interface ITaUserLicenseOrderService extends IService<TaUserLicenseOrder> {
+
+}

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

@@ -1,20 +1,32 @@
 package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.community.commom.fushi.FuShiRequestAPI;
+import com.community.commom.fushi.error.FuShiException;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.uuid.IdGen;
 import com.community.huiju.common.perproties.FuShiProperties;
+import com.community.huiju.dao.TaTemporaryLicenseOrderMapper;
+import com.community.huiju.dao.TaUserLicenseOrderMapper;
+import com.community.huiju.dao.TaUserMapper;
 import com.community.huiju.log.LogAnnotation;
 import com.community.huiju.log.LogEnums;
+import com.community.huiju.model.TaTemporaryLicenseOrder;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.model.TaUserLicenseOrder;
 import com.community.huiju.service.IFuShiService;
 import com.google.common.collect.Maps;
 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.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -33,6 +45,15 @@ public class FuShiServiceImpl implements IFuShiService {
 
     private IdGen idGen = IdGen.get();
 
+    @Autowired
+    private TaTemporaryLicenseOrderMapper taTemporaryLicenseOrderMapper;
+
+    @Autowired
+    private TaUserLicenseOrderMapper taUserLicenseOrderMapper;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     /**
      * 获取 富士 json 值
      * @param jsonString
@@ -52,7 +73,7 @@ public class FuShiServiceImpl implements IFuShiService {
 
     @LogAnnotation(value = LogEnums.DA_SU, alias = "获取停车信息（通过车牌号)")
     @Override
-    public ResponseBean getParkInfoByCarNo(String carNo) {
+    public ResponseBean getParkInfoByCarNo(String carNo, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         String parkInfo = fuShiRequestAPI.getParkInfoByCarNo(fuShiProperties.getParkingCode(), carNo);
         Map<String, Object> fuShiInfo = getFuShiInfo(parkInfo);
@@ -62,7 +83,7 @@ public class FuShiServiceImpl implements IFuShiService {
 
     @LogAnnotation(value = LogEnums.DA_SU, alias = "第三方月卡上发续费")
     @Override
-    public ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt) {
+    public ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss");
         // 交易编码
@@ -75,6 +96,58 @@ public class FuShiServiceImpl implements IFuShiService {
         Map<String, Object> map = Maps.newHashMap();
         map.put("TradeNo", tradeNo);
         responseBean.addSuccess(map);
+
+        QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
+        userQueryWrapper.eq("login_name", Phone);
+        TaUser user = taUserMapper.selectOne(userQueryWrapper);
+
+        // 月租车缴费记录
+        TaUserLicenseOrder taUserLicenseOrder = new TaUserLicenseOrder();
+        taUserLicenseOrder.setCommunityId(communityId);
+        taUserLicenseOrder.setTaUserId(user.getUserId());
+        taUserLicenseOrder.setOrderNumber(dealNo);
+        taUserLicenseOrder.setOrderStatus("1");
+        taUserLicenseOrder.setCreateUser(user.getUserId());
+        taUserLicenseOrder.setCreateDate(new Date());
+        taUserLicenseOrder.setExtensionMonth(Integer.valueOf(RenewDay));
+        taUserLicenseOrder.setExtensionPrice(RechargeAmt);
+        taUserLicenseOrder.setPaymentTel(user.getLoginName());
+        taUserLicenseOrder.setPaymentName(user.getUserName());
+        // 缴费方式 1是支付宝 2是微信支付
+        if (PayStyle.contains("微信")) {
+            taUserLicenseOrder.setPaymentType("0");
+        } else if (PayStyle.contains("支付宝")){
+            taUserLicenseOrder.setPaymentType("2");
+        }
+
+        // 查询这个交费后的车牌
+        String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetMonthCardInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
+        JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
+        Map<String, Object> innerMap = jsonObject.getInnerMap();
+        Integer messageCode = (Integer) innerMap.get("MessageCode");
+        if (200 != messageCode.intValue()) {
+            log.error("月租车缴费记录错误：{}", parkGetMonthCardInfoByCarNo);
+            String messageContent = jsonObject.getString("MessageContent");
+            throw new FuShiException(messageCode, messageContent);
+        }
+
+        Map<String, Object> result = (Map<String, Object>) innerMap.get("Result");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        try {
+            taUserLicenseOrder.setExpireDate(format.parse(String.valueOf(result.get("EndTime"))));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+
+        Object cost = result.get("Cost");
+        String costValue = String.valueOf(Double.valueOf(((BigDecimal) cost).toString()) * 100);
+
+        taUserLicenseOrder.setUnitPrice(costValue.substring(0, costValue.lastIndexOf(".")));
+        taUserLicenseOrder.setParkingLot(String.valueOf(result.get("ParkingName")));
+        taUserLicenseOrder.setLicensePlate(CarNo);
+        taUserLicenseOrder.setSourceFrom("大苏");
+        taUserLicenseOrderMapper.insert(taUserLicenseOrder);
+
         return responseBean;
     }
 
@@ -103,7 +176,7 @@ public class FuShiServiceImpl implements IFuShiService {
      */
     @LogAnnotation(value = LogEnums.DA_SU, alias = "第三方临时卡上发缴费")
     @Override
-    public ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList) {
+    public ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         // 交易编号
         String dealNo = idGen.nextId() + "";
@@ -112,12 +185,49 @@ public class FuShiServiceImpl implements IFuShiService {
         Map<String, Object> map = Maps.newHashMap();
         map.put("TradeNo", tradeNo);
         responseBean.addSuccess(map);
+
+        // 临时车缴费记录
+        TaTemporaryLicenseOrder taTemporaryLicenseOrder = new TaTemporaryLicenseOrder();
+        taTemporaryLicenseOrder.setCommunityId(communityId);
+        taTemporaryLicenseOrder.setOrderNumber(dealNo);
+        taTemporaryLicenseOrder.setOrderStatus("1");
+        taTemporaryLicenseOrder.setCreateDate(new Date());
+        taTemporaryLicenseOrder.setUpdateDate(new Date());
+        // 缴费方式 1是支付宝 2是微信支付
+        if (PayStyle.contains("微信")) {
+            taTemporaryLicenseOrder.setPaymentType("2");
+        } else if (PayStyle.contains("支付宝")){
+            taTemporaryLicenseOrder.setPaymentType("1");
+        }
+        taTemporaryLicenseOrder.setActualAmount(ActualAmount);
+        taTemporaryLicenseOrder.setDeductionAmount(DeductionAmount);
+        taTemporaryLicenseOrder.setAmount(Amount);
+
+        String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetTempCarPaymentInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
+        JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
+        Map<String, Object> innerMap = jsonObject.getInnerMap();
+        Integer messageCode = (Integer) innerMap.get("MessageCode");
+        if (200 != messageCode.intValue()) {
+            log.error("临时车缴费记录错误：{}", parkGetMonthCardInfoByCarNo);
+            String messageContent = jsonObject.getString("MessageContent");
+            throw new FuShiException(messageCode, messageContent);
+        }
+
+        Map<String, Object> result = (Map<String, Object>) innerMap.get("Result");
+        taTemporaryLicenseOrder.setParkingLot(String.valueOf(result.get("ParkingName")));
+        taTemporaryLicenseOrder.setLicensePlate(CarNo);
+        taTemporaryLicenseOrder.setSourceFrom("大苏");
+
+        taTemporaryLicenseOrderMapper.insert(taTemporaryLicenseOrder);
+
+
+
         return responseBean;
     }
 
     @LogAnnotation(value = LogEnums.DA_SU, alias = "获取线下算费结果")
     @Override
-    public ResponseBean apiGetOfflineFee(String CarNoOrCardNo) {
+    public ResponseBean apiGetOfflineFee(String CarNoOrCardNo, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         String apiGetOfflineFee = fuShiRequestAPI.apiGetOfflineFee(fuShiProperties.getParkingCode(), CarNoOrCardNo);
         String result = JSONObject.parseObject(apiGetOfflineFee).getString("Result");
@@ -134,7 +244,7 @@ public class FuShiServiceImpl implements IFuShiService {
      */
     @LogAnnotation(value = LogEnums.DA_SU, alias = "获取月租车信息（通过车牌号）")
     @Override
-    public ResponseBean parkGetMonthCardInfoByCarNo(String CarNo) {
+    public ResponseBean parkGetMonthCardInfoByCarNo(String CarNo, Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetMonthCardInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
         JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);
@@ -153,7 +263,7 @@ public class FuShiServiceImpl implements IFuShiService {
      */
     @LogAnnotation(value = LogEnums.DA_SU, alias = "获取临时车信息（通过车牌号）")
     @Override
-    public ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo) {
+    public ResponseBean parkGetTempCarPaymentInfoByCarNo(String CarNo,Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         String parkGetMonthCardInfoByCarNo = fuShiRequestAPI.parkGetTempCarPaymentInfoByCarNo(fuShiProperties.getParkingCode(), CarNo);
         JSONObject jsonObject = JSONObject.parseObject(parkGetMonthCardInfoByCarNo);

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TaTemporaryLicenseOrderMapper;
+import com.community.huiju.model.TaTemporaryLicenseOrder;
+import com.community.huiju.service.ITaTemporaryLicenseOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 临时车缴费表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Service
+public class TaTemporaryLicenseOrderServiceImpl extends ServiceImpl<TaTemporaryLicenseOrderMapper, TaTemporaryLicenseOrder> implements ITaTemporaryLicenseOrderService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.dao.TaUserLicenseOrderMapper;
+import com.community.huiju.model.TaUserLicenseOrder;
+import com.community.huiju.service.ITaUserLicenseOrderService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 月租车缴费订单表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-28
+ */
+@Service
+public class TaUserLicenseOrderServiceImpl extends ServiceImpl<TaUserLicenseOrderMapper, TaUserLicenseOrder> implements ITaUserLicenseOrderService {
+
+}

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

@@ -158,7 +158,7 @@ public class FuShiRequestAPI {
         map.put("ParkingCode", ParkingCode);
         map.put("CardNo", CardNo);
         map.put("PayCostMachineOrderId", PayCostMachineOrderId);
-        map.put("CouponList", JSONObject.parseObject(CouponList).getInnerMap());
+        map.put("CouponList", null == CouponList ? null : JSONObject.parseObject(CouponList).getInnerMap());
 
         String json = JSONObject.toJSONString(map);
         log.info("第三方临时卡上发缴费请求参数：{}", json);