提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/feign/IFuShiServer.java

@@ -20,11 +20,19 @@ public interface IFuShiServer {
     String getParkInfoByCarNo(@RequestParam("carNo") String carNo);
 
     /**
-     * 缴费
+     * 月租车缴费
      * @param parameter
      * @return
      */
     @PostMapping("/car/apiThirdPartyMonthCardPay")
     String apiThirdPartyMonthCardPay(@RequestBody String parameter);
 
+    /**
+     * 临时车缴费
+     * @param parameter
+     * @return
+     */
+    @PostMapping("/car/apiThirdPartyTemporaryCardPay")
+    String apiThirdPartyTemporaryCardPay(@RequestBody String parameter);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/feign/entity/ApiThirdPartyMonthCardPay.java

@@ -20,6 +20,11 @@ public class ApiThirdPartyMonthCardPay {
      */
     private String RenewDay;
 
+    /**
+     * 交易编号
+     */
+    private String DealNo;
+
     /**
      * 交易方式(中文描述)，例如：微信、 支付宝、 银联
      */

CODE/smart-community/app-api/src/main/java/com/community/huiju/feign/entity/ApiThirdPartyTemporaryCardPay.java

@@ -0,0 +1,200 @@
+package com.community.huiju.feign.entity;
+
+import java.util.List;
+
+public class ApiThirdPartyTemporaryCardPay {
+
+
+    /**
+     * Amount : 10
+     * ActualAmount : 10
+     * DeductionAmount : 0
+     * Reason : 
+     * DealNo : 2017082821001004930232739530
+     * PayStyle : 支付宝
+     * CarNo : 粤BS69W3
+     * ParkingCode : 17000107550001
+     * CardNo : 
+     * PayCostMachineOrderId : 
+     * CouponList : [{"CouponType":2,"CouponValue":0,"CouponCode":"2319e5e516dd42f49a0514796fd0bb43","FavorableType":2,"IsAuto":2,"UseStatus":1}]
+     */
+
+    private Integer Amount;
+    private Integer ActualAmount;
+    private Integer DeductionAmount;
+    private String Reason;
+    private String DealNo;
+    private String PayStyle;
+    private String CarNo;
+    /**
+     * 停车场编号，目前只有Q+社区
+     */
+    private String ParkingCode;
+
+    /**
+     * 停车卡号
+     */
+    private String CardNo;
+    /**
+     * 线下自助缴费机订单号，若不是自助缴费机缴费则该字段为空
+     */
+    private String PayCostMachineOrderId;
+    /**
+     * 优惠券
+     */
+    private List<CouponListBean> CouponList;
+
+    public Integer getAmount() {
+        return Amount;
+    }
+
+    public void setAmount(Integer Amount) {
+        this.Amount = Amount;
+    }
+
+    public Integer getActualAmount() {
+        return ActualAmount;
+    }
+
+    public void setActualAmount(Integer ActualAmount) {
+        this.ActualAmount = ActualAmount;
+    }
+
+    public Integer getDeductionAmount() {
+        return DeductionAmount;
+    }
+
+    public void setDeductionAmount(Integer DeductionAmount) {
+        this.DeductionAmount = DeductionAmount;
+    }
+
+    public String getReason() {
+        return Reason;
+    }
+
+    public void setReason(String Reason) {
+        this.Reason = Reason;
+    }
+
+    public String getDealNo() {
+        return DealNo;
+    }
+
+    public void setDealNo(String DealNo) {
+        this.DealNo = DealNo;
+    }
+
+    public String getPayStyle() {
+        return PayStyle;
+    }
+
+    public void setPayStyle(String PayStyle) {
+        this.PayStyle = PayStyle;
+    }
+
+    public String getCarNo() {
+        return CarNo;
+    }
+
+    public void setCarNo(String CarNo) {
+        this.CarNo = CarNo;
+    }
+
+    public String getParkingCode() {
+        return ParkingCode;
+    }
+
+    public void setParkingCode(String ParkingCode) {
+        this.ParkingCode = ParkingCode;
+    }
+
+    public String getCardNo() {
+        return CardNo;
+    }
+
+    public void setCardNo(String CardNo) {
+        this.CardNo = CardNo;
+    }
+
+    public String getPayCostMachineOrderId() {
+        return PayCostMachineOrderId;
+    }
+
+    public void setPayCostMachineOrderId(String PayCostMachineOrderId) {
+        this.PayCostMachineOrderId = PayCostMachineOrderId;
+    }
+
+    public List<CouponListBean> getCouponList() {
+        return CouponList;
+    }
+
+    public void setCouponList(List<CouponListBean> CouponList) {
+        this.CouponList = CouponList;
+    }
+
+    public static class CouponListBean {
+        /**
+         * CouponType : 2
+         * CouponValue : 0
+         * CouponCode : 2319e5e516dd42f49a0514796fd0bb43
+         * FavorableType : 2
+         * IsAuto : 2
+         * UseStatus : 1
+         */
+
+        private Integer CouponType;
+        private Integer CouponValue;
+        private String CouponCode;
+        private Integer FavorableType;
+        private Integer IsAuto;
+        private Integer UseStatus;
+
+        public Integer getCouponType() {
+            return CouponType;
+        }
+
+        public void setCouponType(Integer CouponType) {
+            this.CouponType = CouponType;
+        }
+
+        public Integer getCouponValue() {
+            return CouponValue;
+        }
+
+        public void setCouponValue(Integer CouponValue) {
+            this.CouponValue = CouponValue;
+        }
+
+        public String getCouponCode() {
+            return CouponCode;
+        }
+
+        public void setCouponCode(String CouponCode) {
+            this.CouponCode = CouponCode;
+        }
+
+        public Integer getFavorableType() {
+            return FavorableType;
+        }
+
+        public void setFavorableType(Integer FavorableType) {
+            this.FavorableType = FavorableType;
+        }
+
+        public Integer getIsAuto() {
+            return IsAuto;
+        }
+
+        public void setIsAuto(Integer IsAuto) {
+            this.IsAuto = IsAuto;
+        }
+
+        public Integer getUseStatus() {
+            return UseStatus;
+        }
+
+        public void setUseStatus(Integer UseStatus) {
+            this.UseStatus = UseStatus;
+        }
+    }
+}

CODE/smart-community/app-api/src/main/java/com/community/huiju/feign/impl/FuShiServerImpl.java

@@ -18,6 +18,11 @@ public class FuShiServerImpl implements IFuShiServer {
         return back();
     }
 
+    @Override
+    public String apiThirdPartyTemporaryCardPay(String parameter) {
+        return back();
+    }
+
     private String back() {
         log.error("hardware-server 远端服务请求失败！");
         ResponseBean responseBean = new ResponseBean();

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.commom.uuid.IdGen;
 import com.community.huiju.common.perproties.PayNotifyPerproties;
 import com.community.huiju.common.wxpay.HfWxConfig;
 import com.community.huiju.common.wxpay.WXPay;
@@ -90,6 +91,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 	@Autowired
 	private ITaUserLicenseService iTaUserLicenseService;
 
+	private IdGen idGen = IdGen.get();
 
 	/**
 	 * 微信支付统一下单
@@ -492,6 +494,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		apiThirdPartyMonthCardPay.setCarNo(taUserLicenseOrder.getLicensePlate());
 		apiThirdPartyMonthCardPay.setCardNo(null);
 		apiThirdPartyMonthCardPay.setRechargeAmt(String.valueOf(Double.valueOf(taUserLicenseOrder.getExtensionPrice()) / 100));
+		apiThirdPartyMonthCardPay.setDealNo(outTradeNo);
 
 		// 推送到车辆管理系统
 		iFuShiServer.apiThirdPartyMonthCardPay(JSONObject.toJSONString(apiThirdPartyMonthCardPay));

CODE/smart-community/hardware-server/src/main/java/com/community/huiju/controller/CardController.java

@@ -62,6 +62,7 @@ public class CardController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "Phone手机号;RenewDayType续费日期类型( 3:年 2:月 1:日, 选入对应的数字);" +
                     "RenewDay续费日期数目;" +
+                    "DealNo交易编号;" +
                     "PayStyle交易方式(中文描述)，例如：微信、 支付宝、 银联;" +
                     "CarNo车牌号;" +
                     "CardNo停车卡号;" +
@@ -73,6 +74,7 @@ public class CardController {
         responseBean = fsHardwareServiceI.apiThirdPartyMonthCardPay(jsonObject.getString("Phone"),
                 jsonObject.getString("RenewDayType"),
                 jsonObject.getString("RenewDay"),
+                jsonObject.getString("DealNo"),
                 jsonObject.getString("PayStyle"),
                 jsonObject.getString("CarNo"),
                 jsonObject.getString("CardNo"),
@@ -87,6 +89,7 @@ public class CardController {
                     "ActualAmount实缴金额（单位元）;" +
                     "DeductionAmount抵扣金额（单位元）;" +
                     "Reason抵扣原因;" +
+                    "DealNo交易编号;" +
                     "PayStyle交易方式(汉字描述)，例如：微信、支付宝、银联;" +
                     "CarNo车牌号;" +
                     "CardNo停车卡号;" +
@@ -99,6 +102,7 @@ public class CardController {
                 jsonObject.getString("ActualAmount"),
                 jsonObject.getString("DeductionAmount"),
                 jsonObject.getString("Reason"),
+                jsonObject.getString("DealNo"),
                 jsonObject.getString("PayStyle"),
                 jsonObject.getString("CarNo"),
                 jsonObject.getString("CardNo"),

CODE/smart-community/hardware-server/src/main/java/com/community/huiju/service/FSHardwareServiceI.java

@@ -22,6 +22,7 @@ public interface FSHardwareServiceI {
      * @param Phone 车主手机号
      * @param RenewDayType 续费日期类型: 3:年; 2:月; 1:日;
      * @param RenewDay 续费日期数目
+     * @param DealNo 交易编号
      * @param PayStyle 交易方式(中文描述)，例如：微信、 支付宝、 银联
      * @param CarNo 车牌号
      * @param CardNo 停车卡号
@@ -29,7 +30,7 @@ public interface FSHardwareServiceI {
      * @param ParkingCode 车管所编号
      * @return
      */
-    ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo, String RechargeAmt, String ParkingCode);
+    ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay,String DealNo , String PayStyle, String CarNo, String CardNo, String RechargeAmt, String ParkingCode);
 
 
     /**
@@ -38,6 +39,7 @@ public interface FSHardwareServiceI {
      * @param ActualAmount 实缴金额（单位元）
      * @param DeductionAmount 抵扣金额（单位元）
      * @param Reason 抵扣原因
+     * @param DealNo 交易编号
      * @param PayStyle 交易方式(汉字描述)，例如：微信、支付宝、银联
      * @param CarNo 车牌号
      * @param CardNo 停车卡号
@@ -55,7 +57,7 @@ public interface FSHardwareServiceI {
      * @param ParkingCode 车管所编号
      * @return
      */
-    ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason, String PayStyle, String CarNo, String CardNo, String CouponList, String ParkingCode);
+    ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason,String DealNo, String PayStyle, String CarNo, String CardNo, String CouponList, String ParkingCode);
 
     /**
      * 获取线下算费结果

CODE/smart-community/hardware-server/src/main/java/com/community/huiju/service/impl/FSHardwareServiceImpl.java

@@ -62,15 +62,15 @@ public class FSHardwareServiceImpl implements FSHardwareServiceI {
 
     @LogAnnotation(value = LogEnums.DA_SU, alias = "第三方月卡上发续费")
     @Override
-    public ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay, String PayStyle, String CarNo, String CardNo,String RechargeAmt, String ParkingCode) {
+    public ResponseBean apiThirdPartyMonthCardPay(String Phone, String RenewDayType, String RenewDay,String DealNo, String PayStyle, String CarNo, String CardNo,String RechargeAmt, String ParkingCode) {
         ResponseBean responseBean = new ResponseBean();
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss");
         // 交易编码
-        String dealNo = idGen.nextId() + "";
+        // String dealNo = idGen.nextId() + "";
         // 第三方交易日期
         String dateTime = dateTimeFormatter.format(LocalDateTime.now());
         // 富士云请求
-        String partyMonthCardPay = fuShiRequestAPI.apiThirdPartyMonthCardPay(RenewDayType, RenewDay, dealNo, PayStyle, CarNo, ParkingCode, CardNo, RechargeAmt, dateTime);
+        String partyMonthCardPay = fuShiRequestAPI.apiThirdPartyMonthCardPay(RenewDayType, RenewDay, DealNo, PayStyle, CarNo, ParkingCode, CardNo, RechargeAmt, dateTime);
         String tradeNo = JSONObject.parseObject(partyMonthCardPay).getString("TradeNo");
         Map<String, Object> map = Maps.newHashMap();
         map.put("TradeNo", tradeNo);
@@ -103,11 +103,11 @@ public class FSHardwareServiceImpl implements FSHardwareServiceI {
      */
     @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, String ParkingCode) {
+    public ResponseBean apiThirdPartyTemporaryCardPay(String Amount, String ActualAmount, String DeductionAmount, String Reason,String DealNo, String PayStyle, String CarNo, String CardNo, String CouponList, String ParkingCode) {
         ResponseBean responseBean = new ResponseBean();
         // 交易编号
-        String dealNo = idGen.nextId() + "";
-        String apiThirdPartyTemporaryCardPay = fuShiRequestAPI.apiThirdPartyTemporaryCardPay(Amount, ActualAmount, DeductionAmount, Reason, dealNo, PayStyle, CarNo, ParkingCode, CardNo, "", CouponList);
+        // String dealNo = idGen.nextId() + "";
+        String apiThirdPartyTemporaryCardPay = fuShiRequestAPI.apiThirdPartyTemporaryCardPay(Amount, ActualAmount, DeductionAmount, Reason, DealNo, PayStyle, CarNo, ParkingCode, CardNo, "", CouponList);
         String tradeNo = JSONObject.parseObject(apiThirdPartyTemporaryCardPay).getString("TradeNo");
         Map<String, Object> map = Maps.newHashMap();
         map.put("TradeNo", tradeNo);

CODE/smart-community/hardware-server/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8088
+  port: 8087
 spring:
   application:
     name: hardware-server