Merge remote-tracking branch 'origin/master-v2' into master-v2

cloudroam

2024-09-04 6424048caa1ceb3fe5ad31a68fb6eec69bbed6d2

Merge remote-tracking branch 'origin/master-v2' into master-v2

 src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpCgBatchSaveDTO.java

对比新文件
@@ -0,0 +1,34 @@
package com.mzl.flower.dto.request.flower;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
public class FlowerMarkupPsSpCgBatchSaveDTO {
    @ApiModelProperty(value = "合伙人id")
    private Long partnerId;

    @ApiModelProperty(value = "分类id列表")
    private List<Long> categoryId;

    @ApiModelProperty(value = "A级金额")
    private BigDecimal levelA;

    @ApiModelProperty(value = "B级金额")
    private BigDecimal levelB;

    @ApiModelProperty(value = "C级金额")
    private BigDecimal levelC;

    @ApiModelProperty(value = "D级金额")
    private BigDecimal levelD;

    @ApiModelProperty(value = "E级金额")
    private BigDecimal levelE;

    @ApiModelProperty(value = "O级金额")
    private BigDecimal levelO;
}

 src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateActivyVO.java

@@ -170,4 +170,10 @@
    @ApiModelProperty(value = "每人限领")
    private Integer getLimit;


    @ApiModelProperty(value = "发放时间")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
    @DateTimeFormat
    private LocalDateTime createTime;

}

 src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplatePointVO.java

@@ -1,12 +1,15 @@
package com.mzl.flower.dto.response.coupon;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.mzl.flower.base.AbstractTransDTO;
import com.mzl.flower.base.annotation.DictTrans;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDateTime;

@Data
@ApiModel("积分记录")
@@ -123,6 +126,10 @@
    @ApiModelProperty(value = "每人限领")
    private Integer getLimit;

    @ApiModelProperty(value = "发放时间")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
    @DateTimeFormat
    private LocalDateTime createTime;


}

 src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateUserVO.java

@@ -140,4 +140,9 @@
    @ApiModelProperty(value = "每人限领")
    private Integer getLimit;

    @ApiModelProperty(value = "发放时间")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
    @DateTimeFormat
    private LocalDateTime createTime;

}

 src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVO.java

@@ -242,4 +242,9 @@
    @ApiModelProperty(value = "会员等级对象")
    private Member member;

    @ApiModelProperty(value = "发放时间")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
    @DateTimeFormat
    private LocalDateTime createTime;

}

 src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVipVO.java

@@ -153,4 +153,10 @@
    @ApiModelProperty(value = "发放数量")
    private Integer couponAmount;

    @ApiModelProperty(value = "发放时间")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
    @DateTimeFormat
    private LocalDateTime createTime;


}

 src/main/java/com/mzl/flower/schedule/ScheduleService.java

@@ -66,7 +66,7 @@
    @Autowired
    private CouponRecordService couponRecordService;

    @Scheduled(cron = "1 0/20 * * * ?")
    @Scheduled(cron = "1 0/30 * * * ?")
    public void calculateAvePrice() {
        log.info("均价计算开始：" + DateFormatUtils.format(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
        List<FlowerCategory> cLs = categoryMapper.selectList(new QueryWrapper<FlowerCategory>()

 src/main/java/com/mzl/flower/service/flower/FlowerMarkupPsService.java

@@ -66,6 +66,21 @@
        markupCacheClient.deleteAllPsSpCg(id);
    }

    public void saveMarkupSpCgBatch(FlowerMarkupPsSpCgBatchSaveDTO dto){
        List<Long> categoryIds = dto.getCategoryId();
        if(categoryIds == null || categoryIds.size() == 0){
            throw new ValidationException("分类列表不能为空");
        }
        for(Long categoryId : categoryIds) {
            FlowerMarkupPsSpCgSaveDTO cg = new FlowerMarkupPsSpCgSaveDTO();
            BeanUtils.copyProperties(dto, cg);

            cg.setCategoryId(categoryId);

            saveMarkupSpCg(cg);
        }
    }

    public void saveMarkupSpCg(FlowerMarkupPsSpCgSaveDTO dto){
        Long cId = dto.getCategoryId();
        FlowerMarkupPsSpCg cg = spCgMapper.selectOne(new QueryWrapper<FlowerMarkupPsSpCg>()

 src/main/java/com/mzl/flower/web/flower/FlowerMarkupPsController.java

@@ -49,6 +49,13 @@
        return returnData(R.SUCCESS.getCode(), null);
    }

    @PostMapping("/spcg/list/save/batch")
    @ApiOperation(value = "批量新增商品分类加价")
    public ResponseEntity<ReturnDataDTO> saveMarkupSpCgBatch(@RequestBody FlowerMarkupPsSpCgBatchSaveDTO dto) {
        psService.saveMarkupSpCgBatch(dto);
        return returnData(R.SUCCESS.getCode(), null);
    }

    @PostMapping("/spcg/list/save")
    @ApiOperation(value = "新增商品分类加价")
    public ResponseEntity<ReturnDataDTO> saveMarkupSpCg(@RequestBody FlowerMarkupPsSpCgSaveDTO dto) {

 src/main/java/com/mzl/flower/web/member/MemberController.java

@@ -60,7 +60,7 @@

    @PostMapping(value = "/member/edit")
    @ApiOperation(value = "更新会员", httpMethod = "POST")
    public ResponseEntity update(@Validated @RequestBody MemberDTO memberDTO) {
    public ResponseEntity update(@RequestBody MemberDTO memberDTO) {
        memberService.updateMember(memberDTO);
        return returnData(R.SUCCESS.getCode(), null);
    }