diff --git a/bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/LeRequest.java b/bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/LeRequest.java new file mode 100644 index 00000000..a17f309f --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/common/houqin/utils/LeRequest.java @@ -0,0 +1,69 @@ +package com.bonus.common.houqin.utils; + +import io.swagger.annotations.ApiModelProperty; + +import javax.validation.Valid; + +public class LeRequest { + @ApiModelProperty("版本控制") + private String version; + @ApiModelProperty("随机字符串") + private String nonceStr; + @ApiModelProperty("时间戳") + private String timestamp; + @ApiModelProperty("签名类型") + private String signType; + @ApiModelProperty("业务参数") + private @Valid T content; + @ApiModelProperty("签名") + private String sign; + + public String getVersion() { + return this.version; + } + + public String getNonceStr() { + return this.nonceStr; + } + + public String getTimestamp() { + return this.timestamp; + } + + public String getSignType() { + return this.signType; + } + + public T getContent() { + return this.content; + } + + public String getSign() { + return this.sign; + } + + public void setVersion(final String version) { + this.version = version; + } + + public void setNonceStr(final String nonceStr) { + this.nonceStr = nonceStr; + } + + public void setTimestamp(final String timestamp) { + this.timestamp = timestamp; + } + + public void setSignType(final String signType) { + this.signType = signType; + } + + public void setContent(final T content) { + this.content = content; + } + + public void setSign(final String sign) { + this.sign = sign; + } + +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/export/service/ExportRecordService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/export/service/ExportRecordService.java index 83c28010..ceb5319d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/export/service/ExportRecordService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/common/export/service/ExportRecordService.java @@ -14,9 +14,9 @@ import com.bonus.canteen.core.common.redis.RedisUtil; import com.bonus.canteen.core.customer.utils.SecureManager; import com.bonus.canteen.core.order.utils.LeNumUtil; import com.bonus.common.core.exception.ServiceException; -import com.bonus.common.core.utils.id.Id; import com.bonus.common.houqin.constant.LeConstants; import com.bonus.common.houqin.i18n.I18n; +import com.bonus.common.houqin.utils.id.Id; import com.github.pagehelper.page.PageMethod; import org.redisson.api.RLock; import org.slf4j.Logger; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/drp/service/impl/DrpMaterialProcureServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/drp/service/impl/DrpMaterialProcureServiceImpl.java index eb2b3ce6..e1d23e77 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/drp/service/impl/DrpMaterialProcureServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/drp/service/impl/DrpMaterialProcureServiceImpl.java @@ -8,7 +8,7 @@ import com.bonus.canteen.core.drp.dto.DrpMaterialProcureAddDTO; import com.bonus.canteen.core.drp.mapper.DrpMaterialProcureMapper; import com.bonus.canteen.core.drp.model.DrpMaterialProcure; import com.bonus.canteen.core.drp.service.DrpMaterialProcureService; -import com.bonus.common.core.utils.id.Id; +import com.bonus.common.houqin.utils.id.Id; import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuMaterialServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuMaterialServiceImpl.java index 3f111ee0..0c9ed529 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuMaterialServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuMaterialServiceImpl.java @@ -47,11 +47,11 @@ import com.bonus.canteen.core.supermarket.model.SupermarketProduct; import com.bonus.canteen.core.supermarket.vo.MqSupermarketProductVO; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.StringUtils; -import com.bonus.common.core.utils.id.Id; import com.bonus.common.houqin.constant.DelFlagEnum; import com.bonus.common.houqin.constant.LeConstants; import com.bonus.common.houqin.i18n.I18n; import com.bonus.common.houqin.utils.LeBeanUtil; +import com.bonus.common.houqin.utils.id.Id; import com.bonus.common.security.utils.SecurityUtils; import com.github.pagehelper.page.PageMethod; import com.google.common.collect.Lists;