配置充电停车优惠

This commit is contained in:
Guoqs
2025-02-19 11:52:27 +08:00
parent 052ed2b0ed
commit 116b122e61
3 changed files with 100 additions and 100 deletions

View File

@@ -747,7 +747,7 @@ public class CommonService {
// 绑定优惠券 // 绑定优惠券
String s = ltytService.bindCoupon(dto); String s = ltytService.bindCoupon(dto);
// 如果s为ok, discountFlag为true // 如果s为ok, discountFlag为true
discountFlag = StringUtils.equals(s, "ok"); discountFlag = StringUtils.equalsIgnoreCase(s, "ok");
} else if (StringUtils.equals(ParkingPlatformEnum.SHEN_ZHEN_PLATFORM.getCode(), parkingPlatformId)) { } else if (StringUtils.equals(ParkingPlatformEnum.SHEN_ZHEN_PLATFORM.getCode(), parkingPlatformId)) {
// 深圳道闸 // 深圳道闸
QcyunParkCouponDTO dto = QcyunParkCouponDTO.builder() QcyunParkCouponDTO dto = QcyunParkCouponDTO.builder()

View File

@@ -11,7 +11,6 @@ import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.DateUtils;
import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.StringUtils;
import com.jsowell.common.util.sign.MD5Util; import com.jsowell.common.util.sign.MD5Util;
import com.jsowell.pile.domain.CarCouponRecord;
import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.ThirdpartyParkingConfig; import com.jsowell.pile.domain.ThirdpartyParkingConfig;
import com.jsowell.pile.dto.lutongyunting.BindCouponDTO; import com.jsowell.pile.dto.lutongyunting.BindCouponDTO;
@@ -26,7 +25,8 @@ import org.springframework.stereotype.Service;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.*; import java.util.Locale;
import java.util.TreeMap;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
/** /**
@@ -144,14 +144,14 @@ public class LTYTServiceImpl implements LTYTService {
String msg = resultJson.getString("msg"); String msg = resultJson.getString("msg");
// 将下发优惠券信息存入表 // 将下发优惠券信息存入表
CarCouponRecord carCouponRecord = new CarCouponRecord(); // CarCouponRecord carCouponRecord = new CarCouponRecord();
carCouponRecord.setOrderCode(orderBasicInfo.getOrderCode()); // carCouponRecord.setOrderCode(orderBasicInfo.getOrderCode());
carCouponRecord.setReturnCode(String.valueOf(resultJson.get("code"))); // carCouponRecord.setReturnCode(String.valueOf(resultJson.get("code")));
carCouponRecord.setReturnMsg(msg); // carCouponRecord.setReturnMsg(msg);
carCouponRecord.setPlateNumber(dto.getPlateNumber()); // carCouponRecord.setPlateNumber(dto.getPlateNumber());
carCouponRecord.setStationId(Long.parseLong(orderBasicInfo.getStationId())); // carCouponRecord.setStationId(Long.parseLong(orderBasicInfo.getStationId()));
//
carCouponRecordService.insertCarCouponRecord(carCouponRecord); // carCouponRecordService.insertCarCouponRecord(carCouponRecord);
return msg; return msg;
} }

View File

@@ -100,96 +100,96 @@
</el-form> </el-form>
</el-card> </el-card>
<el-card style="margin-bottom: 10px"> <!-- <el-card style="margin-bottom: 10px">-->
<h2>绑定停车平台(配置完成后订单完成将自动下发优惠券)</h2> <!-- <h2>绑定停车平台(配置完成后订单完成将自动下发优惠券)</h2>-->
<el-button <!-- <el-button-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="big" <!-- size="big"-->
@click="parkingOpenEdit" <!-- @click="parkingOpenEdit"-->
v-has-permi="['pile:station:edit']" <!-- v-has-permi="['pile:station:edit']"-->
>编辑参数 <!-- >编辑参数-->
</el-button> <!-- </el-button>-->
<el-form <!-- <el-form-->
ref="parkingForm" <!-- ref="parkingForm"-->
:model="parkingInfo" <!-- :model="parkingInfo"-->
label-position="right" <!-- label-position="right"-->
label-width="200px" <!-- label-width="200px"-->
style="margin-top: 10px" <!-- style="margin-top: 10px"-->
> <!-- >-->
<el-row> <!-- <el-row>-->
<el-col :span="5"> <!-- <el-col :span="5">-->
<el-form-item label="停车平台名称:" prop="type"> <!-- <el-form-item label="停车平台名称:" prop="type">-->
<el-select <!-- <el-select-->
v-model="parkingInfo.parkingName" <!-- v-model="parkingInfo.parkingName"-->
placeholder="请选择停车平台名称" <!-- placeholder="请选择停车平台名称"-->
clearable <!-- clearable-->
filterable <!-- filterable-->
style="width: 220px" <!-- style="width: 220px"-->
:disabled="parkingDisableFlag" <!-- :disabled="parkingDisableFlag"-->
@change="getParkingInfo($event)" <!-- @change="getParkingInfo($event)"-->
> <!-- >-->
<el-option <!-- <el-option-->
v-for="item in parkingInfoList" <!-- v-for="item in parkingInfoList"-->
:key="item.id" <!-- :key="item.id"-->
:label="item.parkingName" <!-- :label="item.parkingName"-->
:value="item.id" <!-- :value="item.id"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item> <!-- <el-form-item>-->
<el-button <!-- <el-button-->
size="big" <!-- size="big"-->
@click="saveParkingSetting(parkingInfo.id)" <!-- @click="saveParkingSetting(parkingInfo.id)"-->
v-has-permi="['pile:station:edit']" <!-- v-has-permi="['pile:station:edit']"-->
> <!-- >-->
保存 <!-- 保存-->
</el-button> <!-- </el-button>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="停车场库secretKey:" prop="secretKey"> <!-- <el-form-item label="停车场库secretKey:" prop="secretKey">-->
<el-input <!-- <el-input-->
placeholder="请输入" <!-- placeholder="请输入"-->
v-model="parkingInfo.secretKey" <!-- v-model="parkingInfo.secretKey"-->
:disabled="true" <!-- :disabled="true"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="停车场库appId:" prop="appId"> <!-- <el-form-item label="停车场库appId:" prop="appId">-->
<el-input <!-- <el-input-->
placeholder="请输入" <!-- placeholder="请输入"-->
v-model="parkingInfo.appId" <!-- v-model="parkingInfo.appId"-->
:disabled="true" <!-- :disabled="true"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
<el-row> <!-- <el-row>-->
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="票券id:" prop="couponId"> <!-- <el-form-item label="票券id:" prop="couponId">-->
<el-input <!-- <el-input-->
placeholder="请输入" <!-- placeholder="请输入"-->
v-model="parkingInfo.couponId" <!-- v-model="parkingInfo.couponId"-->
:disabled="false" <!-- :disabled="false"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="停车场库商户id:" prop="parkingMerchantId"> <!-- <el-form-item label="停车场库商户id:" prop="parkingMerchantId">-->
<el-input <!-- <el-input-->
placeholder="请输入" <!-- placeholder="请输入"-->
v-model="parkingInfo.parkingMerchantId" <!-- v-model="parkingInfo.parkingMerchantId"-->
:disabled="false" <!-- :disabled="false"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
</el-form> <!-- </el-form>-->
</el-card> <!-- </el-card>-->
<el-card style="margin-bottom: 10px"> <el-card style="margin-bottom: 10px">
<h2>绑定停车平台V2(配置完成后订单完成将自动下发优惠券)</h2> <h2>绑定停车平台V2(配置完成后订单完成将自动下发优惠券)</h2>