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

# Conflicts:
#	manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java

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<MessageExt> {
                     List<String> 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;

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<String> sign = mobile;
+        List<String> sign = new ArrayList<String>();
 
+        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)))

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;
 

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<MemberPointsHistory
      */
     MemberPointsHistoryVO getMemberPointsHistoryVO(String memberId);
 
+    /**
+     * 会员积分历史
+     * @param page 分页
+     * @param memberId 会员ID
+     * @param memberName 会员名称
+     * @return 积分历史分页
+     */
+    IPage<MemberPointsHistory> MemberPointsHistoryList(PageVO page, String memberId, String memberName);
+
 
 }

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<MemberPointsHistoryMapper, MemberPointsHistory> 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<MemberPointsHist
         Long variablePoint = 0L;
 
         if (StringUtils.isNotEmpty(memberId)) {
-            point = memberPointsHistoryMapper.getMemberPointsHistoryVO(1, memberId);
+            point = this.baseMapper.getMemberPointsHistoryVO(1, memberId);
-            variablePoint = memberPointsHistoryMapper.getMemberPointsHistoryVO(0, memberId);
+            variablePoint = this.baseMapper.getMemberPointsHistoryVO(0, memberId);
 
         } else {
-            point = memberPointsHistoryMapper.getALLMemberPointsHistoryVO(0);
+            point = this.baseMapper.getALLMemberPointsHistoryVO(0);
-            variablePoint = memberPointsHistoryMapper.getALLMemberPointsHistoryVO(1);
+            variablePoint = this.baseMapper.getALLMemberPointsHistoryVO(1);
         }
         memberPointsHistoryVO.setPoint(point == null ? 0 : point);
         memberPointsHistoryVO.setVariablePoint(variablePoint == null ? 0 : variablePoint);
         memberPointsHistoryVO.setVariablePoint(memberPointsHistoryVO.getPoint() - memberPointsHistoryVO.getVariablePoint());
         return memberPointsHistoryVO;
     }
+
+    @Override
+    public IPage<MemberPointsHistory> MemberPointsHistoryList(PageVO page, String memberId, String memberName) {
+        LambdaQueryWrapper<MemberPointsHistory> lambdaQueryWrapper=new LambdaQueryWrapper<MemberPointsHistory>()
+                .eq(memberId != null, MemberPointsHistory::getMemberId, memberId)
+                .like(memberName != null, MemberPointsHistory::getMemberName, memberName);
+        return this.page(PageUtil.initPage(page), lambdaQueryWrapper);
+    }
 }

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<SmsReachMapper, SmsReach> i
         BeanUtil.copyProperties(smsReach,smsReachDTO);
         smsReachDTO.setMobile(mobile);
         this.save(smsReach);
-        //发送订单变更mq消息
+        //发送短信批量发送mq消息
         rocketMQTemplate.asyncSend(destination, JSONUtil.toJsonStr(smsReachDTO), RocketmqSendCallbackBuilder.commonCallback());
 
     }

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<SmsSignMapper, SmsSign> 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);

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<SmsTemplateMapper, SmsTe
             List<SmsTemplate> list = list(new LambdaQueryWrapper<SmsTemplate>().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());

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());
         //售后申请

manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java

@@ -1,13 +1,11 @@
 package cn.lili.controller.member;
  
-import cn.lili.common.utils.PageUtil;
 import cn.lili.common.enums.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;
@@ -38,12 +36,7 @@ public class MemberPointsHistoryManagerController {
     })
     @GetMapping(value = "/getByPage")
     public ResultMessage<IPage<MemberPointsHistory>> getByPage(PageVO page, String memberId, String memberName) {
-
+        return ResultUtil.data(memberPointsHistoryService.MemberPointsHistoryList(page, memberId, 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));
     }
 
     @ApiOperation(value = "获取会员积分VO")