From 47c1b42a00351e981a42a1810020d401e879c5c3 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 13 May 2023 10:49:05 +0800 Subject: [PATCH 1/6] fix car --- .../service/park/impl/jieshunV2/JieShunV2ParkService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java index dbb90cf3a..3b581f5fb 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java @@ -227,7 +227,8 @@ public class JieShunV2ParkService extends BaseParkService implements ParkAdapter JSONObject retObject = retArrays.getJSONObject(0).getJSONObject("attributes"); String createTime = retObject.getString("startTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” String endTime = retObject.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” - String payPath = "pages/thirdPayOrderByNo/payOrder?orderNo="+parkOrderId+"&freeMinute="+freeMinute; + String payPath = "pages/index/index"; + //String payPath = "pages/thirdPayOrderByNo/payOrder?orderNo="+parkOrderId+"&freeMinute="+freeMinute; //String payPath = "pages/thirdPayOrder/payOrder?carNo="+jieshun.handleCarNumber(carNumber)+"&parkCode="+park.getParkingId(); return new ParkStopFee(parkOrderId,jieshun.utcToLocal(createTime),jieshun.utcToLocal(endTime), String.valueOf(retObject.getDouble("totalFee")),appId,payPath,null,null,"请支付后"+freeMinute+"分钟内离场"); From f0040b445dd54f941ea369d2a5057690947b958a Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 13 May 2023 18:06:05 +0800 Subject: [PATCH 2/6] fix --- .../service/park/impl/jieshunV2/JieShunV2ParkService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java index 275d19aaa..0b64aa371 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java @@ -228,8 +228,7 @@ public class JieShunV2ParkService extends BaseParkService implements ParkAdapter JSONObject retObject = retArrays.getJSONObject(0).getJSONObject("attributes"); String createTime = retObject.getString("startTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” String endTime = retObject.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” - String payPath = "pages/index/index"; - //String payPath = "pages/thirdPayOrderByNo/payOrder?orderNo="+parkOrderId+"&freeMinute="+freeMinute; + String payPath = "pages/thirdPayOrderByNo/payOrder?orderNo="+parkOrderId+"&freeMinute="+freeMinute; //String payPath = "pages/thirdPayOrder/payOrder?carNo="+jieshun.handleCarNumber(carNumber)+"&parkCode="+park.getParkingId(); return new ParkStopFee(parkOrderId,jieshun.utcToLocal(createTime),jieshun.utcToLocal(endTime), String.valueOf(retObject.getDouble("totalFee")),appId,payPath,null,null,"请支付后"+freeMinute+"分钟内离场"); From 6d828df6130e851ed7337ef8e0a830cd6b93862a Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 13 May 2023 18:13:54 +0800 Subject: [PATCH 3/6] fix --- .../service/park/impl/jieshunV2/JieShunV2ParkService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java index 3b581f5fb..dbb90cf3a 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshunV2/JieShunV2ParkService.java @@ -227,8 +227,7 @@ public class JieShunV2ParkService extends BaseParkService implements ParkAdapter JSONObject retObject = retArrays.getJSONObject(0).getJSONObject("attributes"); String createTime = retObject.getString("startTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” String endTime = retObject.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” - String payPath = "pages/index/index"; - //String payPath = "pages/thirdPayOrderByNo/payOrder?orderNo="+parkOrderId+"&freeMinute="+freeMinute; + String payPath = "pages/thirdPayOrderByNo/payOrder?orderNo="+parkOrderId+"&freeMinute="+freeMinute; //String payPath = "pages/thirdPayOrder/payOrder?carNo="+jieshun.handleCarNumber(carNumber)+"&parkCode="+park.getParkingId(); return new ParkStopFee(parkOrderId,jieshun.utcToLocal(createTime),jieshun.utcToLocal(endTime), String.valueOf(retObject.getDouble("totalFee")),appId,payPath,null,null,"请支付后"+freeMinute+"分钟内离场"); From e9d4d6e80caa1342ed4487526b062b972773e4e8 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Tue, 16 May 2023 12:56:34 +0800 Subject: [PATCH 4/6] fix bug --- .../WxCarJieShunV2CallBackController.java | 111 ++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java new file mode 100644 index 000000000..387551485 --- /dev/null +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java @@ -0,0 +1,111 @@ +package com.iformall.controller.callback.car.jieshun; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; +import com.iformall.common.Result; +import com.iformall.controller.base.BaseController; +import com.iformall.controller.callback.car.WxParkCallBackBaseController; +import com.iformall.domain.po.*; +import com.iformall.domain.vo.WxCarCYFVo; +import com.iformall.enums.EnumCarCmd; +import com.iformall.enums.EnumCarVendor; +import com.iformall.enums.EnumCouponSendSendType; +import com.iformall.enums.EnumPayWay; +import com.iformall.service.*; +import com.iformall.service.park.impl.cyf.CYFUtil; +import com.iformall.service.park.impl.tjd.TJDUtil; + +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author: furunxin + * @Date: 2020/7/6 15:29 + * @Description: 车易付回调接口 + */ + +@Slf4j +@RestController +@RequestMapping("/jieshunCarCallbackV2") +public class WxCarJieShunV2CallBackController extends WxParkCallBackBaseController { + + @Autowired + WxParkService wxParkService; + + @Autowired + WxCarCmdLogService wxCarCmdLogService; + + @Autowired + WxCUserService wxCUserService; + + @Autowired + WxCUserCarService wxCUserCarService; + + @Autowired + WxCouponSendService wxCouponSendService; + + @Autowired + WxCarPayRecordService wxCarPayRecordService; + + @Autowired + WxCUserBasicInfoService wxCUserBasicInfoService; + + /** + * @description 捷顺 车辆入场通知 + * {dataItems=[{"inTime":"2020-12-09 11:21:15","carNumber":"浙-AF81797","inCarPhoto":"p201127315/NISSP_IMG_PARK_IN/20201209/a9f1130651b9493f8eab64f14afbdd47","isReal":0,"itemId":"a9f1130651b9493f8eab64f14afbdd47","inOperator":"超级管理员","equipName":"东门入口","parkName":"杭州东站西子国际","vehicleInfo":"{\"plateNo\":\"浙-AF81797\",\"plateColor\":\"GREEN\",\"plateBackColor\":0,\"plateWordColor\":0,\"vehicleColor\":null,\"vehicleLogo\":null,\"vehicleModel\":null,\"mainModel\":0,\"subModel\":0,\"vehicleModelTrust\":0,\"mainModelTrust\":0,\"subModelTrust\":0,\"plateNoTrust\":1,\"vehicleLogoTrust\":0,\"vehicleColorTrust\":0}","equipCode":"208202496","parkCode":"p201127315"}], pno=dzxzgj, sn=6C958D99D2769AA16F3A3F06E962263F, tn=-2, ts=20201209112118886, ve=1.0} + * + * + * + * @Params [paramMap] + * @return com.iformall.common.Result + * @Author furunxin + * @Date 2020/7/8 上午8:27 + **/ + @PostMapping(value = "/parkIn") + public Result parkInCallback(@RequestBody Map paramMap) { + log.info("["+getIpAddr()+"] jieshunCarCallback parkIn: " + paramMap.toString()); + //解析车易付参数 + return super.parkInCallBack(EnumCarVendor.CAR_JIESHUN_V2, EnumCarCmd.CAR_JIESHUN_CALLBACK_PARK_IN, paramMap); + } + + + /** + * @description 车易付 车辆离场通知 + * @Params [param] + * @return java.util.Map + * @Author furunxin + * @Date 2020/7/12 上午9:00 + **/ + @PostMapping(value = "/parkOut") + public Result parkOutCallback(@RequestBody Map paramMap) { + log.info("["+getIpAddr()+"] jieshunCarCallback parkOut: " + paramMap.toString()); + return super.parkOutCallBack(EnumCarVendor.CAR_JIESHUN_V2, EnumCarCmd.CAR_JIESHUN_CALLBACK_PARK_OUT, paramMap); + + } + + @PostMapping(value = "/unbind") + public Result unbindCallback(@RequestBody Map paramMap) { + log.info("["+getIpAddr()+"] jieshunCarCallback unbind: " + paramMap.toString()); + //解析车易付参数 + return super.unbindCarCallBack(EnumCarVendor.CAR_JIESHUN_V2, EnumCarCmd.CAR_JIESHUN_CALLBACK_UNBIND, paramMap); + } + + @PostMapping(value = "/paid") + public Result paidCallback(@RequestBody Map paramMap) { + log.info("["+getIpAddr()+"] jieshunCarCallback paid: " + paramMap.toString()); + //解析车易付参数 + return super.paidCallback(EnumCarVendor.CAR_JIESHUN_V2, EnumCarCmd.CAR_JIESHUN_CALLBACK_PAID, paramMap); + } +} From 2b952102d7a98118504f5d84d5cdf75be2c3dc2d Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Tue, 16 May 2023 12:59:01 +0800 Subject: [PATCH 5/6] test --- .../callback/car/jieshun/WxCarJieShunCallBackController.java | 2 +- .../callback/car/jieshun/WxCarJieShunV2CallBackController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java index b1454a31f..1871714fa 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java @@ -38,7 +38,7 @@ import java.util.Map; @Slf4j @RestController -@RequestMapping("/jieshunCarCallback") +@RequestMapping("/jieshunCarCallbackV") public class WxCarJieShunCallBackController extends WxParkCallBackBaseController { @Autowired diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java index 387551485..7b34f67eb 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java @@ -38,7 +38,7 @@ import java.util.Map; @Slf4j @RestController -@RequestMapping("/jieshunCarCallbackV2") +@RequestMapping("/jieshunCarCallback") public class WxCarJieShunV2CallBackController extends WxParkCallBackBaseController { @Autowired From 59fc4d8007a34f15a64c0c6a198c805aff22e261 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Tue, 16 May 2023 13:09:26 +0800 Subject: [PATCH 6/6] fix --- .../callback/car/jieshun/WxCarJieShunCallBackController.java | 2 +- .../callback/car/jieshun/WxCarJieShunV2CallBackController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java index 1871714fa..b1454a31f 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java @@ -38,7 +38,7 @@ import java.util.Map; @Slf4j @RestController -@RequestMapping("/jieshunCarCallbackV") +@RequestMapping("/jieshunCarCallback") public class WxCarJieShunCallBackController extends WxParkCallBackBaseController { @Autowired diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java index 7b34f67eb..387551485 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunV2CallBackController.java @@ -38,7 +38,7 @@ import java.util.Map; @Slf4j @RestController -@RequestMapping("/jieshunCarCallback") +@RequestMapping("/jieshunCarCallbackV2") public class WxCarJieShunV2CallBackController extends WxParkCallBackBaseController { @Autowired