From c624a13eb32b90bb698f9fa9225c5a5ec07fa804 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 20 四月 2021 18:43:22 +0800
Subject: [PATCH] Default Changelist
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopOperLogVO.java | 3 +++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOperLogServiceImpl.java | 18 +++++++++++++++++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsVO.java | 7 +++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java | 8 +++++++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopGoodsDTO.java | 2 ++
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java | 7 ++++---
6 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopGoodsDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopGoodsDTO.java
index debea25..4517409 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopGoodsDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopGoodsDTO.java
@@ -17,6 +17,8 @@
@ApiModelProperty(value = "店铺名称")
private String storeName;
+ @ApiModelProperty(value = "店铺Id")
+ private Long storeId;
@ApiModelProperty(value = "商品状态(1.出售中 2.已下架 3.回收站)", example = "1")
private Integer status;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsVO.java
index d12dc09..42765e1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopGoodsVO.java
@@ -1,10 +1,12 @@
package com.panzhihua.common.model.vos.shop;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -111,4 +113,9 @@
*/
@ApiModelProperty("商品店铺信息")
private PageShopStoreVO shopStoreVO;
+
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("创建时间")
+ private Date createAt;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopOperLogVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopOperLogVO.java
index 475ac46..e06de64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopOperLogVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopOperLogVO.java
@@ -78,4 +78,7 @@
@ApiModelProperty("用户ID")
private Long userId;
+ @ApiModelProperty("用户名")
+ private String userName;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java
index cafd364..ee65564 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopGoodsDAO.java
@@ -35,9 +35,14 @@
"<if test='pageComShopGoodsDTO.name != null and pageComShopGoodsDTO.name.trim() != ""'>" +
"and c.name like concat('%',#{pageComShopGoodsDTO.name},'%') \n" +
" </if> " +
+ "<if test='pageComShopGoodsDTO.storeId != null'>" +
+ "and css.id=#{pageComShopGoodsDTO.storeId} \n" +
+ " </if> " +
+
"<if test='pageComShopGoodsDTO.status != null'>" +
"and c.status like concat('%',#{pageComShopGoodsDTO.status},'%') \n" +
" </if> " +
+ " order by c.create_at desc" +
" </where>" +
"</script>")
IPage<PageShopGoodsVO> pageShopGoods(Page page, @Param("pageComShopGoodsDTO") PageComShopGoodsDTO pageComShopGoodsDTO);
@@ -64,7 +69,8 @@
*/
@Select("<script> " +
"select id,`name`,store_id,goods_pic,images,`status`,sale,original_price,price,unit" +
- ",`order`,stock,details,delivery_type from com_shop_goods as csg " +
+ ",`order`,stock,details,delivery_type, create_at " +
+ " from com_shop_goods as csg " +
" where 1=1 and csg.delete_status = 1 " +
"<if test='comShopGoodsDTO.name != null and comShopGoodsDTO.name !=""'>" +
" AND csg.`name` like concat('%',#{comShopGoodsDTO.name},'%') " +
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOperLogServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOperLogServiceImpl.java
index 7495cb0..87d94f4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOperLogServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOperLogServiceImpl.java
@@ -1,18 +1,24 @@
package com.panzhihua.service_community.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
+import com.panzhihua.common.model.vos.shop.ShopStoreVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_community.dao.ComShopOperLogDAO;
import com.panzhihua.service_community.model.dos.ComShopOperLogDO;
import com.panzhihua.service_community.service.ComShopOperLogService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
/**
* @auther cedoo
@@ -22,6 +28,9 @@
@Slf4j
@Service
public class ComShopOperLogServiceImpl extends ServiceImpl<ComShopOperLogDAO, ComShopOperLogDO> implements ComShopOperLogService {
+
+ @Resource
+ private UserService userService;
@Override
public R saveLog(ShopOperLogVO shopOperLogVO) {
@@ -38,7 +47,8 @@
public R pageShopOperLog(PageDTO pageDTO) {
Page page = new Page<>(pageDTO.getPageNum(), pageDTO.getPageSize());
IPage<ComShopOperLogDO> comShopOperLogDOIPage =
- this.baseMapper.selectPage(page, new LambdaQueryWrapper<ComShopOperLogDO>().eq(ComShopOperLogDO::getUserId, pageDTO.getUserId()));
+ this.baseMapper.selectPage(page, new LambdaQueryWrapper<ComShopOperLogDO>().orderByDesc(ComShopOperLogDO::getOperTime).eq(ComShopOperLogDO::getUserId, pageDTO.getUserId()))
+ ;
IPage<ShopOperLogVO> comShopOperLogVOIPage =
comShopOperLogDOIPage.convert(comShopOperLogDO -> {
@@ -68,6 +78,12 @@
default: break;
}
shopOperLogVO.setBusinessName(businessTypeName);
+
+ R<LoginUserInfoVO> usrInfo = userService.getUserInfoByUserId(comShopOperLogDO.getUserId()+"");
+ if(R.isOk(usrInfo)) {
+ LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(usrInfo.getData()), LoginUserInfoVO.class);
+ shopOperLogVO.setUserName(loginUserInfoVO.getName());
+ }
return shopOperLogVO;
});
return R.ok(comShopOperLogVOIPage);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java
index 80a3931..d8defe3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/java/com/panzhihua/shop_backstage/api/GoodsApi.java
@@ -4,6 +4,7 @@
import com.panzhihua.common.constants.FtpConstants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ComShopGoodsVO;
@@ -64,7 +65,7 @@
@ApiOperation(value = "商品分页搜索", response = ComShopGoodsVO.class)
@PostMapping("/page")
- public R search(@RequestBody @Validated(PageGroup.class) ComShopGoodsDTO comShopGoodsDTO){
+ public R search(@RequestBody @Validated(PageGroup.class) PageComShopGoodsDTO comShopGoodsDTO){
R<ShopStoreVO> storeInfoR = communityService.getUserStoreInfo(getUserId());
if(R.isOk(storeInfoR)) {
ShopStoreVO shopStoreVO = JSONObject.parseObject(JSONObject.toJSONString(storeInfoR.getData()), ShopStoreVO.class);
@@ -73,7 +74,7 @@
}
comShopGoodsDTO.setStoreId(shopStoreVO.getId());
ClazzUtils.setIfStringIsEmpty(comShopGoodsDTO);
- return communityService.pageShopGoods(comShopGoodsDTO);
+ return communityService.pageGoodsList(comShopGoodsDTO);
}else{
return R.fail();
}
@@ -127,7 +128,7 @@
}
@ApiOperation(value = "上传图片")
- @PostMapping(value = "uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date")
+ @PostMapping(value = "/uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date")
public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) {
String name = file.getOriginalFilename();
List<String> formateList = Arrays.asList(
--
Gitblit v1.7.1