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

gongzuming

2024-09-20 35309b932b738d5a8537e53207d28004a8da0f89

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

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

@@ -36,4 +36,7 @@

    @ApiModelProperty(hidden = true)
    private List<String> statusList;

    @ApiModelProperty(value = "是否限购")
    private Boolean isLimited;
}

 src/main/java/com/mzl/flower/dto/request/partner/ChangePartnerAreaDTO.java

@@ -20,4 +20,8 @@

    @ApiModelProperty("服务区域-区")
    private String region;

    private String name;

    private String contactTel;
}

 src/main/java/com/mzl/flower/dto/response/point/CustomerPointDetailDTO.java

@@ -10,6 +10,8 @@
@Data
public class CustomerPointDetailDTO extends AbstractTransDTO {

    private Long id;

    @ApiModelProperty("记录日期")
    private LocalDate recordDate;


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

@@ -247,7 +247,17 @@
    public Long editFlowerAdmin(FlowerUpdateAdminDTO dto){
        Flower g = flowerMapper.selectById(dto.getId());
        g.setSales(dto.getSales());
        g.setLimited(dto.getLimited());
        if (!org.springframework.util.StringUtils.isEmpty(dto.getLimited())) {
            if (g.getStock() == 0 || org.springframework.util.StringUtils.isEmpty(g.getStock())) {
                throw new ValidationException("库存为0或者空时不能修改限购数量");
            }
            if(g.getStock()<dto.getLimited()){
                throw new ValidationException("限购数量不能大于库存");
            }
            g.setLimited(dto.getLimited());
        }else{
            g.setLimited(null);
        }
        g.update(SecurityUtils.getUserId());
        flowerMapper.updateById(g);

@@ -884,7 +894,17 @@
        }
        for (Long id : ids) {
            Flower f = flowerMapper.selectById(id);
            f.setLimited(dto.getLimited());
            if (!org.springframework.util.StringUtils.isEmpty(dto.getLimited())) {
                if (f.getStock() == 0 || org.springframework.util.StringUtils.isEmpty(f.getStock())) {
                    throw new ValidationException("商品" + f.getName() + "库存为0或者空时不能修改限购数量");
                }
                if(f.getStock()<dto.getLimited()){
                    throw new ValidationException("商品" + f.getName() + "限购数量不能大于库存");
                }
                f.setLimited(dto.getLimited());
            }else{
                f.setLimited(null);
            }
            flowerMapper.updateById(f);
        }
    }

 src/main/java/com/mzl/flower/service/partner/PartnerService.java

@@ -135,6 +135,12 @@
        partner.setProvince(dto.getProvince());
        partner.setCity(dto.getCity());
        partner.setRegion(dto.getRegion());
        if(StringUtils.isNotBlank(dto.getName())){
            partner.setName(dto.getName());
        }
        if(StringUtils.isNotBlank(dto.getContactTel())){
            partner.setContactTel(dto.getContactTel());
        }
        partner.update(SecurityUtils.getUserId());
        partnerMapper.updateById(partner);
    }

 src/main/resources/mapper/flower/FlowerMapper.xml

@@ -45,6 +45,12 @@
        <if test="condition.recommend != null and !condition.recommend">
            AND (f.recommend = 0 or f.recommend is null)
        </if>
        <if test="condition.isLimited != null and condition.isLimited">
            AND f.limited > 0
        </if>
        <if test="condition.isLimited != null and !condition.isLimited">
            AND (f.limited = 0 or f.limited is null)
        </if>
        <if test="condition.statusList != null and condition.statusList.size > 0">
            and f.status in
            <foreach collection="condition.statusList" item="item" open="(" separator="," close=")">

 src/main/resources/mapper/point/CustomerPointMapper.xml

@@ -45,7 +45,7 @@
               AND t.record_date <= #{dto.recordDateEnd}
            ]]>
        </if>
        <if test="dto.type!=null and dto.type != null">
        <if test="dto.type!=null and dto.type != ''">
            and t.type = #{dto.type}
        </if>
        <if test="dto.remarks!=null and dto.remarks != null">