| @@ -249,7 +249,7 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ | |||||
| JSONObject verfy = verfyArrays.getJSONObject(0).getJSONObject("attributes"); | JSONObject verfy = verfyArrays.getJSONObject(0).getJSONObject("attributes"); | ||||
| String userId = verfy.getString("userId"); | String userId = verfy.getString("userId"); | ||||
| //查询门店下打折方案 | //查询门店下打折方案 | ||||
| String queryPlanRet = jieshun.querySalePlan(park, getCacheToken(park), userId); | |||||
| String queryPlanRet = dahua.querySalePlan(park, getCacheToken(park), userId); | |||||
| logger.info("jieshun querySalePlan result:"+queryPlanRet); | logger.info("jieshun querySalePlan result:"+queryPlanRet); | ||||
| JSONObject queryPlantRetObj = JSON.parseObject(queryPlanRet); | JSONObject queryPlantRetObj = JSON.parseObject(queryPlanRet); | ||||
| if (queryPlantRetObj.getIntValue("resultCode") == 0){ | if (queryPlantRetObj.getIntValue("resultCode") == 0){ | ||||
| @@ -268,7 +268,7 @@ public class DaHuaParkService extends BaseParkService implements ParkAdapterServ | |||||
| return new ResultData(ErrorCode.CYF_STOP_FEE_FAIL.getCode(),"当前优惠券配置的捷顺编号无效,请联系管理员。"+coupon.getTitle()); | return new ResultData(ErrorCode.CYF_STOP_FEE_FAIL.getCode(),"当前优惠券配置的捷顺编号无效,请联系管理员。"+coupon.getTitle()); | ||||
| } | } | ||||
| //使用打折方案 | //使用打折方案 | ||||
| String executeRet = jieshun.executediscount(park, planNo, userId, carNumber, getCacheToken(park)); | |||||
| String executeRet = dahua.executediscount(park, planNo, userId, carNumber, getCacheToken(park)); | |||||
| logger.info("jieshun executediscount result:"+executeRet); | logger.info("jieshun executediscount result:"+executeRet); | ||||
| JSONObject executeRetObj = JSON.parseObject(executeRet); | JSONObject executeRetObj = JSON.parseObject(executeRet); | ||||
| if (executeRetObj.getIntValue("resultCode") == 0){ | if (executeRetObj.getIntValue("resultCode") == 0){ | ||||