Browse Source

fix carstop

release_toaliyun_real
xiaohanzi 4 years ago
parent
commit
981ac35985
10 changed files with 60 additions and 4 deletions
  1. +15
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  2. +6
    -0
      mallinkService/src/main/java/com/iformall/service/park/ParkAdapterService.java
  3. +5
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java
  5. +5
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java
  6. +6
    -1
      mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java
  7. +3
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiUtil.java
  8. +5
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java
  9. +5
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java
  10. +5
    -0
      mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java

+ 15
- 3
mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java View File

@@ -367,8 +367,9 @@ public class WxCarController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券为空");
}
try {
if (null == used || (null != used && used.intValue() < 1)) {
ResultData rs = parkFactory.getParkService(park.getVendorType()).useCoupon(paramMap, park, userCar, coupon, carNumber);
boolean ignoreUseCouponCache = parkFactory.getParkService(park.getVendorType()).ignoreUseCouponCache();
if (ignoreUseCouponCache) {
ResultData rs = parkFactory.getParkService(park.getVendorType()).useCoupon(paramMap, park, userCar, coupon, carNumber);
if (rs.code == Result.SUCCESS) {
etcpHelper.updateWxCouponOrderUsed(userCar, park);
ParkCacheUtils.setCarCouponUsedCacheLock(redisTemplate, vendor.getMessage(), carNumber);
@@ -376,8 +377,19 @@ public class WxCarController extends BaseController {
}else {
return new ResultData(rs.code,rs.message);
}
}else {
if (null == used || (null != used && used.intValue() < 1)) {
ResultData rs = parkFactory.getParkService(park.getVendorType()).useCoupon(paramMap, park, userCar, coupon, carNumber);
if (rs.code == Result.SUCCESS) {
etcpHelper.updateWxCouponOrderUsed(userCar, park);
ParkCacheUtils.setCarCouponUsedCacheLock(redisTemplate, vendor.getMessage(), carNumber);
return new ResultData();
}else {
return new ResultData(rs.code,rs.message);
}
}
return new ResultData(Result.ERROR,"已经使用过优惠券, 不能重复使用.");
}
return new ResultData(Result.ERROR,"已经使用过优惠券, 不能重复使用.");
} catch (Exception e) {
logger.error("park getCoupon error",e);
return new ResultData(Result.ERROR,e.getMessage());


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/park/ParkAdapterService.java View File

@@ -45,6 +45,12 @@ public interface ParkAdapterService {
*/
ResultData carStopFee(Map<String, String> paramMap, WxPark park) throws Exception;
/**
* 是否忽略使用券缓存,不忽略,则走系统,根据停车场出入场通知来控制。忽略,则不需要此判断来判定停车券是否已经使用
* @return
*/
boolean ignoreUseCouponCache();
/**
* 停车券使用, 给老的集成用
*/


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/bolink/BoLinkParkService.java View File

@@ -109,6 +109,11 @@ public class BoLinkParkService extends BaseParkService implements ParkAdapterSer
return null;
}

@Override
public boolean ignoreUseCouponCache() {
return false;
}



}

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java View File

@@ -195,4 +195,9 @@ public class CYFParkService extends BaseParkService implements ParkAdapterServic
return new ResultData();
}

@Override
public boolean ignoreUseCouponCache() {
return false;
}

}

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/dahua/DaHuaParkService.java View File

@@ -72,4 +72,9 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ
return new ResultData();
}

@Override
public boolean ignoreUseCouponCache() {
return false;
}

}

+ 6
- 1
mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiParkService.java View File

@@ -189,7 +189,7 @@ public class HaiKangWeiShiParkService extends BaseParkService implements ParkAda
String orderNo = paramMap.get("parkOrderId");
String planNo = valueMap.get("couponNo");
if (StringUtils.isBlank(planNo)) {
return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置[planNo]。"+coupon.getTitle());
return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置[ruleId]。"+coupon.getTitle());
}
JSONObject retObj = haikang.useCoupon(park,planNo,carNumber,orderNo, getCacheToken(park),haikang.getAuthorization(park,getCacheToken(park)));
if (retObj.getString("code").equals("0")){
@@ -205,6 +205,11 @@ public class HaiKangWeiShiParkService extends BaseParkService implements ParkAda
public ResultData getParkStatus(WxPark park) throws Exception{
return new ResultData();
}

@Override
public boolean ignoreUseCouponCache() {
return true;
}

}

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishi/HaiKangWeiShiUtil.java View File

@@ -211,6 +211,9 @@ public class HaiKangWeiShiUtil {
return attribute;
}
/**
* 2、有优惠券方式
发优惠券的时候是会返回一个优惠券id(3.5.9.1),


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java View File

@@ -334,4 +334,9 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe
return new ResultData();
}

@Override
public boolean ignoreUseCouponCache() {
return false;
}

}

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/shangan/ShangAnParkService.java View File

@@ -90,4 +90,9 @@ public class ShangAnParkService extends BaseParkService implements ParkAdapterSe
public ResultData getParkStatus(WxPark park) {
return null;
}

@Override
public boolean ignoreUseCouponCache() {
return false;
}
}

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/park/impl/tjd/TJDParkService.java View File

@@ -254,4 +254,9 @@ public class TJDParkService extends BaseParkService implements ParkAdapterServic
public ResultData getParkStatus(WxPark park) {
return null;
}

@Override
public boolean ignoreUseCouponCache() {
return false;
}
}

Loading…
Cancel
Save