소스 검색

fix

release_toaliyun_real
winter 1 년 전
부모
커밋
94c9a001a1
2개의 변경된 파일7개의 추가작업 그리고 7개의 파일을 삭제
  1. +5
    -5
      mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3ParkService.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3Util.java

+ 5
- 5
mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3ParkService.java 파일 보기

@@ -178,10 +178,10 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA
if (null == valueMap) { if (null == valueMap) {
return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置。"+coupon.getTitle()); return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置。"+coupon.getTitle());
} }
String ruleSyscode = valueMap.get("ruleSyscode");
if (StringUtils.isBlank(ruleSyscode)) {
return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置[ruleSyscode]。"+coupon.getTitle());
}
//String ruleSyscode = valueMap.get("ruleSyscode");
//if (StringUtils.isBlank(ruleSyscode)) {
// return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置[ruleSyscode]。"+coupon.getTitle());
//}
String couponCode = valueMap.get("couponCode"); String couponCode = valueMap.get("couponCode");
if (StringUtils.isBlank(couponCode)) { if (StringUtils.isBlank(couponCode)) {
return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置[couponCode]。"+coupon.getTitle()); return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置[couponCode]。"+coupon.getTitle());
@@ -196,7 +196,7 @@ 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,ruleSyscode,couponCode);
JSONObject retObj = haikangV3.useCoupon(park,getConfig(park),carNumber,couponCode);
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();


+ 2
- 2
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 ruleSyscode,String couponCode){
public JSONObject useCoupon(WxPark wxPark,ArtemisConfig config,String carNumber,String couponCode){
String vendroParams = wxPark.getVendorParams(); String vendroParams = wxPark.getVendorParams();
JSONObject vp = JSON.parseObject(vendroParams); JSONObject vp = JSON.parseObject(vendroParams);
@@ -153,7 +153,7 @@ public class HaiKangWeiShiV3Util {
JSONArray array = new JSONArray(); JSONArray array = new JSONArray();
JSONObject ob = new JSONObject(); JSONObject ob = new JSONObject();
ob.put("ruleSyscode", ruleSyscode);
//ob.put("ruleSyscode", ruleSyscode);
ob.put("merchantSyscode", merchantSysCode); ob.put("merchantSyscode", merchantSysCode);
ob.put("couponCode", couponCode); ob.put("couponCode", couponCode);
ob.put("plateNo", carNumber); ob.put("plateNo", carNumber);


불러오는 중...
취소
저장