From 9dd0147819ed645bada6a65bd6fc35a40a67d721 Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Wed, 9 Sep 2020 10:35:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E8=A1=A8=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/co/yixiang/modules/services/AuthService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java index 9e3a85e8..5ca34de8 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java +++ b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java @@ -108,11 +108,10 @@ public class AuthService { //过滤掉表情 - String nickname = EmojiParser.removeAllEmojis(wxMpUser.getNickName()); String ip = IpUtil.getRequestIp(); YxUser user = YxUser.builder() .username(openid) - .nickname(nickname) + .nickname(wxMpUser.getNickName()) .avatar(wxMpUser.getAvatarUrl()) .addIp(ip) .lastIp(ip) @@ -121,7 +120,7 @@ public class AuthService { //构建微信用户 WechatUserDto wechatUserDTO = WechatUserDto.builder() - .nickname(nickname) + .nickname(wxMpUser.getNickName()) .routineOpenid(wxMpUser.getOpenId()) .unionId(wxMpUser.getUnionId()) .sex(Integer.valueOf(wxMpUser.getGender())) From ba68425fe31bd81b15081a75d4dc0d4602446fd6 Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Wed, 9 Sep 2020 10:57:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=B8=8B=E5=8D=95=E6=97=B6=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98=E4=B8=8D=E8=B6=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/rest/StoreOrderController.java | 2 +- .../yixiang/modules/services/AuthService.java | 2 +- .../service/impl/YxStoreProductServiceImpl.java | 17 ++++++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index 3caa4afb..71b582ee 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -306,7 +306,7 @@ public class StoreOrderController { public ApiResult comment(@Valid @RequestBody ProductReplyParam param){ YxUser user = LocalUser.getUser(); storeOrderService.orderComment(user,param.getUnique(), - EmojiParser.removeAllEmojis(param.getComment()), + param.getComment(), param.getPics(),param.getProductScore(),param.getServiceScore()); return ApiResult.ok(); } diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java index 5ca34de8..64a4ee1a 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java +++ b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java @@ -188,7 +188,7 @@ public class AuthService { YxUser returnUser = null; if(yxUser == null){ //过滤掉表情 - String nickname = EmojiParser.removeAllEmojis(wxMpUser.getNickname()); + String nickname = wxMpUser.getNickname(); log.info("昵称：{}", nickname); //用户保存 String ip = IpUtil.getRequestIp(); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java index f84b97a3..f60ffa0f 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java @@ -148,19 +148,22 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl Date: Wed, 9 Sep 2020 11:20:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?bug--=E6=99=AE=E9=80=9A=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/product/rest/StoreProductController.java | 1 + .../product/service/YxStoreProductService.java | 6 ++++++ .../service/impl/YxStoreProductServiceImpl.java | 12 ++++++++++-- .../product/service/mapper/StoreProductMapper.java | 9 +++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java index 8b790f3e..86450f0d 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java @@ -215,6 +215,7 @@ public class StoreProductController { @RequestParam(value = "",required=false) String longitude, @RequestParam(value = "",required=false) String from) { long uid = LocalUser.getUser().getUid(); + storeProductService.incBrowseNum(id); ProductVo productDTO = storeProductService.goodsDetail(id,uid,latitude,longitude); return ApiResult.ok(productDTO); } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductService.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductService.java index f857ec6c..546eb132 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductService.java @@ -79,6 +79,12 @@ public interface YxStoreProductService extends BaseService{ */ ProductVo goodsDetail(Long id, Long uid, String latitude, String longitude); + /** + * 商品浏览量 + * @param productId + */ + void incBrowseNum(Long productId); + /** * 商品列表 * @param page 页码 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java index f60ffa0f..7d7ef378 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java @@ -10,7 +10,6 @@ package co.yixiang.modules.product.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.ListUtil; -import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; @@ -64,7 +63,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageInfo; -import io.swagger.annotations.ApiModelProperty; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -365,6 +363,16 @@ public class YxStoreProductServiceImpl extends BaseServiceImpl { @Update("update yx_store_seckill set stock=stock+#{num}, sales=sales-#{num}" + " where id=#{activityId} and stock >= #{num}") void incSeckillStockIncSales(Integer num, Long productId, Long activityId); + + /** + * 商品浏览量 + * @param productId + * @return + */ + @Update("update yx_store_product set browse=browse+1 " + + "where id=#{productId}") + int incBrowseNum(@Param("productId") Long productId); }