更新

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

@@ -0,0 +1,27 @@
+package com.sqx.modules.lovers.controller;
+
+import com.sqx.common.utils.Result;
+import com.sqx.modules.lovers.entity.LoversSet;
+import com.sqx.modules.lovers.service.LoversSetService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@Api(tags = {"管理端-情侣套餐"})
+@RestController
+@RequestMapping("/admin/loverSet")
+public class LoversSetController {
+
+    @Autowired
+    LoversSetService loversSetService;
+
+    @PostMapping("/save")
+    public Result saveLoverSet(@RequestBody LoversSet loversSet){
+        return loversSetService.saveLoverSet(loversSet);
+    }
+
+
+
+}

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

@@ -0,0 +1,42 @@
+package com.sqx.modules.lovers.controller;
+
+import com.sqx.common.utils.Result;
+import com.sqx.modules.lovers.entity.LoversSet;
+import com.sqx.modules.lovers.entity.LoversSetRule;
+import com.sqx.modules.lovers.service.LoversSetRuleService;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+@Slf4j
+@Api(tags = {"管理端-情侣套餐规则"})
+@RestController
+@RequestMapping("/admin/loverSetRule")
+public class LoversSetRuleController {
+
+    @Autowired
+    LoversSetRuleService loversSetRuleService;
+
+    @PostMapping("/saveLoverSetRule")
+    public Result saveLoverSetRule(@RequestBody LoversSetRule loversSetRule){
+        return loversSetRuleService.saveLoverSetRule(loversSetRule);
+    }
+
+    @GetMapping("/list")
+    public Result pageLoverSetRule(Integer page, Integer limit, String name){
+        return loversSetRuleService.pageLoverSetRule(page,limit,name);
+    }
+
+    @PostMapping("/update")
+    public Result updateLoverSetRule(@RequestBody LoversSetRule loversSetRule){
+        return loversSetRuleService.updateLoverSetRule(loversSetRule);
+    }
+
+    @GetMapping("/delete")
+    public Result deleteLoverSetRule(Integer id){
+        return loversSetRuleService.deleteLoverSetRule(id);
+    }
+}

src/main/java/com/sqx/modules/lovers/entity/LoversSet.java

@@ -1,7 +1,6 @@
 package com.sqx.modules.lovers.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,6 +18,8 @@ public class LoversSet implements Serializable {
     private Long id;
 
     @ApiModelProperty("删除标识;0未删除、1已删除")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic(value="0",delval="1")
     private String delFlag;
 
     @ApiModelProperty("套餐名称")

src/main/java/com/sqx/modules/lovers/entity/LoversSetContent.java

@@ -1,7 +1,6 @@
 package com.sqx.modules.lovers.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,6 +17,8 @@ public class LoversSetContent implements Serializable {
     private Long id;
 
     @ApiModelProperty("删除标识;0未删除、1已删除")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic(value="0",delval="1")
     private String delFlag;
 
     @ApiModelProperty("套餐id")

src/main/java/com/sqx/modules/lovers/entity/LoversSetContentDetail.java

@@ -1,7 +1,6 @@
 package com.sqx.modules.lovers.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,6 +18,8 @@ public class LoversSetContentDetail implements Serializable {
     private Long id;
 
     @ApiModelProperty("删除标识;0未删除、1已删除")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic(value="0",delval="1")
     private String delFlag;
 
     @ApiModelProperty("情侣套餐内容id")

src/main/java/com/sqx/modules/lovers/entity/LoversSetMenstrualPeriodSetting.java

@@ -1,7 +1,6 @@
 package com.sqx.modules.lovers.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,6 +18,8 @@ public class LoversSetMenstrualPeriodSetting implements Serializable {
     private Long id;
 
     @ApiModelProperty("删除标识;0未删除、1已删除")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic(value="0",delval="1")
     private String delFlag;
 
     @ApiModelProperty("用户id")

src/main/java/com/sqx/modules/lovers/entity/LoversSetOrderInfo.java

@@ -1,7 +1,6 @@
 package com.sqx.modules.lovers.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,6 +18,8 @@ public class LoversSetOrderInfo implements Serializable {
     private Long id;
 
     @ApiModelProperty("删除标识;0未删除、1已删除")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic(value="0",delval="1")
     private String delFlag;
 
     @ApiModelProperty("订单编号")

src/main/java/com/sqx/modules/lovers/entity/LoversSetRule.java

@@ -1,7 +1,6 @@
 package com.sqx.modules.lovers.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,6 +17,8 @@ public class LoversSetRule implements Serializable {
     private Long id;
 
     @ApiModelProperty("删除标识;0未删除、1已删除")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic(value="0",delval="1")
     private String delFlag;
 
     @ApiModelProperty("规则名称")
@@ -28,4 +29,7 @@ public class LoversSetRule implements Serializable {
 
     @ApiModelProperty("规则内容")
     private String content;
+
+    @ApiModelProperty("下单时间")
+    private String createTime;
 }

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

@@ -1,7 +1,15 @@
 package com.sqx.modules.lovers.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.common.utils.Result;
 import com.sqx.modules.lovers.entity.LoversSetRule;
 
 public interface LoversSetRuleService extends IService<LoversSetRule> {
+    Result saveLoverSetRule(LoversSetRule loversSetRule);
+
+    Result pageLoverSetRule(Integer page, Integer limit, String name);
+
+    Result updateLoverSetRule(LoversSetRule loversSetRule);
+
+    Result deleteLoverSetRule(Integer id);
 }

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

@@ -1,7 +1,9 @@
 package com.sqx.modules.lovers.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.sqx.common.utils.Result;
 import com.sqx.modules.lovers.entity.LoversSet;
 
 public interface LoversSetService extends IService<LoversSet> {
+    Result saveLoverSet(LoversSet loversSet);
 }

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

@@ -1,11 +1,69 @@
 package com.sqx.modules.lovers.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+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.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.common.utils.PageUtils;
+import com.sqx.common.utils.Result;
 import com.sqx.modules.lovers.dao.LoversSetRuleDao;
 import com.sqx.modules.lovers.entity.LoversSetRule;
 import com.sqx.modules.lovers.service.LoversSetRuleService;
+import com.sqx.modules.order.entity.OrderGoods;
+import com.sqx.modules.order.entity.TbOrder;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class LoversSetRuleServiceImpl extends ServiceImpl<LoversSetRuleDao, LoversSetRule> implements LoversSetRuleService {
+
+    @Autowired
+    LoversSetRuleDao loversSetRuleDao;
+
+    @Override
+    public Result saveLoverSetRule(LoversSetRule loversSetRule) {
+        int insert = loversSetRuleDao.insert(loversSetRule);
+        return Result.success();
+    }
+
+    @Override
+    public Result pageLoverSetRule(Integer page, Integer limit, String name) {
+        Page<LoversSetRule> pages = new Page<>(page, limit);
+        LambdaQueryWrapper<LoversSetRule> wrapper=new LambdaQueryWrapper<>();
+        wrapper.like(ObjectUtils.isNotEmpty(name),LoversSetRule::getName,name);
+        wrapper.eq(LoversSetRule::getDelFlag,0);
+        wrapper.orderByAsc(LoversSetRule::getSort);
+        IPage<LoversSetRule> loversSetRuleIPage = loversSetRuleDao.selectPage(pages,wrapper);
+        PageUtils pageUtils = new PageUtils(loversSetRuleIPage);
+        return Result.success().put("data", pageUtils);
+    }
+
+    @Override
+    public Result updateLoverSetRule(LoversSetRule loversSetRule) {
+        String name = loversSetRule.getName();
+//        判定该名称是否已存在
+        LambdaQueryWrapper<LoversSetRule> warpper=new LambdaQueryWrapper<>();
+        warpper.eq(LoversSetRule::getName,name)
+                        .eq(LoversSetRule::getDelFlag,0);
+        LoversSetRule old = loversSetRuleDao.selectOne(warpper);
+        if (ObjectUtils.isNotEmpty(old)) {
+            if (!old.getId().equals(loversSetRule.getId())) {
+                return Result.error("该规则名称已存在");
+            }
+        }
+        loversSetRuleDao.updateById(loversSetRule);
+        return Result.success();
+    }
+
+    @Override
+    public Result deleteLoverSetRule(Integer id) {
+        loversSetRuleDao.deleteById(id);
+        return Result.success();
+    }
 }

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

@@ -1,11 +1,21 @@
 package com.sqx.modules.lovers.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sqx.common.utils.Result;
 import com.sqx.modules.lovers.dao.LoversSetDao;
 import com.sqx.modules.lovers.entity.LoversSet;
 import com.sqx.modules.lovers.service.LoversSetService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 public class LoversSetServiceImpl extends ServiceImpl<LoversSetDao, LoversSet> implements LoversSetService {
+    @Autowired
+    LoversSetDao loversSetDao;
+
+    @Override
+    public Result saveLoverSet(LoversSet loversSet) {
+
+        return null;
+    }
 }