Просмотр исходного кода

[停车券保存][新增]:停车券新增接口修改

release_toaliyun_real
Stormeye.Wu 7 лет назад
Родитель
Сommit
739be8182a
2 измененных файлов: 370 добавлений и 15 удалений
  1. +34
    -15
      mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java
  2. +336
    -0
      mallinkService/src/main/java/com/simple/domain/vo/WxCouponCarVo.java

+ 34
- 15
mallinkAdmin/src/main/java/com/simple/controller/WxCarController.java Просмотреть файл

@@ -7,8 +7,10 @@ import com.simple.common.ErrorCode;
import com.simple.common.Result; import com.simple.common.Result;
import com.simple.common.ResultData; import com.simple.common.ResultData;
import com.simple.domain.po.*; import com.simple.domain.po.*;
import com.simple.domain.vo.WxCouponCarVo;
import com.simple.enums.EnumCarCmd; import com.simple.enums.EnumCarCmd;
import com.simple.enums.EnumCarVendor; import com.simple.enums.EnumCarVendor;
import com.simple.enums.EnumCouponStatus;
import com.simple.service.*; import com.simple.service.*;
import com.simple.utils.ETCPUtil; import com.simple.utils.ETCPUtil;
import com.simple.utils.TJDCarUtil; import com.simple.utils.TJDCarUtil;
@@ -175,12 +177,9 @@ public class WxCarController extends BaseController
return businessId; return businessId;
} }


@ApiOperation("新增接口")
@ApiOperation("新增停车券接口")
@PostMapping("add") @PostMapping("add")
@ApiImplicitParams({
@ApiImplicitParam(name="coupon",value="coupon",dataType="WxCoupon", paramType = "body",required=true),
@ApiImplicitParam(name="vendorParams",value="vendor_params",dataType="String", paramType = "body",required=true)})
public ResultData add(@RequestBody WxCoupon coupon, String vendorParams) {
public ResultData add(@RequestBody WxCouponCarVo coupon) {
/* /*
amount: 1000 amount: 1000
avaliavleNum: 1000 avaliavleNum: 1000
@@ -201,23 +200,44 @@ public class WxCarController extends BaseController
//Assert.notNull(wxCoupon.getName(), "角色名不能为空"); //Assert.notNull(wxCoupon.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
// Save to wx_counpon // Save to wx_counpon
Date curDate = new Date();
WxCoupon wxCoupon = new WxCoupon();
wxCoupon.setTenantId(getUser().getTenantId());
wxCoupon.setMerchantId(coupon.getMerchantId());
if(StringUtils.isNotEmpty(coupon.getSalePriceStr())){ if(StringUtils.isNotEmpty(coupon.getSalePriceStr())){
coupon.setSalePrice((int)Double.parseDouble(coupon.getSalePriceStr())*100);
wxCoupon.setSalePrice((int)Double.parseDouble(coupon.getSalePriceStr())*100);
} }
if(StringUtils.isNotEmpty(coupon.getUsePriceStr())){ if(StringUtils.isNotEmpty(coupon.getUsePriceStr())){
coupon.setUsePrice((int)Double.parseDouble(coupon.getUsePriceStr())*100);
wxCoupon.setUsePrice((int)Double.parseDouble(coupon.getUsePriceStr())*100);
} }
if(StringUtils.isNotEmpty(coupon.getPriceStr())){ if(StringUtils.isNotEmpty(coupon.getPriceStr())){
coupon.setPrice((int)Double.parseDouble(coupon.getPriceStr())*100);
wxCoupon.setPrice((int)Double.parseDouble(coupon.getPriceStr())*100);
} }
if(StringUtils.isNotBlank(coupon.getBusiness())) { if(StringUtils.isNotBlank(coupon.getBusiness())) {
String[] arys = coupon.getBusiness().split(","); String[] arys = coupon.getBusiness().split(",");
coupon.setBusiness(JSON.toJSONString(arys));
wxCoupon.setBusiness(JSON.toJSONString(arys));
} }
coupon.setTenantId(getUser().getTenantId());
coupon.setChannels("");
Long id = wxCouponService.saveOrUpdate(coupon);

wxCoupon.setType(coupon.getType());
wxCoupon.setCoverImg(coupon.getCoverImg());
wxCoupon.setTitle(coupon.getTitle());
wxCoupon.setSubTitle(coupon.getSubTitle());
wxCoupon.setUseLimitQuantity(coupon.getUseLimitQuantity());
wxCoupon.setTargetAd(coupon.getTargetAd());
wxCoupon.setSendType(coupon.getSendType());
wxCoupon.setValidType(coupon.getValidType());
wxCoupon.setValidStartDate(coupon.getValidStartDate());
wxCoupon.setValidEndDate(coupon.getValidEndDate());
wxCoupon.setValidDays(coupon.getValidDays());
wxCoupon.setDetail(coupon.getDetail());
wxCoupon.setUnit(coupon.getUnit());
wxCoupon.setRemainInventory(coupon.getRemainInventory());
wxCoupon.setInventory(coupon.getInventory());
wxCoupon.setRemark(coupon.getRemark());
wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode());
wxCoupon.setCreateDate(curDate);
wxCoupon.setUpdateDate(curDate);
wxCoupon.setChannels("");
Long id = wxCouponService.saveOrUpdate(wxCoupon);


// Save to wx_coupon_car // Save to wx_coupon_car
WxCouponCar couponCar = new WxCouponCar(); WxCouponCar couponCar = new WxCouponCar();
@@ -229,8 +249,7 @@ public class WxCarController extends BaseController
WxPark park = getCurrentPark(user); WxPark park = getCurrentPark(user);
couponCar.setParkId(park.getId()); couponCar.setParkId(park.getId());
couponCar.setVendorType(park.getVendorType()); couponCar.setVendorType(park.getVendorType());
couponCar.setVendorParams(vendorParams);
Date curDate = new Date();
couponCar.setVendorParams(coupon.getVendorParams());
couponCar.setCreateDate(curDate); couponCar.setCreateDate(curDate);
couponCar.setUpdateDate(curDate); couponCar.setUpdateDate(curDate);
wxCouponCarService.save(couponCar); wxCouponCarService.save(couponCar);


+ 336
- 0
mallinkService/src/main/java/com/simple/domain/vo/WxCouponCarVo.java Просмотреть файл

@@ -0,0 +1,336 @@
package com.simple.domain.vo;

import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

public class WxCouponCarVo implements Serializable {
private static final long serialVersionUID = 1L;

@Id
protected Long id;

@Transient
protected List<Long> ids;
@Transient
protected String sortColumns;

@Transient
protected String channels;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public String getSortColumns() {
return sortColumns;
}

public List<Long> getIds() {
return ids;
}

public void setIds(List<Long> ids) {
this.ids = ids;
}


@Transient
private String salePriceStr;

@Transient
private String usePriceStr;

@Transient
private String priceStr;

/*租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
/*商户id**/
@io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId")
private Long merchantId;
/*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/
@io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type")
private Integer type;
/*封面图**/
@io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg")
private String coverImg;
/*券名称**/
@io.swagger.annotations.ApiModelProperty(value="券名称",name="title")
private String title;
/*副标题**/
@io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle")
private String subTitle;
/*售价(适用于类型2,3,4,5)**/
@io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice")
private Integer salePrice;
/*使用条件金额(适用于类型1,2,3,4)**/
@io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice")
private Integer usePrice;
/*限领张数**/
@io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity")
private Integer useLimitQuantity;
/*投放频道位置(1.banner图,2.限时抢购)**/
@io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.banner图,2.限时抢购)",name="targetAd")
private Integer targetAd;
/*1.主动领取2.定向投放**/
@io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType")
private Integer sendType;
/*有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)**/
@io.swagger.annotations.ApiModelProperty(value="有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)",name="validType")
private Integer validType;
/*有效日期-开始**/
@io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate")
private Date validStartDate;
/*有效日期-结束**/
@io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate")
private Date validEndDate;
/*自领取之日几日有效,(停车券当天有效)**/
@io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays")
private Integer validDays;
/*须知**/
@io.swagger.annotations.ApiModelProperty(value="须知",name="detail")
private String detail;
/*面额**/
@io.swagger.annotations.ApiModelProperty(value="面额",name="price")
private Integer price;
/*单位**/
@io.swagger.annotations.ApiModelProperty(value="单位(0:rmb分 1:小时)",name="unit")
private Integer unit;
/*剩余库存**/
@io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory")
private Integer remainInventory;
/*总库存**/
@io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory")
private Integer inventory;
/*购买须知**/
@io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark")
private String remark;
/*状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)**/
@io.swagger.annotations.ApiModelProperty(value="状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status")
private Integer status;
/*创建时间**/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
/*更新时间**/
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;
/*业态**/
@io.swagger.annotations.ApiModelProperty(value="业态",name="business")
private String business;
/*车场厂商相关信息**/
@io.swagger.annotations.ApiModelProperty(value="车场厂商相关信息",name="vendorParams")
private String vendorParams;
public String getTenantId() {
return tenantId;
}
public void setTenantId(String _tenantId) {
tenantId = _tenantId;
}
public Long getMerchantId() {
return merchantId;
}
public void setMerchantId(Long _merchantId) {
merchantId = _merchantId;
}
public Integer getType() {
return type;
}
public void setType(Integer _type) {
type = _type;
}
public String getCoverImg() {
return coverImg;
}
public void setCoverImg(String _coverImg) {
coverImg = _coverImg;
}
public String getTitle() {
return title;
}
public void setTitle(String _title) {
title = _title;
}
public String getSubTitle() {
return subTitle;
}
public void setSubTitle(String _subTitle) {
subTitle = _subTitle;
}
public Integer getSalePrice() {
return salePrice;
}
public void setSalePrice(Integer _salePrice) {
salePrice = _salePrice;
}
public Integer getUsePrice() {
return usePrice;
}
public void setUsePrice(Integer _usePrice) {
usePrice = _usePrice;
}
public Integer getUseLimitQuantity() {
return useLimitQuantity;
}
public void setUseLimitQuantity(Integer _useLimitQuantity) {
useLimitQuantity = _useLimitQuantity;
}
public Integer getTargetAd() {
return targetAd;
}
public void setTargetAd(Integer _targetAd) {
targetAd = _targetAd;
}
public Integer getSendType() {
return sendType;
}
public void setSendType(Integer _sendType) {
sendType = _sendType;
}
public Integer getValidType() {
return validType;
}
public void setValidType(Integer _validType) {
validType = _validType;
}
public Date getValidStartDate() {
return validStartDate;
}
public void setValidStartDate(Date _validStartDate) {
validStartDate = _validStartDate;
}
public Date getValidEndDate() {
return validEndDate;
}
public void setValidEndDate(Date _validEndDate) {
validEndDate = _validEndDate;
}
public Integer getValidDays() {
return validDays;
}
public void setValidDays(Integer _validDays) {
validDays = _validDays;
}
public String getDetail() {
return detail;
}
public void setDetail(String _detail) {
detail = _detail;
}
public Integer getPrice() {
return price;
}
public void setPrice(Integer _price) {
price = _price;
}
public Integer getUnit() {
return unit;
}
public void setUnit(Integer _unit) {
unit = _unit;
}
public Integer getRemainInventory() {
return remainInventory;
}
public void setRemainInventory(Integer _remainInventory) {
remainInventory = _remainInventory;
}
public Integer getInventory() {
return inventory;
}
public void setInventory(Integer _inventory) {
inventory = _inventory;
}
public String getRemark() {
return remark;
}
public void setRemark(String _remark) {
remark = _remark;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer _status) {
status = _status;
}
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date _createDate) {
createDate = _createDate;
}
public Date getUpdateDate() {
return updateDate;
}
public void setUpdateDate(Date _updateDate) {
updateDate = _updateDate;
}
public String getBusiness() {
return business;
}
public void setBusiness(String _business) {
business = _business;
}

public String getVendorParams() {
return vendorParams;
}

public void setVendorParams(String vendorParams) {
this.vendorParams = vendorParams;
}

public String getSalePriceStr() {
if(salePrice!=null) {
DecimalFormat df=new DecimalFormat("0.00");
salePriceStr = df.format((float)salePrice/100);
}
return salePriceStr;
}

public void setSalePriceStr(String salePriceStr) {
this.salePriceStr = salePriceStr;
}

public String getUsePriceStr() {
if(usePrice!=null) {
DecimalFormat df=new DecimalFormat("0.00");
usePriceStr = df.format((float)usePrice/100);
}
return usePriceStr;
}

public void setUsePriceStr(String usePriceStr) {
this.usePriceStr = usePriceStr;
}

public String getPriceStr() {
if(price!=null) {
DecimalFormat df=new DecimalFormat("0.00");
priceStr = df.format((float)price/100);
}
return priceStr;
}

public void setPriceStr(String priceStr) {
this.priceStr = priceStr;
}

public String getChannels() {
return channels;
}

public void setChannels(String channels) {
this.channels = channels;
}
}

Загрузка…
Отмена
Сохранить