From 3925422b3e571239a859307fa2bc26da2b92fe34 Mon Sep 17 00:00:00 2001 From: lifenlong Date: Tue, 18 May 2021 17:27:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/listener/NoticeSendMessageListener.java | 3 +-- .../java/cn/lili/common/sms/impl/SmsUtilAliImplService.java | 6 +++--- .../modules/message/serviceimpl/SmsReachServiceImpl.java | 3 +-- .../modules/message/serviceimpl/SmsSignServiceImpl.java | 3 --- .../modules/message/serviceimpl/SmsTemplateServiceImpl.java | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java index b9f98991..f30d41e7 100644 --- a/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/NoticeSendMessageListener.java @@ -13,7 +13,6 @@ import cn.lili.modules.message.service.StoreMessageService; import cn.lili.modules.store.entity.dos.Store; import cn.lili.modules.store.service.StoreService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import lombok.RequiredArgsConstructor; import org.apache.rocketmq.common.message.MessageExt; import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; @@ -59,7 +58,7 @@ public class NoticeSendMessageListener implements RocketMQListener { List list = memberMapper.getAllMemberMobile(); smsUtil.sendBatchSms(smsReachDTO.getSignName(), list, smsReachDTO.getMessageCode()); //判断为发送部分用户 - } else if (smsReachDTO.getSmsRange().equals(RangeEnum.APPOINT.name())) { + } else { smsUtil.sendBatchSms(smsReachDTO.getSignName(), smsReachDTO.getMobile(), smsReachDTO.getMessageCode()); } break; diff --git a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java index d99be26a..a592bcef 100644 --- a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java @@ -112,7 +112,6 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { .setTemplateParam(JSONUtil.toJsonStr(param)); try { SendSmsResponse response = client.sendSms(sendSmsRequest); - System.out.println(response.getBody().getCode()); } catch (Exception e) { e.printStackTrace(); } @@ -123,8 +122,9 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { com.aliyun.dysmsapi20170525.Client client = this.createClient(); - List sign = mobile; + List sign = new ArrayList(); + sign.addAll(mobile); sign.replaceAll(e -> signName); //手机号拆成多个小组进行发送 @@ -140,7 +140,7 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { signNameList.add(sign.subList((i * 100), endPoint)); } - //发送短信 +// //发送短信 for (int i = 0; i < mobileList.size(); i++) { SendBatchSmsRequest sendBatchSmsRequest = new SendBatchSmsRequest() .setPhoneNumberJson(JSONUtil.toJsonStr(mobileList.get(i))) diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java index 11f6ca92..0079545c 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java @@ -10,7 +10,6 @@ import cn.lili.modules.message.entity.dto.SmsReachDTO; import cn.lili.modules.message.mapper.SmsReachMapper; import cn.lili.modules.message.service.SmsReachService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,7 +39,7 @@ public class SmsReachServiceImpl extends ServiceImpl i BeanUtil.copyProperties(smsReach,smsReachDTO); smsReachDTO.setMobile(mobile); this.save(smsReach); - //发送订单变更mq消息 + //发送短信批量发送mq消息 rocketMQTemplate.asyncSend(destination, JSONUtil.toJsonStr(smsReachDTO), RocketmqSendCallbackBuilder.commonCallback()); } diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java index 8e355950..817034f5 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java @@ -1,6 +1,5 @@ package cn.lili.modules.message.serviceimpl; -import cn.lili.common.enums.MessageCode; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.sms.AliSmsUtil; @@ -13,7 +12,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -71,7 +69,6 @@ public class SmsSignServiceImpl extends ServiceImpl impl //查询签名状态 for (SmsSign smsSign : list) { map = aliSmsUtil.querySmsSign(smsSign.getSignName()); - smsSign.setSignStatus((Integer) map.get("SignStatus")); smsSign.setReason(map.get("Reason").toString()); this.updateById(smsSign); diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java index 9bd7e980..5de67750 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -65,7 +64,7 @@ public class SmsTemplateServiceImpl extends ServiceImpl list = list(new LambdaQueryWrapper().eq(SmsTemplate::getTemplateStatus, 0)); //查询签名状态 for (SmsTemplate smsTemplate : list) { - map = aliSmsUtil.querySmsTemplate(smsTemplate.getTemplateName()); + map = aliSmsUtil.querySmsTemplate(smsTemplate.getTemplateCode()); smsTemplate.setTemplateStatus((Integer) map.get("TemplateStatus")); smsTemplate.setReason(map.get("Reason").toString()); smsTemplate.setTemplateCode(map.get("TemplateCode").toString()); From 8d156f01e6b2e46d871b69b1cd77db71a915cafa Mon Sep 17 00:00:00 2001 From: lifenlong Date: Wed, 19 May 2021 09:07:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E5=8E=86=E5=8F=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/MemberPointsHistoryService.java | 11 ++++++++ .../MemberPointsHistoryServiceImpl.java | 25 ++++++++++++------- .../MemberPointsHistoryManagerController.java | 10 +------- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java index 6f9e25a8..6111f157 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java @@ -1,7 +1,9 @@ package cn.lili.modules.member.service; +import cn.lili.common.vo.PageVO; import cn.lili.modules.member.entity.dos.MemberPointsHistory; import cn.lili.modules.member.entity.vo.MemberPointsHistoryVO; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -20,5 +22,14 @@ public interface MemberPointsHistoryService extends IService MemberPointsHistoryList(PageVO page, String memberId, String memberName); + } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java index 8a493180..af594ce8 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java @@ -1,14 +1,16 @@ package cn.lili.modules.member.serviceimpl; +import cn.lili.common.utils.PageUtil; import cn.lili.common.utils.StringUtils; +import cn.lili.common.vo.PageVO; import cn.lili.modules.member.entity.dos.MemberPointsHistory; import cn.lili.modules.member.entity.vo.MemberPointsHistoryVO; import cn.lili.modules.member.mapper.MemberPointsHistoryMapper; import cn.lili.modules.member.service.MemberPointsHistoryService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,9 +24,6 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class MemberPointsHistoryServiceImpl extends ServiceImpl implements MemberPointsHistoryService { - @Autowired - private MemberPointsHistoryMapper memberPointsHistoryMapper; - @Override public MemberPointsHistoryVO getMemberPointsHistoryVO(String memberId) { MemberPointsHistoryVO memberPointsHistoryVO = new MemberPointsHistoryVO(); @@ -32,16 +31,24 @@ public class MemberPointsHistoryServiceImpl extends ServiceImpl MemberPointsHistoryList(PageVO page, String memberId, String memberName) { + LambdaQueryWrapper lambdaQueryWrapper=new LambdaQueryWrapper() + .eq(memberId != null, MemberPointsHistory::getMemberId, memberId) + .like(memberName != null, MemberPointsHistory::getMemberName, memberName); + return this.page(PageUtil.initPage(page), lambdaQueryWrapper); + } } \ No newline at end of file diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java index 531d6ccb..403a3f10 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java @@ -1,19 +1,16 @@ package cn.lili.controller.member; -import cn.lili.common.utils.PageUtil; import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberPointsHistory; import cn.lili.modules.member.entity.vo.MemberPointsHistoryVO; import cn.lili.modules.member.service.MemberPointsHistoryService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -39,12 +36,7 @@ public class MemberPointsHistoryManagerController { }) @GetMapping(value = "/getByPage") public ResultMessage> getByPage(PageVO page, String memberId, String memberName) { - - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq(memberId != null, "member_id", memberId); - queryWrapper.like(memberName != null, "member_name", memberName); - - return ResultUtil.data(memberPointsHistoryService.page(PageUtil.initPage(page), queryWrapper)); + return ResultUtil.data(memberPointsHistoryService.MemberPointsHistoryList(page, memberId, memberName)); } @ApiOperation(value = "获取会员积分VO") From 4b7be309b2a81d35df0e8b238e96d99ada83ef4d Mon Sep 17 00:00:00 2001 From: lifenlong Date: Wed, 19 May 2021 09:33:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BF=90=E8=90=A5=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=8C=E5=B1=95=E7=A4=BA=E7=9A=84=E5=BE=85?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F=E4=B8=8D?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/modules/member/entity/dto/MemberAddDTO.java | 3 +-- .../statistics/serviceimpl/IndexStatisticsServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java index 30a4074c..4389e2af 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java @@ -15,9 +15,8 @@ import javax.validation.constraints.Size; */ @Data public class MemberAddDTO { - @NotEmpty(message = "会员用户名必填") - @Size(min = 6, max = 30) + @Size(max = 30,message = "会员用户名最长30位") @ApiModelProperty(value = "会员用户名") private String username; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java index 2c38464b..3710e27d 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java @@ -114,7 +114,7 @@ public class IndexStatisticsServiceImpl implements IndexStatisticsService { IndexNoticeVO indexNoticeVO = new IndexNoticeVO(); //商品审核 - indexNoticeVO.setGoods(goodsService.goodsNum(GoodsStatusEnum.UPPER, GoodsAuthEnum.TOBEAUDITED)); + indexNoticeVO.setGoods(goodsService.goodsNum(null, GoodsAuthEnum.TOBEAUDITED)); //店铺入驻审核 indexNoticeVO.setStore(storeService.auditNum()); //售后申请