From 33db98681db8805ed0598ea75edb1029300f1a13 Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Wed, 13 May 2020 08:56:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=94=AE=E4=B8=8D?= =?UTF-8?q?=E6=98=AFid=E7=94=A8getById=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mp/service/impl/YxWechatMenuServiceImpl.java | 2 +- .../modules/activity/rest/UserExtractController.java | 7 +++++-- .../service/impl/YxStoreCouponUserServiceImpl.java | 4 +++- .../modules/shop/rest/StoreOrderController.java | 6 ++++-- .../shop/service/impl/YxStoreOrderServiceImpl.java | 12 ++++++------ 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java index 5445eb41..9a5d4554 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java @@ -76,7 +76,7 @@ public class YxWechatMenuServiceImpl extends BaseServiceImpl().eq("key",wechat_menus)); + YxWechatMenu yxWechatMenu = this.getOne(new QueryWrapper().eq("`key`",wechat_menus)); if(yxWechatMenu == null){ return false; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java index 385c962b..30bb68e9 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java @@ -9,7 +9,9 @@ import co.yixiang.exception.BadRequestException; import co.yixiang.modules.activity.domain.YxUserExtract; import co.yixiang.modules.activity.service.YxUserExtractService; import co.yixiang.modules.activity.service.dto.YxUserExtractQueryCriteria; +import co.yixiang.modules.shop.domain.YxUser; import co.yixiang.modules.shop.domain.YxUserBill; +import co.yixiang.modules.shop.domain.YxWechatUser; import co.yixiang.modules.shop.service.YxUserBillService; import co.yixiang.modules.shop.service.YxUserService; import co.yixiang.modules.shop.service.YxWechatUserService; @@ -17,6 +19,7 @@ import co.yixiang.modules.shop.service.dto.YxUserDto; import co.yixiang.modules.shop.service.dto.YxWechatUserDto; import co.yixiang.mp.service.YxPayService; import co.yixiang.utils.OrderUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.binarywang.wxpay.exception.WxPayException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -82,7 +85,7 @@ public class UserExtractController { throw new BadRequestException("请填写失败原因"); } String mark = "提现失败,退回佣金"+resources.getExtractPrice()+"元"; - YxUserDto userDTO = generator.convert(yxUserService.getById(resources.getUid()),YxUserDto.class); + YxUserDto userDTO = generator.convert(yxUserService.getOne(new QueryWrapper().eq("uid",resources.getUid())),YxUserDto.class); //增加流水 YxUserBill userBill = new YxUserBill(); @@ -109,7 +112,7 @@ public class UserExtractController { //todo 此处为企业付款，没经过测试 boolean isTest = true; if(!isTest){ - YxWechatUserDto wechatUser = generator.convert(wechatUserService.getById(resources.getUid()),YxWechatUserDto.class); + YxWechatUserDto wechatUser = generator.convert(wechatUserService.getOne(new QueryWrapper().eq("uid",resources.getUid())),YxWechatUserDto.class); if(ObjectUtil.isNotNull(wechatUser)){ try { payService.entPay(wechatUser.getOpenid(),resources.getId().toString(), diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java index e0e3a82b..693ae09f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java @@ -6,9 +6,11 @@ import co.yixiang.modules.activity.service.YxStoreCouponUserService; import co.yixiang.modules.activity.service.dto.YxStoreCouponUserDTO; import co.yixiang.modules.activity.service.dto.YxStoreCouponUserQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStoreCouponUserMapper; +import co.yixiang.modules.shop.domain.YxUser; import co.yixiang.modules.shop.service.YxUserService; import co.yixiang.utils.QueryHelp; import co.yixiang.utils.ValidationUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @@ -49,7 +51,7 @@ public class YxStoreCouponUserServiceImpl implements YxStoreCouponUserService { List storeOrderDTOS = yxStoreCouponUserMapper .toDto(page.getContent()); for (YxStoreCouponUserDTO couponUserDTO : storeOrderDTOS) { - couponUserDTO.setNickname(userService.getById(couponUserDTO.getUid()).getNickname()); + couponUserDTO.setNickname(userService.getOne(new QueryWrapper().eq("uid",couponUserDTO.getUid())).getNickname()); } Map map = new LinkedHashMap<>(2); map.put("content",storeOrderDTOS); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java index e7b39b6c..7f13daae 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java @@ -15,6 +15,7 @@ import co.yixiang.express.dao.ExpressInfo; import co.yixiang.modules.activity.service.YxStorePinkService; import co.yixiang.modules.shop.domain.YxStoreOrder; import co.yixiang.modules.shop.domain.YxStoreOrderStatus; +import co.yixiang.modules.shop.domain.YxWechatUser; import co.yixiang.modules.shop.service.*; import co.yixiang.modules.shop.service.dto.*; import co.yixiang.modules.shop.service.param.ExpressParam; @@ -23,6 +24,7 @@ import co.yixiang.utils.OrderUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -220,7 +222,7 @@ public class StoreOrderController { //模板消息通知 try { - YxWechatUserDto wechatUser = generator.convert(wechatUserService.getById(resources.getUid()),YxWechatUserDto.class); + YxWechatUserDto wechatUser = generator.convert(wechatUserService.getOne(new QueryWrapper().eq("uid",resources.getUid())),YxWechatUserDto.class); if (ObjectUtil.isNotNull(wechatUser)) { //公众号与小程序打通统一公众号模板通知 if (StrUtil.isNotBlank(wechatUser.getOpenid())) { @@ -291,7 +293,7 @@ public class StoreOrderController { //模板消息通知 try { - YxWechatUserDto wechatUser = generator.convert(wechatUserService.getById(resources.getUid()),YxWechatUserDto.class); + YxWechatUserDto wechatUser = generator.convert(wechatUserService.getOne(new QueryWrapper().eq("uid",resources.getUid())),YxWechatUserDto.class); if (ObjectUtil.isNotNull(wechatUser)) { //公众号与小程序打通统一公众号模板通知 if (StrUtil.isNotBlank(wechatUser.getOpenid())) { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java index 986d684d..2de904ec 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java @@ -106,17 +106,17 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl())); @@ -344,7 +344,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl().eq("uid",yxStoreOrder.getUid())), YxUserDto.class)); storeOrderDTOS.add(yxStoreOrderDTO); @@ -405,7 +405,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl().eq("uid",resources.getUid())),YxUserDto.class); userMapper.updateMoney(resources.getPayPrice().doubleValue(), resources.getUid());