Skip to content

GitLab

S
sph_system
Commit c68d04fa authored by xiaoyao's avatar xiaoyao
Browse files
Options

fix

parent dcd0a502
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3311 additions and 1387 deletions
dao/src/main/java/com/jbp/db/dao/DtsAdminMapper.java 0 → 100644
View file @ c68d04fa
package com.wwdz.ch.db.dao;
import com.wwdz.ch.db.domain.DtsAdmin;
import com.wwdz.ch.db.domain.DtsAdminExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface DtsAdminMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
*/
long countByExample(DtsAdminExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
*/
int deleteByExample(DtsAdminExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
*/
int deleteByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
*/
int insert(DtsAdmin record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
*/
int insertSelective(DtsAdmin record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
DtsAdmin selectOneByExample(DtsAdminExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
DtsAdmin selectOneByExampleSelective(@Param("example") DtsAdminExample example, @Param("selective") DtsAdmin.Column ... selective);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
List<DtsAdmin> selectByExampleSelective(@Param("example") DtsAdminExample example, @Param("selective") DtsAdmin.Column ... selective);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
*/
List<DtsAdmin> selectByExample(DtsAdminExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
DtsAdmin selectByPrimaryKeySelective(@Param("id") Integer id, @Param("selective") DtsAdmin.Column ... selective);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
*/
DtsAdmin selectByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
DtsAdmin selectByPrimaryKeyWithLogicalDelete(@Param("id") Integer id, @Param("andLogicalDeleted") boolean andLogicalDeleted);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") DtsAdmin record, @Param("example") DtsAdminExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
*/
int updateByExample(@Param("record") DtsAdmin record, @Param("example") DtsAdminExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(DtsAdmin record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
*/
int updateByPrimaryKey(DtsAdmin record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int logicalDeleteByExample(@Param("example") DtsAdminExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_admin
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
int logicalDeleteByPrimaryKey(Integer id);
}
\ No newline at end of file
dao/src/main/java/com/jbp/db/domain/DtsAdmin.java 0 → 100644
View file @ c68d04fa
This diff is collapsed.
dao/src/main/java/com/jbp/db/domain/DtsAdminExample.java 0 → 100644
View file @ c68d04fa
This diff is collapsed.
web/src/main/java/com/jbp/dashboard/dao/CategorySellVo.java deleted 100644 → 0
View file @ dcd0a502
package com.jbp.dashboard.dao;
import java.io.Serializable;
import java.util.List;
import com.jbp.db.bean.CategorySellAmts;
public class CategorySellVo implements Serializable{
private static final long serialVersionUID = 96458407347975166L;
private String[] categoryNames;//一级大类目录名称
private List<CategorySellAmts> categorySellData;//大类销售金额集合
public String[] getCategoryNames() {
return categoryNames;
}
public void setCategoryNames(String[] categoryNames) {
this.categoryNames = categoryNames;
}
public List<CategorySellAmts> getCategorySellData() {
return categorySellData;
}
public void setCategorySellData(List<CategorySellAmts> categorySellData) {
this.categorySellData = categorySellData;
}
}
web/src/main/java/com/jbp/dashboard/dao/CategoryVo.java deleted 100644 → 0
View file @ dcd0a502
package com.jbp.dashboard.dao;
import com.alibaba.druid.support.json.JSONUtils;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.util.StringUtils;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ApiModel
public class CategoryVo implements Serializable {
private static final long serialVersionUID = 96458407347975312L;
@ApiModelProperty(value = "分类Id")
private Integer id;
@ApiModelProperty(value = "分类名称")
private String name;
@ApiModelProperty(value = "分类图片")
private String icon;
@ApiModelProperty(value = "父类目ID")
private Integer pid;
@ApiModelProperty(value = "层级")
private Integer level;
@ApiModelProperty(value = "描述")
private String desc;
@ApiModelProperty(value = "面值")
private String parValue;
@ApiModelProperty(value = "命名来源")
private String nameSrc;
@ApiModelProperty(value = "造币厂")
private String mint;
@ApiModelProperty(value = "铸造时间")
private String publishTime;
@ApiModelProperty(value = "铸造者")
private String publisher;
@ApiModelProperty(value = "王朝")
private String dynasty;
@ApiModelProperty(value = "品种代码")
private String serialNo;
@ApiModelProperty(value = "分类路径")
private String categoryPath;
@ApiModelProperty(value = "扩展名称")
private String extendName;
@ApiModelProperty(value = "材质")
private String material;
@ApiModelProperty(value = "直径 （mm * 100）")
private Integer diameter;
@ApiModelProperty(value = " 厚度 （mm * 100）")
private Integer thickness;
@ApiModelProperty(value = "重量 （g * 100）")
private Integer weight;
@ApiModelProperty(value = "合金成分分析表图片路径")
private String caTableImage;
@ApiModelProperty(value = "是否叶子节点")
private Boolean isLeaf;
@ApiModelProperty(value = "存世量")
private Integer exiQuantity;
/**
* 子类目
*/
private List<CategoryVo> children;
public String getCaTableImage() {
return caTableImage;
}
public void setCaTableImage(String caTableImage) {
this.caTableImage = caTableImage;
}
public Boolean getLeaf() {
return isLeaf;
}
public void setLeaf(Boolean leaf) {
isLeaf = leaf;
}
public String getParValue() {
return parValue;
}
public void setParValue(String parValue) {
this.parValue = parValue;
}
public String getNameSrc() {
return nameSrc;
}
public void setNameSrc(String nameSrc) {
this.nameSrc = nameSrc;
}
public String getMint() {
return mint;
}
public void setMint(String mint) {
this.mint = mint;
}
public String getMaterial() {
return material;
}
public void setMaterial(String material) {
this.material = material;
}
public CategoryVo(){}
public CategoryVo(Category category) {
this.id = category.getId();
this.name = category.getName();
this.icon = category.getIcon();
this.pid = category.getPid();
this.desc = category.getDesc();
this.level = category.getLevel();
this.isLeaf = category.getIsLeaf();
if (!StringUtils.isEmpty(category.getExtra())) {
Map<String, Object> extraData = (Map<String, Object>) JSONUtils.parse(category.getExtra());
this.publishTime = extractExtra(extraData, "publishTime");
this.publisher = extractExtra(extraData, "publisher");
this.exiQuantity = extractExtraInt(extraData, "exiQuantity");
this.dynasty = extractExtra(extraData, "dynasty");
this.diameter = extractExtraInt(extraData, "diameter");
this.thickness = extractExtraInt(extraData, "thickness");
this.weight = extractExtraInt(extraData, "weight");
this.extendName = extractExtra(extraData, "extendName");
this.serialNo = extractExtra(extraData, "serialNo");
this.caTableImage = extractExtra(extraData, "caTableImage");
this.nameSrc = extractExtra(extraData, "nameSrc");
this.mint = extractExtra(extraData, "mint");
this.parValue = extractExtra(extraData, "parValue");
this.material = extractExtra(extraData, "material");
}
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
public Integer getPid() {
return pid;
}
public void setPid(Integer pid) {
this.pid = pid;
}
public List<CategoryVo> getChildren() {
return children;
}
public void setChildren(List<CategoryVo> children) {
this.children = children;
}
public Integer getLevel() {
return level;
}
public void setLevel(Integer level) {
this.level = level;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public String getPublishTime() {
return publishTime;
}
public void setPublishTime(String publishTime) {
this.publishTime = publishTime;
}
public String getPublisher() {
return publisher;
}
public void setPublisher(String publisher) {
this.publisher = publisher;
}
public Integer getExiQuantity() {
return exiQuantity;
}
public void setExiQuantity(Integer exiQuantity) {
this.exiQuantity = exiQuantity;
}
public String getDynasty() {
return dynasty;
}
public void setDynasty(String dynasty) {
this.dynasty = dynasty;
}
public String getSerialNo() {
return serialNo;
}
public void setSerialNo(String serialNo) {
this.serialNo = serialNo;
}
public String getCategoryPath() {
return categoryPath;
}
public void setCategoryPath(String categoryPath) {
this.categoryPath = categoryPath;
}
public String getExtendName() {
return extendName;
}
public void setExtendName(String extendName) {
this.extendName = extendName;
}
public Integer getDiameter() {
return diameter;
}
public void setDiameter(Integer diameter) {
this.diameter = diameter;
}
public Integer getThickness() {
return thickness;
}
public void setThickness(Integer thickness) {
this.thickness = thickness;
}
public Integer getWeight() {
return weight;
}
public void setWeight(Integer weight) {
this.weight = weight;
}
private String extractExtra(Map<String, Object> extraData, String key) {
if (null != extraData.get(key)) {
return extraData.get(key).toString();
}
return "";
}
private Integer extractExtraInt(Map<String, Object> extraData, String key) {
if (!StringUtils.isEmpty(extraData.get(key))) {
return Integer.valueOf(extraData.get(key).toString());
}
return null;
}
public Category toDo() {
Category category = new Category();
category.setId(this.id);
category.setDesc(this.desc);
category.setIcon(this.icon);
category.setLevel(this.level);
category.setName(this.name);
category.setPid(this.pid);
category.setExtra(createExtra());
return category;
}
private String createExtra() {
Map<String, Object> extraObj = new HashMap<>();
extraObj.put("publishTime", this.publishTime);
extraObj.put("publisher", this.publisher);
extraObj.put("exiQuantity", this.exiQuantity);
extraObj.put("mint", this.mint);
extraObj.put("parValue", this.parValue);
extraObj.put("nameSrc",this.nameSrc);
extraObj.put("caTableImage", this.caTableImage);
extraObj.put("diameter", this.diameter);
extraObj.put("dynasty", this.dynasty);
extraObj.put("extendName", this.extendName);
extraObj.put("serialNo", this.serialNo);
extraObj.put("thickness", this.thickness);
extraObj.put("weight", this.weight);
extraObj.put("material", this.material);
return JSONUtils.toJSONString(extraObj);
}
}
web/src/main/java/com/jbp/dashboard/dao/ItemVo.java deleted 100644 → 0
View file @ dcd0a502
package com.jbp.dashboard.dao;
import com.qiniu.util.StringUtils;
import com.jbp.core.util.PriceUtil;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Objects;
public class ItemVo implements Serializable {
private static final long serialVersionUID = 3840196224538738818L;
/**
* 商品id
*/
private Long id;
/**
* 类目id
*/
private Integer cid;
/**
* 商品详情
*/
private String detail;
/**
* 商品图片
*/
private String[] images;
/**
* 商品标题
*/
private String name;
/**
* 商品价格
*/
private Double price;
/**
* 是否在架
*/
private Boolean isOnSale;
/**
* 是否分类标准品
*/
private Boolean isStd;
public Integer getCid() {
return cid;
}
public void setCid(Integer cid) {
this.cid = cid;
}
public String getDetail() {
return detail;
}
public void setDetail(String detail) {
this.detail = detail;
}
public String[] getImages() {
return images;
}
public void setImages(String[] images) {
this.images = images;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Double getPrice() {
return price;
}
public void setPrice(Double price) {
this.price = price;
}
public Boolean getIsOnSale() {
return isOnSale;
}
public void setIsOnSale(Boolean onSale) {
isOnSale = onSale;
}
public Boolean getIsStd() {
return isStd;
}
public void setIsStd(Boolean std) {
isStd = std;
}
public Item toItem() {
Item item = new Item();
item.setId(this.id);
item.setCid(this.cid);
item.setName(this.name);
item.setDetail(this.detail);
item.setImages(StringUtils.join(images, ";"));
item.setIsOnSale(this.isOnSale);
item.setIsStd(this.isStd);
item.setPrice((long)(this.price*100L));
return item;
}
public static final ItemVo fromItem(Item item) {
ItemVo itemVo = new ItemVo();
itemVo.setName(item.getName());
itemVo.setCid(item.getCid());
itemVo.setId(item.getId());
itemVo.setDetail(item.getDetail());
itemVo.setImages(item.getImages().split(";"));
itemVo.setIsStd(item.getIsStd());
itemVo.setIsOnSale(item.getIsOnSale());
itemVo.setPrice(Double.parseDouble(PriceUtil.convertPrice(item.getPrice())));
return itemVo;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ItemVo itemVo = (ItemVo) o;
return Objects.equals(cid, itemVo.cid) && Objects.equals(detail, itemVo.detail) && Arrays.equals(images, itemVo.images) && Objects.equals(name, itemVo.name) && Objects.equals(price, itemVo.price) && Objects.equals(isOnSale, itemVo.isOnSale) && Objects.equals(isStd, itemVo.isStd);
}
@Override
public int hashCode() {
int result = Objects.hash(cid, detail, name, price, isOnSale, isStd);
result = 31 * result + Arrays.hashCode(images);
return result;
}
@Override
public String toString() {
return "ItemVo{" +
"cid=" + cid +
", detail='" + detail + '\'' +
", images=" + Arrays.toString(images) +
", name='" + name + '\'' +
", price=" + price +
", isOnSale=" + isOnSale +
", isStd=" + isStd +
'}';
}
}
web/src/main/java/com/jbp/dashboard/manager/ItemDetailsManager.java deleted 100644 → 0
View file @ dcd0a502
package com.jbp.dashboard.manager;
import com.github.pagehelper.PageHelper;
import com.jbp.dashboard.data.base.PageQueryResult;
import com.jbp.dashboard.data.param.AppraisalItemDetailsParam;
import com.wwdz.mall.common.util.TimeUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.util.List;
@Component
@Slf4j
public class ItemDetailsManager {
@Resource
private ItemDetailsMapper itemDetailsMapper;
public void updateByOrderId(ItemDetails record) {
if (record.getOrdernumber() == null) {
return;
}
record.setUpdated(TimeUtil.getNowTimestamp());
ItemDetailsExample example = new ItemDetailsExample();
ItemDetailsExample.Criteria criteria = example.createCriteria();
criteria.andOrdernumberEqualTo(record.getOrdernumber());
itemDetailsMapper.updateByExampleSelective(record, example);
}
public PageQueryResult<ItemDetails> page(AppraisalItemDetailsParam detailsPara) {
ItemDetailsExample example = initAppraisalItemDetailsExample(detailsPara);
PageQueryResult<ItemDetails> pageQueryResult = new PageQueryResult<>();
long cnt = itemDetailsMapper.countByExample(example);
if (cnt > 0) {
List<ItemDetails> list = itemDetailsMapper.selectByExample(example);
pageQueryResult.setDataList(list);
}
pageQueryResult.setTotal((int)cnt);
pageQueryResult.setPageSize(detailsPara.getPageSize());
pageQueryResult.setPageIndex(detailsPara.getPageIndex());
return pageQueryResult;
}
private ItemDetailsExample initAppraisalItemDetailsExample(AppraisalItemDetailsParam detailsPara) {
ItemDetailsExample appraisalItemDetailsExample = new ItemDetailsExample();
appraisalItemDetailsExample.setOrderByClause("id desc");
if (null != detailsPara.getPageSize() && null != detailsPara.getPageIndex()) {
PageHelper.startPage(detailsPara.getStart(), detailsPara.getPageSize());
}
ItemDetailsExample.Criteria criteria = appraisalItemDetailsExample.createCriteria();
if (CollectionUtils.isNotEmpty(detailsPara.getExpressStatusList())) {
criteria.andExpressstatusIn(detailsPara.getExpressStatusList());
}
if (null != detailsPara.getItemStatus()) {
criteria.andItemstatusEqualTo(detailsPara.getItemStatus());
}
if (null != detailsPara.getTraceCode()) {
criteria.andTracecodeEqualTo(detailsPara.getTraceCode());
}
if (null != detailsPara.getItemName()) {
criteria.andItemnameEqualTo(detailsPara.getItemName());
}
if (null != detailsPara.getOrderNumber()) {
criteria.andOrdernumberEqualTo(detailsPara.getOrderNumber());
}
if (null != detailsPara.getExpressNumber()) {
criteria.andExpressnumberEqualTo(detailsPara.getExpressNumber());
}
if (null != detailsPara.getItemName()) {
criteria.andItemnameEqualTo(detailsPara.getItemName());
}
if (null != detailsPara.getSellerId()) {
criteria.andSelleridEqualTo(detailsPara.getSellerId());
}
if (null != detailsPara.getOrderExtraStatus()) {
criteria.andOrderextrastatusEqualTo(detailsPara.getOrderExtraStatus());
}
if (null != detailsPara.getReceiveTimeStart() && null != detailsPara.getReceiveTimeEnd()) {
criteria.andReceivetimeBetween(detailsPara.getReceiveTimeStart(), detailsPara.getReceiveTimeEnd());
}
if (null != detailsPara.getEndCreateTime() && null != detailsPara.getStartCreateTime()) {
criteria.andCreatedBetween(detailsPara.getStartCreateTime(), detailsPara.getEndCreateTime());
}
if (null != detailsPara.getSendStartTime() && null != detailsPara.getSendEndTime()) {
criteria.andSendtimeBetween(detailsPara.getSendStartTime(), detailsPara.getSendEndTime());
}
if (null != detailsPara.getInspectionSupportStaff()) {
criteria.andInspectionsupportstaffEqualTo(detailsPara.getInspectionSupportStaff());
}
if (null != detailsPara.getStartInspectionSupportTime() && null != detailsPara.getEndInspectionSupportTime()) {
criteria.andInspectionsupporttimeBetween(detailsPara.getStartInspectionSupportTime(), detailsPara.getEndInspectionSupportTime());
}
if (null != detailsPara.getInspectionUserId()) {
criteria.andInspectionuseridEqualTo(detailsPara.getInspectionUserId());
}
if (null != detailsPara.getIsTroubleOrder()) {
criteria.andIstroubleorderEqualTo(detailsPara.getIsTroubleOrder());
}
if (null != detailsPara.getReceiverId()) {
criteria.andReceiveridEqualTo(detailsPara.getReceiverId());
}
if (null != detailsPara.getSendExpressNumber()) {
criteria.andExpresssendnumberEqualTo(detailsPara.getSendExpressNumber());
}
if(CollectionUtils.isNotEmpty(detailsPara.getExpressNumbers())){
criteria.andExpressnumberIn(detailsPara.getExpressNumbers());
}
if(CollectionUtils.isNotEmpty(detailsPara.getNotInItemStatus())){
criteria.andItemstatusNotIn(detailsPara.getNotInItemStatus());
}
if(detailsPara.getSecondCategoryId() != null){
criteria.andSecondcategoryidEqualTo(detailsPara.getSecondCategoryId());
}
if(CollectionUtils.isNotEmpty(detailsPara.getInItemStatus())){
criteria.andItemstatusIn(detailsPara.getInItemStatus());
}
if(detailsPara.getSecondCategoryId() != null){
criteria.andSecondcategoryidEqualTo(detailsPara.getSecondCategoryId());
}
if(detailsPara.getExpressReturnNumber() != null){
criteria.andExpressreturnnumberEqualTo(detailsPara.getExpressReturnNumber());
}
if(detailsPara.getExpressSendCompany() != null){
criteria.andExpresssendcompanyEqualTo(detailsPara.getExpressSendCompany());
}
if(detailsPara.getExpressSendCompany() != null){
criteria.andExpresssendcompanyEqualTo(detailsPara.getExpressSendCompany());
}
if(CollectionUtils.isNotEmpty(detailsPara.getInspectionUserIds())){
criteria.andInspectionuseridIn(detailsPara.getInspectionUserIds());
}
if(CollectionUtils.isNotEmpty(detailsPara.getInspectionSupportStaffs())){
criteria.andInspectionsupportstaffIn(detailsPara.getInspectionSupportStaffs());
}
if(null!=detailsPara.getStatus()){
criteria.andStatusEqualTo(detailsPara.getStatus());
}
if(null!=detailsPara.getIsReceiveTrouble()){
criteria.andIsreceivetroubleEqualTo(detailsPara.getIsReceiveTrouble());
}
criteria.andIsdeletedEqualTo(false);
return appraisalItemDetailsExample;
}
}
web/src/main/java/com/jbp/dashboard/shiro/AdminAuthorizingRealm.java
View file @ c68d04fa
...@@ -3,6 +3,7 @@ package com.jbp.dashboard.shiro; ...@@ -3,6 +3,7 @@ package com.jbp.dashboard.shiro;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.jbp.db.domain.DtsAdmin;
import org.apache.shiro.authc.AccountException; import org.apache.shiro.authc.AccountException;
import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationInfo;
......
web/src/main/java/com/jbp/dashboard/util/AuthSupport.java
View file @ c68d04fa
package com.jbp.dashboard.util; package com.jbp.dashboard.util;
import com.jbp.db.domain.DtsAdmin;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
......
web/src/main/java/com/jbp/dashboard/util/PageQueryResultTransforUtil.java
View file @ c68d04fa
package com.jbp.dashboard.util; package com.jbp.dashboard.util;
import com.wwdz.mall.api.appraisal.base.PageQueryResult; import com.jbp.appraisal.base.PageQueryResult;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import java.util.List; import java.util.List;
......
web/src/main/java/com/jbp/dashboard/vo/request/AppraisalOrderData/AppraisalStatisticsRequestVO.java deleted 100644 → 0
View file @ dcd0a502
package com.jbp.dashboard.vo.request.AppraisalOrderData;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import lombok.Data;
/**
* @Author: luofei
* @Description:
* @date: 2020/5/26
*/
@Data
public class AppraisalStatisticsRequestVO extends KunlunBaseDTO {
/**
* 如果是直播间页面，必须传直播间id,
*/
private Long roomId;
/**
* 店铺id,非直播间时必传
*/
private Long shopId;
/**
* 如果是直播间页面，直播间分类必传
*
* @mbggenerated
*/
private Long roomCid;
}
web/src/main/java/com/jbp/dashboard/vo/request/certificate/AppraisalOrganizationRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.certificate; package com.jbp.dashboard.vo.request.certificate;
import com.wwdz.mall.vo.request.PageParam; import com.jbp.appraisal.param.PageParam;
import lombok.Data; import lombok.Data;
/** /**
......
web/src/main/java/com/jbp/dashboard/vo/request/certificate/CertificateRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.certificate; package com.jbp.dashboard.vo.request.certificate;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -11,7 +10,7 @@ import java.io.Serializable; ...@@ -11,7 +10,7 @@ import java.io.Serializable;
* @date: 2021-02-02 16:50 * @date: 2021-02-02 16:50
**/ **/
@Data @Data
public class CertificateRequestVO extends KunlunBaseDTO implements Serializable { public class CertificateRequestVO implements Serializable {
/** /**
* 鉴定证书图片地址 * 鉴定证书图片地址
......
web/src/main/java/com/jbp/dashboard/vo/request/certificate/OrganizationOrderRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.certificate; package com.jbp.dashboard.vo.request.certificate;
import com.wwdz.mall.vo.request.PageParam; import com.jbp.appraisal.param.PageParam;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
......
web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/AppointRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.clientAppraisal; package com.jbp.dashboard.vo.request.clientAppraisal;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -13,9 +13,9 @@ import lombok.Data; ...@@ -13,9 +13,9 @@ import lombok.Data;
@Data @Data
@ApiModel("后台C端鉴别指派操作请求参数") @ApiModel("后台C端鉴别指派操作请求参数")
public class AppointRequestVO { public class AppointRequestVO {
@KunlunApiModel("指派订单主键id") @ApiModelProperty("指派订单主键id")
Long clientAppraisalOrderId; Long clientAppraisalOrderId;
@KunlunApiModel("被指派人id") @ApiModelProperty("被指派人id")
Integer appraiserNum; Integer appraiserNum;
} }
web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/BackendClientAppraisalRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.clientAppraisal; package com.jbp.dashboard.vo.request.clientAppraisal;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel; import com.jbp.appraisal.param.PageParam;
import com.wwdz.mall.vo.request.PageParam;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
...@@ -13,25 +13,25 @@ import lombok.Data; ...@@ -13,25 +13,25 @@ import lombok.Data;
@Data @Data
@ApiModel("后台C端鉴别订单查询参数") @ApiModel("后台C端鉴别订单查询参数")
public class BackendClientAppraisalRequestVO extends PageParam { public class BackendClientAppraisalRequestVO extends PageParam {
@KunlunApiModel("派单开始时间") @ApiModelProperty("派单开始时间")
private Integer startTime; private Integer startTime;
@KunlunApiModel("派单结束时间") @ApiModelProperty("派单结束时间")
private Integer endTime; private Integer endTime;
@KunlunApiModel("订单编号") @ApiModelProperty("订单编号")
private Long orderId; private Long orderId;
@KunlunApiModel("鉴别状态") @ApiModelProperty("鉴别状态")
private Integer status; private Integer status;
@KunlunApiModel("鉴别结果") @ApiModelProperty("鉴别结果")
private Integer result; private Integer result;
@KunlunApiModel("二级类目") @ApiModelProperty("二级类目")
private Long categoryTwo; private Long categoryTwo;
@KunlunApiModel("支付开始时间") @ApiModelProperty("支付开始时间")
private Integer startPayTime; private Integer startPayTime;
@KunlunApiModel("支付结束时间") @ApiModelProperty("支付结束时间")
private Integer endPayTime; private Integer endPayTime;
@KunlunApiModel("原因") @ApiModelProperty("原因")
private String reason; private String reason;
@KunlunApiModel("类目错放") @ApiModelProperty("类目错放")
private Integer isErrorCategory; private Integer isErrorCategory;
} }
web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/CategoryRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.clientAppraisal; package com.jbp.dashboard.vo.request.clientAppraisal;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -11,7 +10,7 @@ import java.io.Serializable; ...@@ -11,7 +10,7 @@ import java.io.Serializable;
* @Date: 2020/11/12 21:07 * @Date: 2020/11/12 21:07
*/ */
@Data @Data
public class CategoryRequestVO extends KunlunBaseDTO implements Serializable { public class CategoryRequestVO implements Serializable {
private Long categoryId; private Long categoryId;
} }
web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/CheckFreePayRightRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.clientAppraisal; package com.jbp.dashboard.vo.request.clientAppraisal;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@Data @Data
@ApiModel("check用户免费支付权益入参") @ApiModel("check用户免费支付权益入参")
public class CheckFreePayRightRequestVO extends KunlunBaseDTO implements Serializable { public class CheckFreePayRightRequestVO implements Serializable {
@KunlunApiModel("支付方式") @ApiModelProperty("支付方式")
private Integer payType; private Integer payType;
} }
web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/CreateClientAppraisalRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.clientAppraisal; package com.jbp.dashboard.vo.request.clientAppraisal;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@Data @Data
@ApiModel("创建C端鉴定入参") @ApiModel("创建C端鉴定入参")
public class CreateClientAppraisalRequestVO extends KunlunBaseDTO { public class CreateClientAppraisalRequestVO {
@KunlunApiModel("图片") @ApiModelProperty("图片")
private List<String> jsonPics; private List<String> jsonPics;
@KunlunApiModel("标题") @ApiModelProperty("标题")
private String title; private String title;
@KunlunApiModel("文字描述") @ApiModelProperty("文字描述")
private String strDetail; private String strDetail;
@KunlunApiModel("二级类目") @ApiModelProperty("二级类目")
private Long categoryTwo; private Long categoryTwo;
@KunlunApiModel("订单类型 0-默认 ，1-C2C") @ApiModelProperty("订单类型 0-默认 ，1-C2C")
private Integer orderType ; private Integer orderType ;
@KunlunApiModel("商品id") @ApiModelProperty("商品id")
private Long itemId; private Long itemId;
@KunlunApiModel("订单来源：4 支付宝小程序") @ApiModelProperty("订单来源：4 支付宝小程序")
private Integer orderSource; private Integer orderSource;
} }
web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/OrderRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.clientAppraisal; package com.jbp.dashboard.vo.request.clientAppraisal;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel; import io.swagger.annotations.ApiModelProperty;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -12,10 +11,10 @@ import java.io.Serializable; ...@@ -12,10 +11,10 @@ import java.io.Serializable;
* @Date: 2020/11/12 21:07 * @Date: 2020/11/12 21:07
*/ */
@Data @Data
public class OrderRequestVO extends KunlunBaseDTO implements Serializable { public class OrderRequestVO implements Serializable {
private Long orderId; private Long orderId;
@KunlunApiModel(value = "来源 4 支付宝小程序") @ApiModelProperty(value = "来源 4 支付宝小程序")
private Integer orderSource; private Integer orderSource;
} }
web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/PayAppraisalOrderRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.clientAppraisal; package com.jbp.dashboard.vo.request.clientAppraisal;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -12,7 +11,7 @@ import java.io.Serializable; ...@@ -12,7 +11,7 @@ import java.io.Serializable;
*/ */
@Data @Data
public class PayAppraisalOrderRequestVO extends KunlunBaseDTO implements Serializable { public class PayAppraisalOrderRequestVO implements Serializable {
private Long orderId; private Long orderId;
private Integer type; private Integer type;
......
web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/QueryClientAppraisalOrdersRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.clientAppraisal; package com.jbp.dashboard.vo.request.clientAppraisal;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
@Data @Data
@ApiModel @ApiModel
public class QueryClientAppraisalOrdersRequestVO extends KunlunBaseDTO { public class QueryClientAppraisalOrdersRequestVO {
private Integer pageIndex; private Integer pageIndex;
private Integer pageSize; private Integer pageSize;
private Integer status; private Integer status;
......
web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/SellerAppraisalRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.clientAppraisal; package com.jbp.dashboard.vo.request.clientAppraisal;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
...@@ -13,26 +13,26 @@ import lombok.Data; ...@@ -13,26 +13,26 @@ import lombok.Data;
@ApiModel("商家端鉴定结果入参") @ApiModel("商家端鉴定结果入参")
public class SellerAppraisalRequestVO { public class SellerAppraisalRequestVO {
@KunlunApiModel("任务id") @ApiModelProperty("任务id")
private Long taskId; private Long taskId;
@KunlunApiModel("鉴别结果") @ApiModelProperty("鉴别结果")
private Integer operateResult; private Integer operateResult;
@KunlunApiModel("鉴别报告") @ApiModelProperty("鉴别报告")
private String resultCategory; private String resultCategory;
@KunlunApiModel("鉴别意见") @ApiModelProperty("鉴别意见")
private String resultDetail; private String resultDetail;
@KunlunApiModel("原因") @ApiModelProperty("原因")
private String reason; private String reason;
@KunlunApiModel("一级类目") @ApiModelProperty("一级类目")
private Long adviceCategoryOne; private Long adviceCategoryOne;
@KunlunApiModel("一级类目名称") @ApiModelProperty("一级类目名称")
private String adviceCategoryOneName; private String adviceCategoryOneName;
@KunlunApiModel("二级类目") @ApiModelProperty("二级类目")
private Long adviceCategoryTwo; private Long adviceCategoryTwo;
@KunlunApiModel("二级类目名称") @ApiModelProperty("二级类目名称")
private String adviceCategoryTwoName; private String adviceCategoryTwoName;
private Long evaluateLowPrice; private Long evaluateLowPrice;
......
web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/SellerClientAppraisalRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.clientAppraisal; package com.jbp.dashboard.vo.request.clientAppraisal;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel; import com.jbp.appraisal.param.PageParam;
import com.wwdz.mall.vo.request.PageParam;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
...@@ -13,21 +13,21 @@ import lombok.Data; ...@@ -13,21 +13,21 @@ import lombok.Data;
@Data @Data
@ApiModel("后台C端鉴别订单查询参数") @ApiModel("后台C端鉴别订单查询参数")
public class SellerClientAppraisalRequestVO extends PageParam { public class SellerClientAppraisalRequestVO extends PageParam {
@KunlunApiModel("派单开始时间") @ApiModelProperty("派单开始时间")
private Integer startTime; private Integer startTime;
@KunlunApiModel("派单结束时间") @ApiModelProperty("派单结束时间")
private Integer endTime; private Integer endTime;
@KunlunApiModel("订单编号") @ApiModelProperty("订单编号")
private Long orderId; private Long orderId;
@KunlunApiModel("鉴别状态") @ApiModelProperty("鉴别状态")
private Integer status; private Integer status;
@KunlunApiModel("鉴别结果") @ApiModelProperty("鉴别结果")
private Integer operateResult; private Integer operateResult;
@KunlunApiModel("鉴定师工号") @ApiModelProperty("鉴定师工号")
private Long appraiserNum; private Long appraiserNum;
} }
web/src/main/java/com/jbp/dashboard/vo/request/clientAppraisal/SubmitAppraisalOrderRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.clientAppraisal; package com.jbp.dashboard.vo.request.clientAppraisal;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel; import com.jbp.appraisal.vo.request.client.v2.ClientCategoryPropertyRequest;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import com.wwdz.mall.api.appraisal.vo.request.client.v2.ClientCategoryPropertyRequest;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -16,30 +15,30 @@ import java.util.List; ...@@ -16,30 +15,30 @@ import java.util.List;
*/ */
@Data @Data
@ApiModel("提交鉴别单入参") @ApiModel("提交鉴别单入参")
public class SubmitAppraisalOrderRequestVO extends KunlunBaseDTO implements Serializable { public class SubmitAppraisalOrderRequestVO implements Serializable {
@KunlunApiModel("订单ID") @ApiModelProperty("订单ID")
private Long orderId; private Long orderId;
@KunlunApiModel("商品图片") @ApiModelProperty("商品图片")
private List<String> picList; private List<String> picList;
@KunlunApiModel("描述") @ApiModelProperty("描述")
private String itemDetail; private String itemDetail;
@KunlunApiModel("类目") @ApiModelProperty("类目")
private Long categoryTwo; private Long categoryTwo;
@KunlunApiModel("商品ItemId 非必传") @ApiModelProperty("商品ItemId 非必传")
private Long itemId; private Long itemId;
@KunlunApiModel("商品标题") @ApiModelProperty("商品标题")
private String title; private String title;
@KunlunApiModel("单据来源") @ApiModelProperty("单据来源")
private Integer orderSource; private Integer orderSource;
@KunlunApiModel("订单类型") @ApiModelProperty("订单类型")
private Integer orderType = 0; private Integer orderType = 0;
/** /**
......
web/src/main/java/com/jbp/dashboard/vo/request/config/AppraisalPriceConfigRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.config; package com.jbp.dashboard.vo.request.config;
import com.wwdz.mall.vo.common.config.AppraisalSectionPriceConfigVO; import com.jbp.dashboard.vo.config.AppraisalSectionPriceConfigVO;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
......
web/src/main/java/com/jbp/dashboard/vo/request/config/DomainAppraisalConfigRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.config; package com.jbp.dashboard.vo.request.config;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO; import com.jbp.appraisal.param.appraisalItem.CategoryPropertyConfigParam;
import com.wwdz.mall.api.appraisal.param.appraisalItem.CategoryPropertyConfigParam; import com.jbp.appraisal.result.config.LowPriceConfigDTO;
import com.wwdz.mall.api.appraisal.result.config.LowPriceConfigDTO; import com.jbp.appraisal.result.config.StaffReviewConfigDTO;
import com.wwdz.mall.api.appraisal.result.config.StaffReviewConfigDTO;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -15,7 +14,7 @@ import java.util.List; ...@@ -15,7 +14,7 @@ import java.util.List;
* @date: 2021-03-04 13:52 * @date: 2021-03-04 13:52
**/ **/
@Data @Data
public class DomainAppraisalConfigRequestVO extends KunlunBaseDTO implements Serializable { public class DomainAppraisalConfigRequestVO implements Serializable {
private static final long serialVersionUID = -1040056861709350090L; private static final long serialVersionUID = -1040056861709350090L;
/** /**
......
web/src/main/java/com/jbp/dashboard/vo/request/evaluate/EvaluateMatrixRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.evaluate; package com.jbp.dashboard.vo.request.evaluate;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -11,7 +10,7 @@ import java.io.Serializable; ...@@ -11,7 +10,7 @@ import java.io.Serializable;
* @date: 2020/11/23 * @date: 2020/11/23
*/ */
@Data @Data
public class EvaluateMatrixRequestVO extends KunlunBaseDTO implements Serializable { public class EvaluateMatrixRequestVO implements Serializable {
private static final long serialVersionUID = 618297843664179724L; private static final long serialVersionUID = 618297843664179724L;
private Integer categoryId; private Integer categoryId;
......
web/src/main/java/com/jbp/dashboard/vo/request/evaluate/EvaluatePropertyRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.evaluate; package com.jbp.dashboard.vo.request.evaluate;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -11,7 +10,7 @@ import java.io.Serializable; ...@@ -11,7 +10,7 @@ import java.io.Serializable;
* @date: 2020/11/23 * @date: 2020/11/23
*/ */
@Data @Data
public class EvaluatePropertyRequestVO extends KunlunBaseDTO implements Serializable { public class EvaluatePropertyRequestVO implements Serializable {
private static final long serialVersionUID = -6712213349594141851L; private static final long serialVersionUID = -6712213349594141851L;
private Integer cid; private Integer cid;
......
web/src/main/java/com/jbp/dashboard/vo/request/evaluate/EvaluateUserInfoRequest.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.evaluate; package com.jbp.dashboard.vo.request.evaluate;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -11,7 +10,7 @@ import java.io.Serializable; ...@@ -11,7 +10,7 @@ import java.io.Serializable;
* @date: 2020/11/26 * @date: 2020/11/26
*/ */
@Data @Data
public class EvaluateUserInfoRequest extends KunlunBaseDTO implements Serializable { public class EvaluateUserInfoRequest implements Serializable {
private static final long serialVersionUID = 3421554206277544576L; private static final long serialVersionUID = 3421554206277544576L;
......
web/src/main/java/com/jbp/dashboard/vo/request/evaluate/EvaluateUserInfoRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.evaluate; package com.jbp.dashboard.vo.request.evaluate;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO; import com.jbp.appraisal.result.evaluate.OptionDTO;
import com.wwdz.mall.api.appraisal.result.evaluate.OptionDTO;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -13,7 +12,7 @@ import java.util.List; ...@@ -13,7 +12,7 @@ import java.util.List;
* @date: 2020/11/26 * @date: 2020/11/26
*/ */
@Data @Data
public class EvaluateUserInfoRequestVO extends KunlunBaseDTO implements Serializable { public class EvaluateUserInfoRequestVO implements Serializable {
private static final long serialVersionUID = -5620874790669609484L; private static final long serialVersionUID = -5620874790669609484L;
private Long id; private Long id;
......
web/src/main/java/com/jbp/dashboard/vo/request/handover/AddHandoverItemRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.handover; package com.jbp.dashboard.vo.request.handover;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
...@@ -12,9 +12,9 @@ import lombok.Data; ...@@ -12,9 +12,9 @@ import lombok.Data;
@Data @Data
@ApiModel @ApiModel
public class AddHandoverItemRequestVO { public class AddHandoverItemRequestVO {
@KunlunApiModel("交接单ID") @ApiModelProperty("交接单ID")
private String handoverListId; private String handoverListId;
@KunlunApiModel("溯源码") @ApiModelProperty("溯源码")
private String tracecode; private String tracecode;
} }
web/src/main/java/com/jbp/dashboard/vo/request/handover/CloseHandoverListRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.handover; package com.jbp.dashboard.vo.request.handover;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
...@@ -12,6 +12,6 @@ import lombok.Data; ...@@ -12,6 +12,6 @@ import lombok.Data;
@Data @Data
@ApiModel @ApiModel
public class CloseHandoverListRequestVO { public class CloseHandoverListRequestVO {
@KunlunApiModel("交接单ID") @ApiModelProperty("交接单ID")
private String handoverListId; private String handoverListId;
} }
web/src/main/java/com/jbp/dashboard/vo/request/handover/CreateHandoverListRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.handover; package com.jbp.dashboard.vo.request.handover;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
...@@ -15,11 +15,11 @@ import javax.validation.constraints.NotNull; ...@@ -15,11 +15,11 @@ import javax.validation.constraints.NotNull;
@ApiModel @ApiModel
public class CreateHandoverListRequestVO { public class CreateHandoverListRequestVO {
@KunlunApiModel("仓库ID") @ApiModelProperty("仓库ID")
@NotNull @NotNull
private Integer warehouseId; private Integer warehouseId;
@KunlunApiModel("交接单类型: 1 收货台到实验室，2 实验室收货，3 实验室到发货，4 流水线收货") @ApiModelProperty("交接单类型: 1 收货台到实验室，2 实验室收货，3 实验室到发货，4 流水线收货")
@NotNull @NotNull
private Integer handoverType; private Integer handoverType;
} }
web/src/main/java/com/jbp/dashboard/vo/request/handover/HandoverItemQueryVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.handover; package com.jbp.dashboard.vo.request.handover;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
import com.wwdz.mall.api.appraisal.base.BasePageQueryParam; import com.jbp.appraisal.base.BasePageQueryParam;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
...@@ -13,6 +14,6 @@ import lombok.Data; ...@@ -13,6 +14,6 @@ import lombok.Data;
@Data @Data
@ApiModel @ApiModel
public class HandoverItemQueryVO extends BasePageQueryParam { public class HandoverItemQueryVO extends BasePageQueryParam {
@KunlunApiModel("交接单ID") @ApiModelProperty("交接单ID")
private String handoverListId; private String handoverListId;
} }
web/src/main/java/com/jbp/dashboard/vo/request/handover/HandoverListQueryVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.handover; package com.jbp.dashboard.vo.request.handover;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel; import com.jbp.appraisal.base.BasePageQueryParam;
import com.wwdz.mall.api.appraisal.base.BasePageQueryParam;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
...@@ -15,24 +15,24 @@ import java.util.List; ...@@ -15,24 +15,24 @@ import java.util.List;
@Data @Data
@ApiModel @ApiModel
public class HandoverListQueryVO extends BasePageQueryParam { public class HandoverListQueryVO extends BasePageQueryParam {
@KunlunApiModel("仓库ID") @ApiModelProperty("仓库ID")
private Integer warehouseId; private Integer warehouseId;
/** /**
* @see com.wwdz.mall.api.appraisal.enums.handover.HandoverTypeEnum * @see com.wwdz.mall.api.appraisal.enums.handover.HandoverTypeEnum
*/ */
@KunlunApiModel("交接单类型: 1 收货台到实验室，2 实验室收货，3 实验室到发货，4 流水线收货") @ApiModelProperty("交接单类型: 1 收货台到实验室，2 实验室收货，3 实验室到发货，4 流水线收货")
private Integer handoverType; private Integer handoverType;
@KunlunApiModel("交接单类型：批量") @ApiModelProperty("交接单类型：批量")
private List<Integer> handoverTypeList; private List<Integer> handoverTypeList;
@KunlunApiModel("创建日期，格式：2020-09-10") @ApiModelProperty("创建日期，格式：2020-09-10")
private String createDate; private String createDate;
@KunlunApiModel("创建人工号") @ApiModelProperty("创建人工号")
private Long creatorId; private Long creatorId;
@KunlunApiModel("交接单状态：0 新建，1 交接中，2 关闭") @ApiModelProperty("交接单状态：0 新建，1 交接中，2 关闭")
private Integer status; private Integer status;
} }
web/src/main/java/com/jbp/dashboard/vo/request/handover/RemoveHandoverItemRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.handover; package com.jbp.dashboard.vo.request.handover;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/** /**
...@@ -12,9 +12,9 @@ import lombok.Data; ...@@ -12,9 +12,9 @@ import lombok.Data;
@Data @Data
@ApiModel @ApiModel
public class RemoveHandoverItemRequestVO { public class RemoveHandoverItemRequestVO {
@KunlunApiModel("交接单ID") @ApiModelProperty("交接单ID")
private String handoverListId; private String handoverListId;
@KunlunApiModel("溯源码") @ApiModelProperty("溯源码")
private String tracecode; private String tracecode;
} }
web/src/main/java/com/jbp/dashboard/vo/request/offlineAppraisal/NormalEvaluationRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.offlineAppraisal; package com.jbp.dashboard.vo.request.offlineAppraisal;
import com.wwdz.kunlun.sdk.annotation.KunlunApiModel; import io.swagger.annotations.ApiModelProperty;
import com.wwdz.kunlun.sdk.dto.KunlunBaseDTO;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
...@@ -12,23 +11,23 @@ import java.io.Serializable; ...@@ -12,23 +11,23 @@ import java.io.Serializable;
* Copyright © 2021 WanWuDeZhi.com. All rights reserved. * Copyright © 2021 WanWuDeZhi.com. All rights reserved.
*/ */
@Data @Data
public class NormalEvaluationRequestVO extends KunlunBaseDTO implements Serializable { public class NormalEvaluationRequestVO implements Serializable {
private static final long serialVersionUID = -3573551149099476935L; private static final long serialVersionUID = -3573551149099476935L;
@KunlunApiModel("主键id") @ApiModelProperty("主键id")
private Long id; private Long id;
@KunlunApiModel("原因") @ApiModelProperty("原因")
private Integer reason; private Integer reason;
@KunlunApiModel("备注") @ApiModelProperty("备注")
private String remark; private String remark;
@KunlunApiModel("估价金额") @ApiModelProperty("估价金额")
private Integer evaluationPrice; private Integer evaluationPrice;
@KunlunApiModel("鉴别师id") @ApiModelProperty("鉴别师id")
private Integer appraiserId; private Integer appraiserId;
} }
web/src/main/java/com/jbp/dashboard/vo/request/order/AppraisalFeeRefundOrderRequestVO.java
View file @ c68d04fa
package com.jbp.dashboard.vo.request.order; package com.jbp.dashboard.vo.request.order;
import com.wwdz.mall.vo.request.PageParam; import com.jbp.appraisal.param.PageParam;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment