:lock: 隐藏密码

src/main/java/com/szwl/controller/TAdminController.java

@@ -723,8 +723,7 @@ public class TAdminController {
             tAdmin.setManagerId(managerId);
             tAdminService.getById(tAdmin);
         }
-        UserDetailBO userDetailBO = BeanUtil.copyProperties(tAdmin, UserDetailBO.class);
-
+        UserDetailBO userDetailBO = BeanUtil.copyProperties(tAdmin, UserDetailBO.class, "password");
         return R.ok(userDetailBO);
     }
 

src/main/java/com/szwl/controller/TPromoCodeController.java

@@ -68,83 +68,88 @@ public class TPromoCodeController {
     TJoinpayMchService joinpayMchService;
     @Autowired
     PayFeign payFeign;
+
     @ApiOperation(value = "获取优惠码")
     @GetMapping("/getTPromoCode")
-    public ResponseModel<IPage<TPromoCode>> getTPromoCode(@RequestParam String  code) {
+    public ResponseModel<IPage<TPromoCode>> getTPromoCode(@RequestParam String code) {
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
-        query.eq(TPromoCode::getCode,code);
+        query.eq(TPromoCode::getCode, code);
         Page<TPromoCode> page = new Page<>(1, 10, true);
         IPage<TPromoCode> iPage = promoCodeService.page(page, query);
         return R.ok(iPage);
     }
+
     @ApiOperation(value = "获取优惠码")
     @GetMapping("/getPromoCode")
-    public ResponseModel<TPromoCode> getPromoCode(@RequestParam String  code) {
+    public ResponseModel<TPromoCode> getPromoCode(@RequestParam String code) {
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
         String[] split = code.split("-");
-        query.eq(TPromoCode::getCode,split[0]);
-        query.eq(TPromoCode::getAdminId,split[1]);
+        query.eq(TPromoCode::getCode, split[0]);
+        query.eq(TPromoCode::getAdminId, split[1]);
         List<TPromoCode> list = promoCodeService.list(query);
-        if(list.size()>0){
+        if (list.size() > 0) {
             return R.ok(list.get(0));
         }
         return R.ok();
     }
+
     @ApiOperation(value = "获取优惠码")
     @GetMapping("/selectTPromoCode")
-    public ResponseModel<TPromoCode> selectTPromoCode(@RequestParam String  code,@RequestParam String  adminId) {
+    public ResponseModel<TPromoCode> selectTPromoCode(@RequestParam String code, @RequestParam String adminId) {
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
-        query.eq(TPromoCode::getCode,code);
-        query.eq(TPromoCode::getAdminId,adminId);
+        query.eq(TPromoCode::getCode, code);
+        query.eq(TPromoCode::getAdminId, adminId);
 //        List<TPromoCode> list = promoCodeService.list(query);
         TPromoCode promoCode = promoCodeService.getOne(query);
         return R.ok(promoCode);
     }
+
     @ApiOperation(value = "小程序获取优惠码")
     @GetMapping("/getCode")
-    public ResponseModel<TPromoCode> getCode(String  clientId, String  code) {
-        if(StringUtils.isEmpty(clientId)){
+    public ResponseModel<TPromoCode> getCode(String clientId, String code) {
+        if (StringUtils.isEmpty(clientId)) {
             return null;
         }
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
-        query.eq(TEquipment::getClientId,clientId);
+        query.eq(TEquipment::getClientId, clientId);
         List<TEquipment> list = tEquipmentService.list(query);
         TEquipment equipment = list.get(0);
         LambdaQueryWrapper<TPromoCode> query1 = Wrappers.lambdaQuery();
-        query1.eq(TPromoCode::getCode,code);
-        query1.eq(TPromoCode::getAdminId,equipment.getAdminId());
+        query1.eq(TPromoCode::getCode, code);
+        query1.eq(TPromoCode::getAdminId, equipment.getAdminId());
         List<TPromoCode> list1 = promoCodeService.list(query1);
-        if(list1.size()>0){
+        if (list1.size() > 0) {
             TPromoCode tPromoCode = list1.get(0);
             String isUse = tPromoCode.getIsUse();
-            if(isUse.equals("1")){
-                return R.fail(A0002,"已使用");
+            if (isUse.equals("1")) {
+                return R.fail(A0002, "已使用");
             }
             Date lastUseDate = tPromoCode.getLastUseDate();
             Date date = new Date();
-            if(date.getTime()>lastUseDate.getTime()){
-                return R.fail(A0002,"已过期");
+            if (date.getTime() > lastUseDate.getTime()) {
+                return R.fail(A0002, "已过期");
             }
             return R.ok(tPromoCode);
-        }else {
-            return R.fail(A0002,"没有找到优惠码");
+        } else {
+            return R.fail(A0002, "没有找到优惠码");
         }
     }
+
     @ApiOperation(value = "修改优惠码状态")
     @GetMapping("/updateCode")
-    public ResponseModel<?> updateCode(String  clientId, String  code) {
-        if(StringUtils.isEmpty(clientId)){
+    public ResponseModel<?> updateCode(String clientId, String code) {
+        if (StringUtils.isEmpty(clientId)) {
             return null;
         }
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
-        query.eq(TEquipment::getClientId,clientId);
+        query.eq(TEquipment::getClientId, clientId);
         List<TEquipment> list = tEquipmentService.list(query);
         TEquipment equipment = list.get(0);
         LambdaQueryWrapper<TPromoCode> query1 = Wrappers.lambdaQuery();
-        query1.eq(TPromoCode::getCode,code);
-        query1.eq(TPromoCode::getAdminId,equipment.getAdminId());
+        query1.eq(TPromoCode::getCode, code);
+        query1.eq(TPromoCode::getAdminId, equipment.getAdminId());
         List<TPromoCode> list1 = promoCodeService.list(query1);
-        if(list1.size()>0){
+        if (list1.size() > 0) {
             TPromoCode tPromoCode = list1.get(0);
             tPromoCode.setIsUse("1");
             if (StringUtils.isNotEmpty(equipment.getName())) {
@@ -156,28 +161,30 @@ public class TPromoCodeController {
             String time = sdf.format(new Date());
             tPromoCode.setUseDate(time);
             promoCodeService.updateById(tPromoCode);
-            return R.ok(null,"修改成功");
-        }else {
-            return R.fail(A0002,"没有找到优惠码");
+            return R.ok(null, "修改成功");
+        } else {
+            return R.fail(A0002, "没有找到优惠码");
         }
     }
+
     @ApiOperation(value = "修改优惠码")
     @GetMapping("/updatePromoCode")
-    public void updatePromoCode(@RequestParam(value = "id")String id, @RequestParam(value = "type")String type) {
+    public void updatePromoCode(@RequestParam(value = "id") String id, @RequestParam(value = "type") String type) {
         TPromoCode promoCode = promoCodeService.getById(id);
         promoCode.setIsUse(type);
-        if(type.equals("1")){
-            promoCode.setUseDate(DateUtils.formatDate(new Date(),PATTERN_yyyy_MM_dd_HH_mm_ss));
+        if (type.equals("1")) {
+            promoCode.setUseDate(DateUtils.formatDate(new Date(), PATTERN_yyyy_MM_dd_HH_mm_ss));
         }
         promoCodeService.updateById(promoCode);
     }
+
     @ApiOperation(value = "生成0折优惠码")
     @GetMapping("/addPromoCode")
-    public void addPromoCode(@RequestParam(value = "adminId")String adminId,@RequestParam(value = "lastUseDate")Date lastUseDate,
-                             @RequestParam(value = "number")String number, @RequestParam(value = "codeNum") String codeNum) {
+    public void addPromoCode(@RequestParam(value = "adminId") String adminId, @RequestParam(value = "lastUseDate") Date lastUseDate,
+                             @RequestParam(value = "number") String number, @RequestParam(value = "codeNum") String codeNum) {
         int num = Integer.parseInt(number);
         List<String> codes = new ArrayList<>();
-        if(StringUtils.isEmpty(codeNum)) {
+        if (StringUtils.isEmpty(codeNum)) {
             for (int i = 0; i < num; i++) {
                 String code = orderService.initSn(Long.valueOf(adminId));
                 StringBuffer str = new StringBuffer();
@@ -189,28 +196,29 @@ public class TPromoCodeController {
         }
         TAdmin admin = adminService.getById(adminId);
         for (String code : codes) {
-                TPromoCode promoCode = new TPromoCode();
-                promoCode.setCreateDate(new Date());
-                promoCode.setModifyDate(new Date());
-                promoCode.setCode(Long.parseLong(code));
-                promoCode.setAdminId(adminId);
-                promoCode.setIsUse("0");
-                promoCode.setDiscount(0f);
-                promoCode.setLastUseDate(lastUseDate);
-                promoCode.setCreateDate(new Date());
-                promoCode.setType("0");
-                promoCode.setUserName(admin.getUsername());
-                promoCodeService.save(promoCode);
+            TPromoCode promoCode = new TPromoCode();
+            promoCode.setCreateDate(new Date());
+            promoCode.setModifyDate(new Date());
+            promoCode.setCode(Long.parseLong(code));
+            promoCode.setAdminId(adminId);
+            promoCode.setIsUse("0");
+            promoCode.setDiscount(0f);
+            promoCode.setLastUseDate(lastUseDate);
+//                promoCode.setCreateDate(new Date());
+            promoCode.setType("0");
+            promoCode.setUserName(admin.getUsername());
+            promoCodeService.save(promoCode);
         }
     }
+
     @ApiOperation(value = "生成n元优惠券")
     @GetMapping("/addYHJ")
-    public ResponseModel<?> addYHJ(Long wxId,String flag) {
-        if(wxId==null||StringUtils.isEmpty(flag)){
+    public ResponseModel<?> addYHJ(Long wxId, String flag) {
+        if (wxId == null || StringUtils.isEmpty(flag)) {
             return R.fail(A0001);
         }
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
-        query.eq(TPromoCode::getWxId,wxId);
+        query.eq(TPromoCode::getWxId, wxId);
 //        if(flag.equals("YHJ5")||flag.equals("YHJ10")){
 //            query.eq(TPromoCode::getType,"2");
 //            List<TPromoCode> list = promoCodeService.list(query);
@@ -218,16 +226,16 @@ public class TPromoCodeController {
 //                return R.ok(1,"此券每人限领一张，您已领取过，不能再领！");
 //            }
 //        }
-        query.eq(TPromoCode::getType,"2");
+        query.eq(TPromoCode::getType, "2");
         List<TPromoCode> list = promoCodeService.list(query);
-        if(list.size()>0){
-            return R.ok(1,"此券每人限领一张，您已领取过，不能再领！");
+        if (list.size() > 0) {
+            return R.ok(1, "此券每人限领一张，您已领取过，不能再领！");
         }
         String code = orderService.initSn(Long.valueOf(wxId));
         TPromoCode promoCode = new TPromoCode();
         promoCode.setCreateDate(new Date());
         promoCode.setModifyDate(new Date());
-        promoCode.setCode(Long.parseLong(code.substring(code.length()-8,code.length())));
+        promoCode.setCode(Long.parseLong(code.substring(code.length() - 8, code.length())));
         promoCode.setAdminId(null);
         promoCode.setIsUse("0");
 //        if(flag.equals("YHJ5")){
@@ -241,31 +249,32 @@ public class TPromoCodeController {
         String[] js = flag.split("J");
         String s = js[1];
         int price = Integer.parseInt(s);
-        if(price>100){
+        if (price > 100) {
             return R.fail(A0001);
         }
         promoCode.setDiscount(Float.valueOf(price));
         promoCode.setType("2");
         Long data = Calendar.getInstance().getTimeInMillis();
         Long t = 3l;
-        Long mon = 30L*24L*60L*60L*1000L;
-        Long d = data + (mon*t);
+        Long mon = 30L * 24L * 60L * 60L * 1000L;
+        Long d = data + (mon * t);
         Date lastUseDate = new Date(Long.parseLong(String.valueOf(d)));
         promoCode.setLastUseDate(lastUseDate);
         promoCode.setCreateDate(new Date());
         promoCode.setUserName(null);
         promoCode.setWxId(wxId);
         promoCodeService.save(promoCode);
-        return R.ok(promoCode,"领取成功");
+        return R.ok(promoCode, "领取成功");
     }
+
     @ApiOperation(value = "核销优惠券")
     @GetMapping("/useYHJ")
-    public void useYHJ(@RequestParam String code,@RequestParam String adminId,@RequestParam String clentId) {
+    public void useYHJ(@RequestParam String code, @RequestParam String adminId, @RequestParam String clentId) {
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
-        query.eq(TPromoCode::getCode,code);
-        query.eq(TPromoCode::getIsUse,"0");
+        query.eq(TPromoCode::getCode, code);
+        query.eq(TPromoCode::getIsUse, "0");
         List<TPromoCode> list = promoCodeService.list(query);
-        if(list.size()>0){
+        if (list.size() > 0) {
             TPromoCode promoCode = list.get(0);
             promoCode.setUseDate(DateUtils.formatDate(new Date(), DateUtils.PATTERN_yyyy_MM_dd_HH_mm_ss));
             promoCode.setAdminId(adminId);
@@ -275,44 +284,47 @@ public class TPromoCodeController {
             promoCodeService.updateById(promoCode);
         }
     }
+
     @GetMapping("/getYHJList")
     public ResponseModel<?> getYHJList(Long wxId) {
-        if(wxId==null){
+        if (wxId == null) {
             return R.fail(A0001);
         }
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
-        query.eq(TPromoCode::getWxId,wxId);
-        query.eq(TPromoCode::getIsUse,"0");
-        query.eq(TPromoCode::getType,"2");
+        query.eq(TPromoCode::getWxId, wxId);
+        query.eq(TPromoCode::getIsUse, "0");
+        query.eq(TPromoCode::getType, "2");
         List<TPromoCode> list = promoCodeService.list(query);
-        return R.ok(list,"成功");
+        return R.ok(list, "成功");
     }
+
     @GetMapping("/checkYHJList")
     public ResponseModel<?> checkYHJList(Long wxId) {
-        if(wxId==null){
+        if (wxId == null) {
             return R.fail(A0001);
         }
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
-        query.eq(TPromoCode::getWxId,wxId);
-        query.eq(TPromoCode::getType,"2");
+        query.eq(TPromoCode::getWxId, wxId);
+        query.eq(TPromoCode::getType, "2");
         List<TPromoCode> list = promoCodeService.list(query);
-        if(list.size()>0){
-            return R.ok(true,"已领取");
-        }else {
-            return R.ok(false,"未领取");
+        if (list.size() > 0) {
+            return R.ok(true, "已领取");
+        } else {
+            return R.ok(false, "未领取");
         }
 
     }
+
     @GetMapping("/getYHJ")
     public ResponseModel<TPromoCode> getYHJ(@RequestParam String code) {
-        if(StringUtils.isEmpty(code)){
+        if (StringUtils.isEmpty(code)) {
             return R.fail(A0001);
         }
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
-        query.eq(TPromoCode::getCode,code);
-        query.eq(TPromoCode::getType,"2");
+        query.eq(TPromoCode::getCode, code);
+        query.eq(TPromoCode::getType, "2");
         List<TPromoCode> list = promoCodeService.list(query);
-        if(list.size()>0){
+        if (list.size() > 0) {
             TPromoCode tPromoCode = list.get(0);
 //            String isUse = tPromoCode.getIsUse();
 //            if(isUse.equals("1")){
@@ -327,24 +339,25 @@ public class TPromoCodeController {
         }
         return R.ok();
     }
+
     @ApiOperation(value = "添加优惠码")
     @GetMapping("/add")
     public ResponseModel<?> add(String addMode, String codeNum,
-                                Long adminId,int number,Float discount,
-                                Float month,String type,String frpCode) {
-        if(discount == null || month == null || adminId == null || StringUtils.isEmpty(type)){
+                                Long adminId, int number, Float discount,
+                                Float month, String type, String frpCode) {
+        if (discount == null || month == null || adminId == null || StringUtils.isEmpty(type)) {
             return R.fail(A0001);
         }
         if (addMode.equals("2")) {
-            if(StringUtils.isEmpty(codeNum)){
-                return R.fail(A0001,"优惠码为空");
+            if (StringUtils.isEmpty(codeNum)) {
+                return R.fail(A0001, "优惠码为空");
             }
             LambdaQueryWrapper<TPromoCode> query = new LambdaQueryWrapper<>();
-            query.eq(TPromoCode::getCode,codeNum);
-            query.eq(TPromoCode::getIsUse,0);
+            query.eq(TPromoCode::getCode, codeNum);
+            query.eq(TPromoCode::getIsUse, 0);
             query.eq(TPromoCode::getAdminId, adminId);
             TPromoCode tPromoCode = promoCodeService.getOne(query);
-            if(tPromoCode != null) {
+            if (tPromoCode != null) {
                 // 已存在优惠码
                 return R.fail(A0002, "已存在该优惠码");
             }
@@ -360,10 +373,10 @@ public class TPromoCodeController {
         if (countCode >= 5000) {
             return R.fail(B0002, "今日优惠码申请已达到上限");
         }
-        if(String.valueOf(admin.getId()).equals("1")){
-            List<String> codes =new ArrayList<>();
+        if (String.valueOf(admin.getId()).equals("1")) {
+            List<String> codes = new ArrayList<>();
             if (addMode.equals("1")) {
-                for(int i=0;i<number;i++){
+                for (int i = 0; i < number; i++) {
                     StringBuilder num = new StringBuilder();
                     Random random = new Random();
                     for (int j = 0; j < 8; j++) {
@@ -376,15 +389,15 @@ public class TPromoCodeController {
                 codes.add(codeNum);
             }
             Long data = Calendar.getInstance().getTimeInMillis();
-            Float mm = month*10;
+            Float mm = month * 10;
             String m = String.valueOf(mm);
             String[] split = m.split("\\.");
             String th = split[0];
             Long t = Long.valueOf(th);
-            Long mon = 30L*24L*60L*60L*1000L;
-            Long d = data + ((mon*t)/10);
+            Long mon = 30L * 24L * 60L * 60L * 1000L;
+            Long d = data + ((mon * t) / 10);
             Date lastUseDate = new Date(Long.parseLong(String.valueOf(d)));
-            for(String code : codes){
+            for (String code : codes) {
                 TPromoCode promoCode = new TPromoCode();
                 promoCode.setCode(Long.parseLong(code));
                 promoCode.setAdminId(String.valueOf(admin.getId()));
@@ -396,26 +409,26 @@ public class TPromoCodeController {
                 promoCode.setType(type);
                 promoCodeService.save(promoCode);
             }
-            return R.ok(null,"生成成功");
+            return R.ok(null, "生成成功");
         }
         LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
-        query.eq(TEquipment::getAdminId,admin.getId());
+        query.eq(TEquipment::getAdminId, admin.getId());
         List<TEquipment> list = tEquipmentService.list(query);
         TEquipment equipment = list.get(0);
-        if(list.size() == 0){
+        if (list.size() == 0) {
             // "要有机器才能购买优惠码";
             return R.fail("没有机器");
         }
         //0折优惠码需要支付
-        if(type.equals("0")&&discount==0){
-            if(admin.getPromoCodeOpen() == null || admin.getPromoCodeOpen().equals("1")){
+        if (type.equals("0") && discount == 0) {
+            if (admin.getPromoCodeOpen() == null || admin.getPromoCodeOpen().equals("1")) {
                 Long equipmentId = equipment.getId();
                 Double money = null;
                 LambdaQueryWrapper<TPrice> query1 = Wrappers.lambdaQuery();
-                query1.eq(TPrice::getName,"优惠码");
+                query1.eq(TPrice::getName, "优惠码");
                 List<TPrice> prices = priceService.list(query1);
-                for(TPrice price:prices){
-                    if(price.getName().equals("优惠码")){
+                for (TPrice price : prices) {
+                    if (price.getName().equals("优惠码")) {
                         money = price.getPrice();
                     }
                 }
@@ -423,12 +436,12 @@ public class TPromoCodeController {
                 String sn = orderService.initSn(client6);
                 String orderNo = sn;
                 String productName = "优惠码";
-                BigDecimal price = BigDecimal.valueOf(money*number);
+                BigDecimal price = BigDecimal.valueOf(money * number);
                 BigDecimal cutPrice = price.multiply(new BigDecimal(100)).divide(new BigDecimal(100));
                 BigDecimal amount = cutPrice;
                 String productDesc = "";
                 String commonParameter = "";
-                if(addMode.equals("2") && StringUtils.isNotEmpty(codeNum)) {
+                if (addMode.equals("2") && StringUtils.isNotEmpty(codeNum)) {
                     commonParameter = codeNum;
                 }
                 String returnUrl = null;
@@ -488,27 +501,27 @@ public class TPromoCodeController {
 
         }
         Long client6 = Long.parseLong(equipment.getClientId().substring(equipment.getClientId().length() - 6));
-        List<String> codes =new ArrayList<>();
+        List<String> codes = new ArrayList<>();
         if (addMode.equals("1")) {
-            for(int i=0;i<number;i++){
+            for (int i = 0; i < number; i++) {
                 String code = orderService.initSn(client6);
                 StringBuffer str = new StringBuffer();
-                str.append(code.substring(0,6));
+                str.append(code.substring(0, 6));
                 codes.add(str.toString());
             }
         } else {
             codes.add(codeNum);
         }
         Long data = Calendar.getInstance().getTimeInMillis();
-        Float mm = month*10;
+        Float mm = month * 10;
         String m = String.valueOf(mm);
         String[] split = m.split("\\.");
         String th = split[0];
         Long t = Long.valueOf(th);
-        Long mon = 30L*24L*60L*60L*1000L;
-        Long d = data + ((mon*t)/10);
+        Long mon = 30L * 24L * 60L * 60L * 1000L;
+        Long d = data + ((mon * t) / 10);
         Date lastUseDate = new Date(Long.parseLong(String.valueOf(d)));
-        for(String code : codes){
+        for (String code : codes) {
             TPromoCode promoCode = new TPromoCode();
             promoCode.setCode(Long.parseLong(code));
             promoCode.setAdminId(String.valueOf(admin.getId()));
@@ -522,14 +535,15 @@ public class TPromoCodeController {
         }
         return R.ok("生成成功");
     }
+
     @ApiOperation(value = "获取优惠码列表")
     @GetMapping("/pagePromoCode")
-    public ResponseModel<IPage<?>> pagePromoCode(String adminId , String code, String isUse, Date useStratDate,Date useEndDate,Date createStratDate,Date createEndDate,  long current, long size ) {
+    public ResponseModel<IPage<?>> pagePromoCode(String adminId, String code, String isUse, Date useStratDate, Date useEndDate, Date createStratDate, Date createEndDate, long current, long size) {
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
-        if(StringUtils.isNotEmpty(adminId)){
+        if (StringUtils.isNotEmpty(adminId)) {
             TAdmin admin = adminService.getById(adminId);
-            if(admin.getType()!=0 && admin.getType()!=1){
-                query.eq(TPromoCode::getAdminId,adminId);
+            if (admin.getType() != 0 && admin.getType() != 1) {
+                query.eq(TPromoCode::getAdminId, adminId);
             }
             if (admin.getId() == 2738) {
                 LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
@@ -537,7 +551,7 @@ public class TPromoCodeController {
                         .eq(TAdmin::getCompanyType, "0");
                 List<Long> adminIds = adminService.list(adminQuery).stream()
                         .map(TAdmin::getId).collect(Collectors.toList());
-                query.in(TPromoCode::getAdminId,adminIds);
+                query.in(TPromoCode::getAdminId, adminIds);
             }
             // 七云平台管理员
             if (admin.getId() == 2739) {
@@ -545,44 +559,45 @@ public class TPromoCodeController {
                 adminQuery.eq(TAdmin::getCompanyType, "1");
                 List<Long> adminIds = adminService.list(adminQuery).stream()
                         .map(TAdmin::getId).collect(Collectors.toList());
-                query.in(TPromoCode::getAdminId,adminIds);
+                query.in(TPromoCode::getAdminId, adminIds);
             }
-        }else {
+        } else {
             return R.fail(A0001);
         }
-        if(StringUtils.isNotEmpty(code)){
-            query.eq(TPromoCode::getCode,code);
+        if (StringUtils.isNotEmpty(code)) {
+            query.eq(TPromoCode::getCode, code);
         }
-        if(StringUtils.isNotEmpty(isUse)){
-            query.like(TPromoCode::getIsUse,isUse);
+        if (StringUtils.isNotEmpty(isUse)) {
+            query.like(TPromoCode::getIsUse, isUse);
         }
-        if(useStratDate!=null&&useEndDate!=null){
-            query.gt(TPromoCode::getUseDate,useStratDate);
-            query.lt(TPromoCode::getUseDate,useEndDate);
+        if (useStratDate != null && useEndDate != null) {
+            query.gt(TPromoCode::getUseDate, useStratDate);
+            query.lt(TPromoCode::getUseDate, useEndDate);
         }
-        if(createStratDate!=null&&createEndDate!=null){
-            query.gt(TPromoCode::getCreateDate,createStratDate);
-            query.lt(TPromoCode::getCreateDate,createEndDate);
+        if (createStratDate != null && createEndDate != null) {
+            query.gt(TPromoCode::getCreateDate, createStratDate);
+            query.lt(TPromoCode::getCreateDate, createEndDate);
         }
         query.orderByDesc(TPromoCode::getCreateDate);
         Page<TPromoCode> page = new Page<>(current, size, true);
         IPage<TPromoCode> iPage = promoCodeService.page(page, query);
         return R.ok(iPage);
     }
+
     @ApiOperation(value = "导出优惠码列表")
     @GetMapping("/export")
-    public Object export(HttpServletResponse response, String adminId , String code, String isUse, Date useStratDate, Date useEndDate, Date createStratDate, Date createEndDate, long current, long size ) {
+    public Object export(HttpServletResponse response, String adminId, String code, String isUse, Date useStratDate, Date useEndDate, Date createStratDate, Date createEndDate, long current, long size) {
         LambdaQueryWrapper<TPromoCode> query = Wrappers.lambdaQuery();
         String ifForeign = "0";
         String head = "优惠码数据-";
-        if(StringUtils.isNotEmpty(adminId)){
+        if (StringUtils.isNotEmpty(adminId)) {
             TAdmin admin = adminService.getById(adminId);
-            if(StringUtils.isNotEmpty(admin.getIfForeign()) && admin.getIfForeign().equals("1")) {
+            if (StringUtils.isNotEmpty(admin.getIfForeign()) && admin.getIfForeign().equals("1")) {
                 ifForeign = admin.getIfForeign();
                 head = "PromoCode-";
             }
-            if(admin.getType()!=0 && admin.getType()!=1){
-                query.eq(TPromoCode::getAdminId,adminId);
+            if (admin.getType() != 0 && admin.getType() != 1) {
+                query.eq(TPromoCode::getAdminId, adminId);
             }
             // 申泽平台管理员
             if (admin.getId() == 2738) {
@@ -591,7 +606,7 @@ public class TPromoCodeController {
                         .eq(TAdmin::getCompanyType, "0");
                 List<Long> adminIds = adminService.list(adminQuery).stream()
                         .map(TAdmin::getId).collect(Collectors.toList());
-                query.in(TPromoCode::getAdminId,adminIds);
+                query.in(TPromoCode::getAdminId, adminIds);
             }
             // 七云平台管理员
             if (admin.getId() == 2739) {
@@ -599,31 +614,31 @@ public class TPromoCodeController {
                 adminQuery.eq(TAdmin::getCompanyType, "1");
                 List<Long> adminIds = adminService.list(adminQuery).stream()
                         .map(TAdmin::getId).collect(Collectors.toList());
-                query.in(TPromoCode::getAdminId,adminIds);
+                query.in(TPromoCode::getAdminId, adminIds);
             }
-        }else {
+        } else {
             return R.fail(A0001);
         }
-        if(StringUtils.isNotEmpty(code)){
-            query.eq(TPromoCode::getCode,code);
+        if (StringUtils.isNotEmpty(code)) {
+            query.eq(TPromoCode::getCode, code);
         }
-        if(StringUtils.isNotEmpty(isUse)){
-            query.like(TPromoCode::getIsUse,isUse);
+        if (StringUtils.isNotEmpty(isUse)) {
+            query.like(TPromoCode::getIsUse, isUse);
         }
-        if(useStratDate!=null&&useEndDate!=null){
-            query.gt(TPromoCode::getUseDate,useStratDate);
-            query.lt(TPromoCode::getUseDate,useEndDate);
+        if (useStratDate != null && useEndDate != null) {
+            query.gt(TPromoCode::getUseDate, useStratDate);
+            query.lt(TPromoCode::getUseDate, useEndDate);
         }
-        if(createStratDate!=null&&createEndDate!=null){
-            query.gt(TPromoCode::getCreateDate,createStratDate);
-            query.lt(TPromoCode::getCreateDate,createEndDate);
+        if (createStratDate != null && createEndDate != null) {
+            query.gt(TPromoCode::getCreateDate, createStratDate);
+            query.lt(TPromoCode::getCreateDate, createEndDate);
         }
 
         Page<TPromoCode> page = new Page<>(current, size, true);
         IPage<TPromoCode> iPage = promoCodeService.page(page, query);
         List<TPromoCode> list = iPage.getRecords();
         Workbook workbook = null;
-        if(ifForeign.equals("0")) {
+        if (ifForeign.equals("0")) {
             List<PromoCodeTarget> promoCodeTargets = promoCodeService.findById(list);
             ExportParams exportParams = new ExportParams("优惠码记录", "sheet1");
             workbook = ExcelExportUtil.exportExcel(exportParams, PromoCodeTarget.class, promoCodeTargets);
@@ -661,12 +676,12 @@ public class TPromoCodeController {
     @RequestMapping(value = "/getCodeDiscount", method = RequestMethod.GET)
     @ResponseBody
     public Object getCodeDiscount(String code) {
-        if(!StringUtils.isEmpty(code)){
+        if (!StringUtils.isEmpty(code)) {
             LambdaQueryWrapper<TPromoCode> wrapper = new LambdaQueryWrapper<>();
-            wrapper.in(TPromoCode::getCode,code);
-            wrapper.in(TPromoCode::getIsUse,"0");
+            wrapper.in(TPromoCode::getCode, code);
+            wrapper.in(TPromoCode::getIsUse, "0");
             TPromoCode promoCode = promoCodeService.getOne(wrapper);
-            if(promoCode == null) {
+            if (promoCode == null) {
                 return null;
             }
             Float discount = promoCode.getDiscount();
@@ -675,21 +690,21 @@ public class TPromoCodeController {
             kindData.put("type", type.equals("1") ? type : "0");
             kindData.put("discount", discount);
             return JsonMessage.success(kindData.toString());
-        }else{
+        } else {
             return null;
         }
     }
 
     @ApiOperation(value = "批量删除优惠码")
-    @PostMapping (value = "/deletes")
+    @PostMapping(value = "/deletes")
     @ResponseBody
     public ResponseModel<?> deletes(@RequestBody Long[] ids) {
-        if(ids==null){
+        if (ids == null) {
             return R.fail(ResponseCodesEnum.A0001);
         }
-        if(ids.length > 0){
+        if (ids.length > 0) {
             ArrayList<Long> idList = new ArrayList<>();
-            for(int i = 0;i < ids.length; i++){
+            for (int i = 0; i < ids.length; i++) {
                 idList.add(ids[i]);
             }
             promoCodeService.removeByIds(idList);

src/main/java/com/szwl/service/impl/TEquipmentDeletedServiceImpl.java

@@ -19,7 +19,7 @@ import javax.annotation.Resource;
  * @since 2023-03-31
  */
 @Service
-public class TEquipmentDeletedServiceImpl  extends ServiceImpl<TEquipmentDeletedMapper, TEquipmentDeleted> implements TEquipmentDeletedService {
+public class TEquipmentDeletedServiceImpl extends ServiceImpl<TEquipmentDeletedMapper, TEquipmentDeleted> implements TEquipmentDeletedService {
 
     @Resource
     private TEquipmentDeletedMapper tEquipmentDeletedMapper;