添加特惠租车

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/SpecialRent.java

@@ -243,4 +243,18 @@ public class SpecialRent implements Serializable {
 	@Column(name = "is_del")
 	private Integer isDel;
 
+	/**
+	 *  取车城市名称
+	 */
+	@Column(name = "start_city_name")
+	@ApiModelProperty(value = "取车城市名称")
+	private String startCityName;
+
+	/**
+	 *  还车城市名称
+	 */
+	@Column(name = "end_city_name")
+	@ApiModelProperty(value = "还车城市名称")
+	private String endCityName;
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/SpecialRentBiz.java

@@ -103,6 +103,7 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
         specialRent.setStartCompanyId(vehicle.getManageCompanyId());
         specialRent.setBrandId(vehicle.getBrandId());
         specialRent.setCategoryId(vehicle.getCategoryId());
+        specialRent.setGoodsType(vehicle.getGoodsType());
 
         //缓存商品信息
         specialRent.setGoodsJson(JSONUtil.parse(vehicle).toString());
@@ -125,11 +126,13 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
             CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(specialRent.getEndCompanyId()).getData();
             specialRent.setEndCompanyName(companyDetail.getName());
             specialRent.setEndCityCode(companyDetail.getAddrCity());
+            specialRent.setStartCityName(companyDetail.getCityName());
         }
         if(null != specialRent.getEndCompanyId()) {
             CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(specialRent.getEndCompanyId()).getData();
             specialRent.setEndCompanyName(companyDetail.getName());
             specialRent.setEndCityCode(companyDetail.getAddrCity());
+            specialRent.setEndCityName(companyDetail.getCityName());
         }
         if(null != specialRent.getCategoryId()) {
             VehicleCategory vehicleCategory = vehicleFeign.getVehicleCategory(specialRent.getCategoryId()).getData();