sgb/zsw-farm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复小程序请求商品接口

Browse Source
This commit is contained in:
sj
2022-09-27 16:50:45 +08:00
parent ac911e41e1
commit 37acc6ebae
14 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/param/YxEvaluationQueryParam.java
+18
View File
@@ -0,0 +1,18 @@
package co.yixiang.app.modules.evaluation.param;
import co.yixiang.common.web.param.QueryParam;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 评测表查询
* @author ssj
* @date 2022-9-27
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "YxEvaluationQueryParam对象",description ="评测表查询参数")
public class YxEvaluationQueryParam extends QueryParam {
private static final long serialVersionUID =1L;
}
zsw-bxg/src/main/java/co/yixiang/app/modules/evaluation/rest/AppStoreEvaluationController.java
+1 -2
View File
@@ -11,8 +11,7 @@ package co.yixiang.app.modules.evaluation.rest;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.modules.evaluation.service.YxEvaluationService;
import co.yixiang.utils.location.EvaluationDTO;
import co.yixiang.utils.location.ExpertDTO;
import co.yixiang.utils.EvaluationDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
zsw-bxg/src/main/java/co/yixiang/app/modules/expert/rest/AppStoreExpertController.java
+1 -3
View File
@@ -10,10 +10,8 @@ package co.yixiang.app.modules.expert.rest;
import co.yixiang.annotation.AnonymousAccess;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import co.yixiang.modules.expert.domain.YxStoreExpert;
import co.yixiang.modules.expert.service.YxStoreExpertService;
import co.yixiang.utils.CateDTO;
import co.yixiang.utils.location.ExpertDTO;
import co.yixiang.utils.ExpertDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
zsw-bxg/src/main/java/co/yixiang/app/modules/product/rest/AppStoreBrandController.java
+1 -1
View File
@@ -3,7 +3,7 @@ package co.yixiang.app.modules.product.rest;
import cn.iocoder.yudao.framework.common.pojo.ApiResult;
import co.yixiang.annotation.AnonymousAccess;
import co.yixiang.modules.store.service.YxStoreBrandService;
import co.yixiang.utils.location.BrandDTO;
import co.yixiang.utils.BrandDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
zsw-bxg/src/main/java/co/yixiang/common/web/param/QueryParam.java
+6 -6
View File
@@ -25,19 +25,19 @@ public abstract class QueryParam implements Serializable{
private String keyword;
@ApiModelProperty(value = "当前第几页")
public void setCurrent(Integer current) {
if (current == null || current <= 0){
public void setPage(Integer page) {
if (page == null || page <= 0){
this.page = 1;
}else{
this.page = current;
this.page = page;
}
}
public void setSize(Integer size) {
if (size == null || size <= 0){
public void setLimit(Integer limit) {
if (limit == null || limit <= 0){
this.limit = 10;
}else{
this.limit = size;
this.limit = limit;
}
}
zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/YxEvaluationService.java
+1 -1
View File
@@ -13,7 +13,7 @@ import co.yixiang.domain.PageResult;
import co.yixiang.modules.evaluation.domain.YxEvaluation;
import co.yixiang.modules.evaluation.service.dto.YxEvaluationDto;
import co.yixiang.modules.evaluation.service.dto.YxEvaluationQueryCriteria;
import co.yixiang.utils.location.EvaluationDTO;
import co.yixiang.utils.EvaluationDTO;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
zsw-bxg/src/main/java/co/yixiang/modules/evaluation/service/impl/YxEvaluationServiceImpl.java
+1 -4
View File
@@ -18,11 +18,8 @@ import co.yixiang.modules.evaluation.service.YxEvaluationService;
import co.yixiang.modules.evaluation.service.dto.YxEvaluationDto;
import co.yixiang.modules.evaluation.service.dto.YxEvaluationQueryCriteria;
import co.yixiang.modules.evaluation.service.mapper.YxEvaluationMapper;
import co.yixiang.modules.expert.domain.YxStoreExpert;
import co.yixiang.utils.FileUtil;
import co.yixiang.utils.TreeUtil;
import co.yixiang.utils.location.EvaluationDTO;
import co.yixiang.utils.location.ExpertDTO;
import co.yixiang.utils.EvaluationDTO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo;
import lombok.AllArgsConstructor;
zsw-bxg/src/main/java/co/yixiang/modules/expert/service/YxStoreExpertService.java
+1 -1
View File
@@ -13,7 +13,7 @@ import co.yixiang.domain.PageResult;
import co.yixiang.modules.expert.domain.YxStoreExpert;
import co.yixiang.modules.expert.service.dto.YxStoreExpertDto;
import co.yixiang.modules.expert.service.dto.YxStoreExpertQueryCriteria;
import co.yixiang.utils.location.ExpertDTO;
import co.yixiang.utils.ExpertDTO;
import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletResponse;
zsw-bxg/src/main/java/co/yixiang/modules/expert/service/impl/YxStoreExpertServiceImpl.java
+1 -4
View File
@@ -13,16 +13,13 @@ import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.domain.PageResult;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.enums.ShopCommonEnum;
import co.yixiang.modules.category.domain.YxStoreCategory;
import co.yixiang.modules.expert.domain.YxStoreExpert;
import co.yixiang.modules.expert.service.YxStoreExpertService;
import co.yixiang.modules.expert.service.dto.YxStoreExpertDto;
import co.yixiang.modules.expert.service.dto.YxStoreExpertQueryCriteria;
import co.yixiang.modules.expert.service.mapper.YxStoreExpertMapper;
import co.yixiang.utils.CateDTO;
import co.yixiang.utils.FileUtil;
import co.yixiang.utils.TreeUtil;
import co.yixiang.utils.location.ExpertDTO;
import co.yixiang.utils.ExpertDTO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.PageInfo;
import lombok.AllArgsConstructor;
zsw-bxg/src/main/java/co/yixiang/modules/store/service/YxStoreBrandService.java
+2 -3
View File
@@ -12,10 +12,9 @@ import co.yixiang.domain.PageResult;
import co.yixiang.modules.store.domain.YxStoreBrand;
import co.yixiang.modules.store.service.dto.YxStoreBrandDto;
import co.yixiang.modules.store.service.dto.YxStoreBrandQueryCriteria;
import co.yixiang.utils.CateDTO;
import co.yixiang.utils.location.BrandDTO;
import co.yixiang.utils.BrandDTO;
import org.springframework.data.domain.Pageable;
import java.util.Map;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
zsw-bxg/src/main/java/co/yixiang/modules/store/service/impl/YxStoreBrandServiceImpl.java
+1 -5
View File
@@ -13,12 +13,9 @@ import co.yixiang.common.utils.QueryHelpPlus;
import co.yixiang.domain.PageResult;
import co.yixiang.dozer.service.IGenerator;
import co.yixiang.enums.ShopCommonEnum;
import co.yixiang.modules.expert.domain.YxStoreExpert;
import co.yixiang.modules.store.domain.YxStoreBrand;
import co.yixiang.modules.store.service.vo.YxStoreBrandVO;
import co.yixiang.utils.FileUtil;
import co.yixiang.utils.location.BrandDTO;
import co.yixiang.utils.location.ExpertDTO;
import co.yixiang.utils.BrandDTO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor;
import com.github.pagehelper.PageInfo;
@@ -33,7 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
//import org.springframework.cache.annotation.CacheConfig;
//import org.springframework.cache.annotation.CacheEvict;
//import org.springframework.cache.annotation.Cacheable;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;
zsw-bxg/src/main/java/co/yixiang/utils/location/BrandDTO.java → zsw-bxg/src/main/java/co/yixiang/utils/BrandDTO.java
+5 -2
View File
@@ -1,4 +1,6 @@
package co.yixiang.utils.location;
package co.yixiang.utils;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -11,6 +13,7 @@ import java.util.List;
* @author ssj
* @since 2022-9-20
*/
@Data
public class BrandDTO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -28,6 +31,6 @@ public class BrandDTO implements Serializable {
*/
private String pic;
private List<BrandDTO> children = new ArrayList<>();
// private List<BrandDTO> children = new ArrayList<>();
}
zsw-bxg/src/main/java/co/yixiang/utils/location/EvaluationDTO.java → zsw-bxg/src/main/java/co/yixiang/utils/EvaluationDTO.java
+17 -16
View File
@@ -1,8 +1,9 @@
package co.yixiang.utils.location;
package co.yixiang.utils;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
@@ -19,6 +20,7 @@ import java.util.List;
* @author sj
* @since 2022-09-26
*/
@Data
public class EvaluationDTO implements Serializable {
private static final long serialVersionUID = 1L;
@@ -42,7 +44,6 @@ public class EvaluationDTO implements Serializable {
private String videoInput;
/** 关联商品信息 */
@NotNull
private String product;
@@ -75,22 +76,22 @@ public class EvaluationDTO implements Serializable {
private String accessibilitySynopsis;
/** 添加时间 */
@TableField(fill= FieldFill.INSERT)
private Timestamp createTime;
// /** 添加时间 */
// @TableField(fill= FieldFill.INSERT)
// private Timestamp createTime;
/** 更新时间 */
@TableField(fill= FieldFill.INSERT_UPDATE)
private Timestamp updateTime;
// /** 更新时间 */
// @TableField(fill= FieldFill.INSERT_UPDATE)
// private Timestamp updateTime;
/** 是否删除 */
private Integer isDel;
/** 是否展示 */
private Integer isShow;
// /** 是否删除 */
// private Integer isDel;
//
//
// /** 是否展示 */
// private Integer isShow;
/** 排序 */
@@ -98,7 +99,7 @@ public class EvaluationDTO implements Serializable {
private Integer sort;
private Long tenantId;
// private Long tenantId;
private List<EvaluationDTO> children = new ArrayList<>();
// private List<EvaluationDTO> children = new ArrayList<>();
}
zsw-bxg/src/main/java/co/yixiang/utils/location/ExpertDTO.java → zsw-bxg/src/main/java/co/yixiang/utils/ExpertDTO.java
+2 -2
View File
@@ -3,7 +3,7 @@
* All rights reserved, Designed By www.yixiang.co
*/
package co.yixiang.utils.location;
package co.yixiang.utils;
import lombok.Data;
@@ -56,6 +56,6 @@ public class ExpertDTO implements Serializable {
*/
private String image;
private List<ExpertDTO> children = new ArrayList<>();
// private List<ExpertDTO> children = new ArrayList<>();
}