更新情侣专区字段

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

@@ -53,7 +53,7 @@ public class LoversSetController {
     }
 
     @ApiOperation("修改套餐状态")
-    @PutMapping("update-status/{id}/status")
+    @PostMapping("update-status/{id}/status")
     public Result updateStatus(@PathVariable Long id,
                                @PathVariable @Pattern(regexp = "^[1-2]$", message = "状态格式只能为1-2") String status){
         loversSetService.updateStatus(id, status);
@@ -61,7 +61,7 @@ public class LoversSetController {
     }
 
     @ApiOperation("删除")
-    @DeleteMapping("delete")
+    @GetMapping("delete")
     public Result delete(@RequestBody List<Long> ids){
         loversSetService.deleteByIds(ids);
         return Result.success();

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

@@ -42,7 +42,7 @@ public class LoversSetRuleController {
         return Result.success();
     }
 
-    @PutMapping("update")
+    @PostMapping("update")
     @ApiOperation("修改情侣套餐规则")
     public Result update(@Valid @RequestBody LoversSetRuleDTO loversSetRule) {
         if (ObjectUtil.isNull(loversSetRule.getId())) {
@@ -53,7 +53,7 @@ public class LoversSetRuleController {
         return Result.success();
     }
 
-    @DeleteMapping("delete/{id}")
+    @GetMapping("delete/{id}")
     @ApiOperation("删除情侣套餐规则")
     public Result delete(@PathVariable String id) {
         loversSetRuleService.removeById(id);

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

@@ -12,6 +12,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("lovers_set")
@@ -64,14 +65,14 @@ public class LoversSet implements Serializable {
     private Integer subOrderGenerateTime;
 
     @ApiModelProperty("套餐开始时间")
-    private LocalDateTime startTime;
+    private Date startTime;
 
     @ApiModelProperty("套餐结束时间")
-    private LocalDateTime endTime;
+    private Date endTime;
 
     @ApiModelProperty("自定义时间段开始时间;type为4自定义时必填")
-    private LocalDateTime selfStartTime;
+    private Date selfStartTime;
 
     @ApiModelProperty("自定义时间段结束时间;type为4自定义时必填")
-    private LocalDateTime selfEndTime;
+    private Date selfEndTime;
 }

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

@@ -49,8 +49,8 @@ public class LoversSetMenstrualPeriodSetting implements Serializable {
     private Date nextEndDateOfExpect;
 
     @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty("更新时间")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 }

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

@@ -77,8 +77,8 @@ public class LoversSetOrderInfo implements Serializable {
     private String refundStatus;
 
     @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty("更新时间")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 }

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

@@ -11,6 +11,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 @TableName("lovers_set_rule")
@@ -36,8 +37,8 @@ public class LoversSetRule implements Serializable {
     private String content;
 
     @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty("更新时间")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 }

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

@@ -41,11 +41,13 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -136,7 +138,8 @@ public class LoversSetOrderInfoServiceImpl extends ServiceImpl<LoversSetOrderInf
 
         orderInfo.setPayStatus(Constant.YES);
         orderInfo.setActiveStatus(Constant.YES);
-        orderInfo.setUpdateTime(LocalDateTime.now());
+//        String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        orderInfo.setUpdateTime(new Date());
         updateById(orderInfo);
 
         // 新增并保存配送信息
@@ -264,8 +267,9 @@ public class LoversSetOrderInfoServiceImpl extends ServiceImpl<LoversSetOrderInf
         loversSetOrderInfo.setActiveStatus(Constant.NO);
         loversSetOrderInfo.setPayStatus(Constant.NO);
         loversSetOrderInfo.setRefundStatus(Constant.NO);
-        loversSetOrderInfo.setCreateTime(LocalDateTime.now());
-        loversSetOrderInfo.setUpdateTime(LocalDateTime.now());
+//        String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        loversSetOrderInfo.setCreateTime(new Date());
+        loversSetOrderInfo.setUpdateTime(new Date());
 
         this.save(loversSetOrderInfo);
 

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

@@ -17,6 +17,9 @@ import com.sqx.modules.lovers.service.LoversSetRuleService;
 import com.sqx.modules.lovers.vo.LoversSetRuleVO;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -24,21 +27,23 @@ import java.util.stream.Collectors;
 public class LoversSetRuleServiceImpl extends ServiceImpl<LoversSetRuleDao, LoversSetRule> implements LoversSetRuleService {
 
     @Override
-    public PageUtils page(LoversSetRuleQueryDTO queryDTO) {
+    public PageUtils
+    page(LoversSetRuleQueryDTO queryDTO) {
         Page<LoversSetRule> pages = new Page<>(queryDTO.getPage(), queryDTO.getLimit());
         LambdaQueryWrapper<LoversSetRule> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(StrUtil.isNotBlank(queryDTO.getName()), LoversSetRule::getName, queryDTO.getName());
+        queryWrapper.eq(StrUtil.isNotBlank(queryDTO.getName()), LoversSetRule::getName, queryDTO.getName())
+                .orderByAsc(LoversSetRule::getSort);
 
         IPage<LoversSetRule> page = this.page(pages, queryWrapper);
         PageUtils pageUtils = new PageUtils(page);
 
-        List<LoversSetRuleVO> vos = pageUtils.getList().stream().map(e -> {
-            LoversSetRuleVO vo = new LoversSetRuleVO();
-            BeanUtil.copyProperties(e, vo);
-            return vo;
-        }).collect(Collectors.toList());
+//        List<LoversSetRuleVO> vos = pageUtils.getList().stream().map(e -> {
+//            LoversSetRuleVO vo = new LoversSetRuleVO();
+//            BeanUtil.copyProperties(e, vo);
+//            return vo;
+//        }).collect(Collectors.toList());
 
-        pageUtils.setList(vos);
+//        pageUtils.setList(vos);
 
         return pageUtils;
     }
@@ -51,7 +56,9 @@ public class LoversSetRuleServiceImpl extends ServiceImpl<LoversSetRuleDao, Love
         LoversSetRule entity = new LoversSetRule();
         BeanUtil.copyProperties(loversSetRule, entity);
         entity.setDelFlag("0");
-
+//        String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        entity.setCreateTime(new Date());
+        entity.setUpdateTime(new Date());
         this.save(entity);
     }
 
@@ -61,6 +68,8 @@ public class LoversSetRuleServiceImpl extends ServiceImpl<LoversSetRuleDao, Love
 
         LoversSetRule entity = new LoversSetRule();
         BeanUtil.copyProperties(loversSetRule, entity);
+//        String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        entity.setUpdateTime(new Date());
         this.updateById(entity);
     }