winter 1 год назад
Родитель
Сommit
557ad258bb
2 измененных файлов: 23 добавлений и 5 удалений
  1. +20
    -4
      mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3ParkService.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3Util.java

+ 20
- 4
mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3ParkService.java Просмотреть файл

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;


import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.ZoneId;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder; import java.time.format.DateTimeFormatterBuilder;
@@ -150,9 +151,7 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA
//if (fee <= 0 && StringUtils.isBlank(parkOrderId)) { //if (fee <= 0 && StringUtils.isBlank(parkOrderId)) {
// parkOrderId = attribute.getString("inRecordSyscode"); // parkOrderId = attribute.getString("inRecordSyscode");
//} //}
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX");
ZonedDateTime zonedDateTime = ZonedDateTime.parse(attribute.getString("enterTime"), formatter);
Date _createTime = Date.from(zonedDateTime.toInstant());
Date _createTime = castISO8601TimeToDate(attribute.getString("enterTime"));
Date _endTime = DateUtils.getMinuteTimeAfter(attribute.getIntValue("parkTime"), _createTime);//离场时间,格式为“yyyy-MM-dd HH:mi:ss” Date _endTime = DateUtils.getMinuteTimeAfter(attribute.getIntValue("parkTime"), _createTime);//离场时间,格式为“yyyy-MM-dd HH:mi:ss”
String payPath = ""; String payPath = "";
Integer freeMinute = (Integer)park.getVendorParamsByKey("freeMinute"); Integer freeMinute = (Integer)park.getVendorParamsByKey("freeMinute");
@@ -160,6 +159,19 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA
String.valueOf(fee),appId,payPath,null,null,"0元请勿使用优惠券,无法退回。支付后"+freeMinute+"分钟内离场"); String.valueOf(fee),appId,payPath,null,null,"0元请勿使用优惠券,无法退回。支付后"+freeMinute+"分钟内离场");
} }
private Date castISO8601TimeToDate(String iso8601Time) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX");
ZonedDateTime zonedDateTime = ZonedDateTime.parse(iso8601Time, formatter);
Date _createTime = Date.from(zonedDateTime.toInstant());
return _createTime;
}
private static String dateToISO8601Time(Date date) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX");
ZonedDateTime zonedDateTime = date.toInstant().atZone(ZoneId.systemDefault());
return zonedDateTime.format(formatter);
}
/** /**
* /api/pms/v1/coupon/addition * /api/pms/v1/coupon/addition
* @return * @return
@@ -196,7 +208,9 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA
return new ResultData(ErrorCode.CYF_STOP_FEE_FAIL.getCode(), "已经使用过优惠券, 不能重复使用."); return new ResultData(ErrorCode.CYF_STOP_FEE_FAIL.getCode(), "已经使用过优惠券, 不能重复使用.");
} }
JSONObject retObj = haikangV3.useCoupon(park,getConfig(park),carNumber,couponCode);
String couponStart = dateToISO8601Time(coupon.getValidStartDate());
String couponEnd = dateToISO8601Time(coupon.getValidEndDate());
JSONObject retObj = haikangV3.useCoupon(park,getConfig(park),carNumber,couponCode,couponStart,couponEnd);
RedisCacheUtils.cache(redisTemplate, "carStop:haikangv2StopInfoUseCoupon:"+carNumber+":"+inRecordSyscode, 1, 24*3600); RedisCacheUtils.cache(redisTemplate, "carStop:haikangv2StopInfoUseCoupon:"+carNumber+":"+inRecordSyscode, 1, 24*3600);
return new ResultData(); return new ResultData();
@@ -249,6 +263,8 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA
String sysPakCode = ""; String sysPakCode = "";
System.out.println("优惠规则列表:"+v3.queryRuleList(config,sysPakCode)); System.out.println("优惠规则列表:"+v3.queryRuleList(config,sysPakCode));
System.out.println(dateToISO8601Time(new Date()));
} }


} }

+ 3
- 1
mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3Util.java Просмотреть файл

@@ -145,7 +145,7 @@ public class HaiKangWeiShiV3Util {
/** /**
* 使用优惠券 * 使用优惠券
**/ **/
public JSONObject useCoupon(WxPark wxPark,ArtemisConfig config,String carNumber,String couponCode){
public JSONObject useCoupon(WxPark wxPark,ArtemisConfig config,String carNumber,String couponCode,String start,String end){
String vendroParams = wxPark.getVendorParams(); String vendroParams = wxPark.getVendorParams();
JSONObject vp = JSON.parseObject(vendroParams); JSONObject vp = JSON.parseObject(vendroParams);
@@ -158,6 +158,8 @@ public class HaiKangWeiShiV3Util {
ob.put("couponCode", couponCode); ob.put("couponCode", couponCode);
ob.put("plateNo", carNumber); ob.put("plateNo", carNumber);
ob.put("parkSyscode", wxPark.getParkingId()); ob.put("parkSyscode", wxPark.getParkingId());
ob.put("startTime", start);
ob.put("endTime", end);
array.add(ob); array.add(ob);
Map param = new HashMap(); Map param = new HashMap();


Загрузка…
Отмена
Сохранить