Merge remote-tracking branch 'origin/lzl-情侣专区' into lzl-情侣专区

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

@@ -25,7 +25,7 @@ import java.util.List;
 @Slf4j
 @Api(tags = {"管理端-情侣套餐"})
 @RestController
-@RequestMapping("lover-set")
+@RequestMapping("admin/lover-set")
 @RequiredArgsConstructor
 public class LoversSetController {
 
@@ -39,14 +39,14 @@ public class LoversSetController {
     }
 
     @ApiOperation("新增")
-    @PostMapping
+    @PostMapping("add")
     public Result add(@RequestBody @Valid LoversSetAddDTO loversSetDTO){
         loversSetService.add(loversSetDTO);
         return Result.success();
     }
 
     @ApiOperation("修改")
-    @PutMapping
+    @PostMapping("update")
     public Result update(@RequestBody @Valid LoversSetAddDTO loversSetDTO){
         loversSetService.update(loversSetDTO);
         return Result.success();
@@ -61,7 +61,7 @@ public class LoversSetController {
     }
 
     @ApiOperation("删除")
-    @DeleteMapping
+    @DeleteMapping("delete")
     public Result delete(@RequestBody List<Long> ids){
         loversSetService.deleteByIds(ids);
         return Result.success();

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

@@ -5,6 +5,7 @@ import com.sqx.modules.lovers.service.LoversSetMenstrualPeriodSettingService;
 import com.sqx.modules.lovers.service.LoversSetRuleService;
 import com.sqx.modules.lovers.vo.PredictDateVo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,6 +24,7 @@ public class LoversSetMenstrualPeriodSettingController {
     @Autowired
     LoversSetMenstrualPeriodSettingService loversSetMenstrualPeriodSettingService;
 
+    @ApiOperation("获取下一次经期时间")
     @GetMapping("/getDate")
     public Result getDate(Integer durationDays,Integer intervalDays,String lastStartDate,String lastEndDate){
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");

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

@@ -28,7 +28,7 @@ import javax.validation.Valid;
  */
 @Api(tags = {"管理端-情侣套餐规则"})
 @RestController
-@RequestMapping("lovers-set-rule")
+@RequestMapping("admin/lovers-set-rule")
 @RequiredArgsConstructor
 public class LoversSetRuleController {
 
@@ -41,14 +41,14 @@ public class LoversSetRuleController {
         return Result.success().put("data", page);
     }
 
-    @PostMapping
+    @PostMapping("add")
     @ApiOperation("新增情侣套餐规则")
     public Result add(@Valid LoversSetRuleDTO loversSetRule) {
         loversSetRuleService.add(loversSetRule);
         return Result.success();
     }
 
-    @PutMapping
+    @PutMapping("update")
     @ApiOperation("修改情侣套餐规则")
     public Result update(@Valid LoversSetRuleDTO loversSetRule) {
         if (ObjectUtil.isNull(loversSetRule.getId())) {

src/main/java/com/sqx/modules/lovers/controller/app/AppLoversSetOrderController.java

@@ -43,7 +43,7 @@ public class AppLoversSetOrderController {
 
     @Login
     @ApiOperation("创建订单")
-    @GetMapping
+    @GetMapping("createOrder")
     public Result createOrder(@RequestAttribute Long userId, @Valid LoversSetOrderSubmitDTO submitDTO){
         Long orderId = loversSetOrderInfoService.createOrder(userId, submitDTO);
         return Result.success().put("data", orderId);

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

@@ -11,4 +11,5 @@ public interface LoversSetMenstrualPeriodSettingService extends IService<LoversS
      * @param menstrualPeriodSettingDTO 情侣套餐经期信息
      */
     void add(LoversSetMenstrualPeriodSettingDTO menstrualPeriodSettingDTO);
+
 }

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

@@ -7,16 +7,23 @@ import com.sqx.modules.lovers.dto.LoversSetMenstrualPeriodSettingDTO;
 import com.sqx.modules.lovers.entity.LoversSetMenstrualPeriodSetting;
 import com.sqx.modules.lovers.service.LoversSetMenstrualPeriodSettingService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class LoversSetMenstrualPeriodSettingServiceImpl extends ServiceImpl<LoversSetMenstrualPeriodSettingDao,LoversSetMenstrualPeriodSetting> implements LoversSetMenstrualPeriodSettingService {
 
+
+
+    @Autowired
+    LoversSetMenstrualPeriodSettingDao loversSetMenstrualPeriodSettingDao;
+
     @Override
     public void add(LoversSetMenstrualPeriodSettingDTO menstrualPeriodSettingDTO) {
         LoversSetMenstrualPeriodSetting menstrualPeriodSetting = new LoversSetMenstrualPeriodSetting();
         BeanUtil.copyProperties(menstrualPeriodSettingDTO, menstrualPeriodSetting);
         save(menstrualPeriodSetting);
     }
+
 }