caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper 2021-05-20 15:55:26 +08:00
commit c245265fd1
5 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
View File

@ -55,9 +55,6 @@ import java.util.List;
@Transactional
public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements GoodsService {
//商品
@Autowired
private GoodsMapper goodsMapper;
//商品属性
@Autowired
private GoodsParamsService goodsParamsService;
@ -85,7 +82,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
@Override
public void underStoreGoods(String storeId) {
this.goodsMapper.underStoreGoods(storeId);
this.baseMapper.underStoreGoods(storeId);
}
@Override

8
framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java
View File

@ -1,7 +1,6 @@
package cn.lili.modules.page.entity.dos;
import cn.lili.base.BaseEntity;
import cn.lili.common.enums.SwitchEnum;
import cn.lili.modules.page.entity.enums.ArticleEnum;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@ -45,11 +44,8 @@ public class Article extends BaseEntity {
@NotEmpty(message = "文章内容不能为空")
private String content;
/**
* @see SwitchEnum
*/
@ApiModelProperty(value = "状态", allowableValues = "OPEN,CLOSE")
private String openStatus;
@ApiModelProperty(value = "状态")
private Boolean openStatus;
/**
* @see ArticleEnum
*/

2
framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java
View File

@ -25,5 +25,5 @@ public class ArticleVO {
private Integer sort;
@ApiModelProperty(value = "状态, allowableValues = OPEN,CLOSE")
private String openStatus;
private Boolean openStatus;
}

3
framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java
View File

@ -3,7 +3,6 @@ package cn.lili.modules.page.serviceimpl;
import cn.hutool.core.util.StrUtil;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.SwitchEnum;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.BeanUtil;
import cn.lili.common.utils.PageUtil;
@ -83,7 +82,7 @@ public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> impl
@Override
public Boolean updateArticleStatus(String id, boolean status) {
Article article=this.getById(id);
article.setOpenStatus(status? SwitchEnum.OPEN.name():SwitchEnum.CLOSE.name());
article.setOpenStatus(status);
return this.updateById(article);
}
}

16
manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java
View File

@ -66,4 +66,20 @@ public class AfterSaleManagerController {
return ResultUtil.data(afterSaleService.refund(afterSaleSn, remark));
}
@ApiOperation(value = "审核售后申请")
@ApiImplicitParams({
@ApiImplicitParam(name = "afterSaleSn", value = "售后sn", required = true, paramType = "path"),
@ApiImplicitParam(name = "serviceStatus", value = "PASS：审核通过，REFUSE：审核未通过", required = true, paramType = "query"),
@ApiImplicitParam(name = "remark", value = "备注", paramType = "query"),
@ApiImplicitParam(name = "actualRefundPrice", value = "实际退款金额", paramType = "query")
})
@PutMapping(value = "/review/{afterSaleSn}")
public ResultMessage<AfterSale> review(@NotNull(message = "请选择售后单") @PathVariable String afterSaleSn,
@NotNull(message = "请审核") String serviceStatus,
String remark,
Double actualRefundPrice) {
return ResultUtil.data(afterSaleService.review(afterSaleSn, serviceStatus, remark,actualRefundPrice));
}
}