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

陶杰

2024-12-11 b1bef8fac3c0553f87b7047673123b23b68daa49

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

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

@@ -479,6 +479,13 @@
        if(flower == null){
            throw new ValidationException("商品未找到");
        }
        if (flower.getStatus().equals(Constants.FLOWER_STATUS.UP.name())) {
            throw new ValidationException("上架商品无法删除");
        }

        if (flower.getStatus().equals(Constants.FLOWER_STATUS.PENDING.name())) {
            throw new ValidationException("待审核商品无法删除");
        }

        flowerMapper.deleteById(id);


 src/main/resources/mapper/payment/OrderMapper.xml

@@ -15,6 +15,7 @@
    <select id="getOrderStatusCount" resultType="com.mzl.flower.dto.response.payment.OrderStatusCountDTO">
        SELECT q.status_backend value, count(1) orderCount
        FROM t_order q
        left join t_user u on q.create_by = u.id
        WHERE q.deleted = 0
        <if test="condition.orderNo != null and condition.orderNo != ''">
            AND q.order_no LIKE concat('%', #{condition.orderNo},'%')
@@ -64,9 +65,10 @@
            AND exists(
                select 1 from t_order_item oi
                where oi.order_id = q.id
                and oi.status = 'reduce'
                and (oi.status = 'reduce' or oi.status = 'abnormal')
            )
            and q.transfer_id is null
            and q.status in ('COLLECTION', 'SEND')
        </if>
        <if test="condition.billId != null and condition.billId != ''">
            AND q.bill_id = #{condition.billId}
@@ -78,6 +80,22 @@
                and oi.flower_name LIKE concat('%', #{condition.flowerName},'%')
            )
        </if>

        <if test="condition.warehouseLocationCode != null and condition.warehouseLocationCode != ''">
            AND q.warehouse_location_code LIKE concat('%', #{condition.warehouseLocationCode},'%')
        </if>
        <if test="condition.createName != null and condition.createName != ''">
            AND u.nick_name LIKE concat('%', #{condition.createName},'%')
        </if>
        <if test="condition.province != null and condition.province != ''">
            AND q.customer_province LIKE concat('%', #{condition.province},'%')
        </if>
        <if test="condition.city != null and condition.city != ''">
            AND q.customer_city LIKE concat('%', #{condition.city},'%')
        </if>
        <if test="condition.region != null and condition.region != ''">
            AND q.customer_region LIKE concat('%', #{condition.region},'%')
        </if>
        GROUP BY q.status_backend
    </select>