更新导出订单将手机号中间加密，筛选未下架的套餐规则

src/main/java/com/sqx/modules/lovers/controller/LoversSetRuleController.java

@@ -6,6 +6,7 @@ import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.lovers.dto.LoversSetRuleDTO;
 import com.sqx.modules.lovers.dto.LoversSetRuleQueryDTO;
+import com.sqx.modules.lovers.entity.LoversSetRule;
 import com.sqx.modules.lovers.service.LoversSetRuleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +14,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 情侣套餐-规则
@@ -59,4 +61,11 @@ public class LoversSetRuleController {
         loversSetRuleService.removeById(id);
         return Result.success();
     }
+
+    @GetMapping("useList")
+    @ApiOperation("使用的套餐规则")
+    public Result useList() {
+        List<LoversSetRule> loversSetRuleList= loversSetRuleService.useList();
+        return Result.success().put("data", loversSetRuleList);
+    }
 }

src/main/java/com/sqx/modules/lovers/service/LoversSetRuleService.java

@@ -6,6 +6,8 @@ import com.sqx.modules.lovers.dto.LoversSetRuleDTO;
 import com.sqx.modules.lovers.dto.LoversSetRuleQueryDTO;
 import com.sqx.modules.lovers.entity.LoversSetRule;
 
+import java.util.List;
+
 public interface LoversSetRuleService extends IService<LoversSetRule> {
 
     PageUtils page(LoversSetRuleQueryDTO queryDTO);
@@ -13,4 +15,7 @@ public interface LoversSetRuleService extends IService<LoversSetRule> {
     void add(LoversSetRuleDTO loversSetRule);
 
     void update(LoversSetRuleDTO loversSetRule);
+
+    List<LoversSetRule> useList();
+
 }

src/main/java/com/sqx/modules/lovers/service/impl/LoversSetRuleServiceImpl.java

@@ -3,6 +3,7 @@ package com.sqx.modules.lovers.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -73,6 +74,16 @@ public class LoversSetRuleServiceImpl extends ServiceImpl<LoversSetRuleDao, Love
         this.updateById(entity);
     }
 
+    @Override
+    public List<LoversSetRule> useList() {
+        LambdaQueryWrapper<LoversSetRule> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(LoversSetRule::getDelFlag,0)
+                .eq(LoversSetRule::getStatus,1)
+                .orderByAsc(LoversSetRule::getSort);
+        List<LoversSetRule> list = this.list(wrapper);
+        return list;
+    }
+
     private void checkNameUnique(Long id, String name) {
         LambdaQueryWrapper<LoversSetRule> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.ne(ObjectUtil.isNotNull(id), LoversSetRule::getId, id);

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1524,7 +1524,12 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             row.add(order.getOrderId());
             row.add(order.getUserName());
             row.add(order.getAvatar());
-            row.add(order.getPhone());
+            if (ObjectUtils.isNotEmpty(order.getPhone())) {
+                row.add(order.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
+            }else {
+                row.add(order.getPhone());
+            }
+
             StringBuffer stringBuffer = new StringBuffer();
             stringBuffer.append("店铺名称：").append(StringUtils.isNotBlank(order.getShopName()) ? order.getShopName() : "")
                     .append("\n").append("店铺电话：").append(StringUtils.isNotBlank(order.getShopPhone()) ? order.getShopPhone() : "")