From 116b122e616a379237346b50978122a6087f0c0a Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 19 Feb 2025 11:52:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=85=85=E7=94=B5=E5=81=9C?= =?UTF-8?q?=E8=BD=A6=E4=BC=98=E6=83=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/common/CommonService.java | 2 +- .../parking/service/impl/LTYTServiceImpl.java | 20 +- jsowell-ui/src/views/pile/station/detail.vue | 178 +++++++++--------- 3 files changed, 100 insertions(+), 100 deletions(-) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index ffd2b0d08..20b265779 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -747,7 +747,7 @@ public class CommonService { // 绑定优惠券 String s = ltytService.bindCoupon(dto); // 如果s为ok, discountFlag为true - discountFlag = StringUtils.equals(s, "ok"); + discountFlag = StringUtils.equalsIgnoreCase(s, "ok"); } else if (StringUtils.equals(ParkingPlatformEnum.SHEN_ZHEN_PLATFORM.getCode(), parkingPlatformId)) { // 深圳道闸 QcyunParkCouponDTO dto = QcyunParkCouponDTO.builder() diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/LTYTServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/LTYTServiceImpl.java index d0ac414ba..47f7649c5 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/LTYTServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/parking/service/impl/LTYTServiceImpl.java @@ -11,7 +11,6 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.sign.MD5Util; -import com.jsowell.pile.domain.CarCouponRecord; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.ThirdpartyParkingConfig; import com.jsowell.pile.dto.lutongyunting.BindCouponDTO; @@ -26,7 +25,8 @@ import org.springframework.stereotype.Service; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.*; +import java.util.Locale; +import java.util.TreeMap; import java.util.concurrent.TimeUnit; /** @@ -144,14 +144,14 @@ public class LTYTServiceImpl implements LTYTService { String msg = resultJson.getString("msg"); // 将下发优惠券信息存入表 - CarCouponRecord carCouponRecord = new CarCouponRecord(); - carCouponRecord.setOrderCode(orderBasicInfo.getOrderCode()); - carCouponRecord.setReturnCode(String.valueOf(resultJson.get("code"))); - carCouponRecord.setReturnMsg(msg); - carCouponRecord.setPlateNumber(dto.getPlateNumber()); - carCouponRecord.setStationId(Long.parseLong(orderBasicInfo.getStationId())); - - carCouponRecordService.insertCarCouponRecord(carCouponRecord); + // CarCouponRecord carCouponRecord = new CarCouponRecord(); + // carCouponRecord.setOrderCode(orderBasicInfo.getOrderCode()); + // carCouponRecord.setReturnCode(String.valueOf(resultJson.get("code"))); + // carCouponRecord.setReturnMsg(msg); + // carCouponRecord.setPlateNumber(dto.getPlateNumber()); + // carCouponRecord.setStationId(Long.parseLong(orderBasicInfo.getStationId())); + // + // carCouponRecordService.insertCarCouponRecord(carCouponRecord); return msg; } diff --git a/jsowell-ui/src/views/pile/station/detail.vue b/jsowell-ui/src/views/pile/station/detail.vue index 525f768d4..8721ec1e5 100644 --- a/jsowell-ui/src/views/pile/station/detail.vue +++ b/jsowell-ui/src/views/pile/station/detail.vue @@ -100,96 +100,96 @@ - -

绑定停车平台(配置完成后,订单完成将自动下发优惠券)

- 编辑参数 - - - - - - - - - - - - - - 保存 - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

绑定停车平台V2(配置完成后,订单完成将自动下发优惠券)