CeDo
2021-04-28 3d289bd43c6af1ec6475ab4ae2d2bd821f447b82
bugfixed:商品规格限制
4个文件已修改
19 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/java/com/panzhihua/applets_backstage/api/ShopApi.java
@@ -22,6 +22,7 @@
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.ClazzUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -162,14 +163,14 @@
    @ApiOperation(value = "新增商品")
    @PostMapping("/goods/save")
    R saveShopGoods(@RequestBody AddShopGoodsVO addShopGoodsVO) {
    R saveShopGoods(@RequestBody @Validated(AddGroup.class) AddShopGoodsVO addShopGoodsVO) {
        return communityService.saveShopGoods(addShopGoodsVO);
    }
    @ApiOperation(value = "编辑商品")
    @PostMapping("/goods/edit/{id}")
    R editShopGoods(@PathVariable("id") Long id, @RequestBody AddShopGoodsVO addShopGoodsVO) {
    R editShopGoods(@PathVariable("id") Long id, @RequestBody @Validated(AddGroup.class) AddShopGoodsVO addShopGoodsVO) {
        return communityService.editShopGoods(id, addShopGoodsVO);
    }
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsAttrVO.java
@@ -1,5 +1,6 @@
package com.panzhihua.common.model.vos.shop;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
    private String goodsAttr;
    @ApiModelProperty("规格价格")
    @Min(value = 0,message = "价格最小值为0")
    @Digits(integer = 8, fraction = 2)
    @Min(groups = {AddGroup.class}, value = 0,message = "价格最小值为0")
    @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
    private BigDecimal attrPrice;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/AddShopGoodsVO.java
@@ -1,9 +1,11 @@
package com.panzhihua.common.model.vos.shop;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.Digits;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
@@ -26,8 +28,8 @@
    private String name;
    @ApiModelProperty("商品现价")
    @Min(value = 0,message = "价格最小值为0")
    @Digits(integer = 8, fraction = 2)
    @Min(groups = {AddGroup.class}, value = 0,message = "价格最小值为0")
    @Digits(groups = {AddGroup.class}, integer = 8, fraction = 2)
    private BigDecimal price;
@@ -48,5 +50,6 @@
    private String details;
    @ApiModelProperty("商品规格")
    @Valid
    private List<AddShopGoodsAttrVO> goodsAttrVOList;
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserFeedbackDAO.java
@@ -44,7 +44,7 @@
            "left join com_act c on u.community_id=c.community_id\n" +
            "<where>" +
            "<if test='pageFeedBackDTO.phone != null and pageFeedBackDTO.phone.trim() != &quot;&quot;'>" +
            "and u.phone=#{pageFeedBackDTO.phone}\n" +
            "and u.phone like concat('%',#{pageFeedBackDTO.phone},'%') \n" +
            " </if> " +
            "<if test='pageFeedBackDTO.name != null and pageFeedBackDTO.name.trim() != &quot;&quot;'>" +
            "and u.name like concat('%',#{pageFeedBackDTO.name},'%')   \n" +