1

phpcjl

2024-12-16 128f0f373e7cf42dc0e5b7b43f2ac358234be85a

1

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/CouponInfo.java

@@ -11,6 +11,7 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;

/**
 * <p>
@@ -126,13 +127,20 @@
    @TableField("shelf_status")
    private Integer shelfStatus;

    @ApiModelProperty(value = "指定会员等级,逗号隔开")
    private String vipIds;

    @ApiModelProperty(value = "已发放数量")
    @TableField(exist = false)
    private Long sendNumNow;

    @ApiModelProperty(value = "指定会员等级,逗号隔开")
    private String vipIds;
    @ApiModelProperty(value = "其他商品名称")
    private String goodsNames;


    @ApiModelProperty(value = "其他商品名称")
    @TableField(exist = false)
    private List<String> goodsNameList;
    public String getIdStr() {
        return String.valueOf(id);
    }

 ruoyi-service/ruoyi-account/src/main/resources/mapper/account/UserPointMapper.xml

@@ -50,15 +50,20 @@
                     ROW_NUMBER() OVER (PARTITION BY type ORDER BY create_time DESC) AS rn
                 FROM
                     t_user_point
             ) AS subquery
                 <where>
                         <if test="startTime != null and endTime != null">
                             create_time BETWEEN #{startTime} AND #{endTime}
                         </if>
                         <if test="type != null">
                             AND type = #{type}
                         </if>
                         <if test="userIds != null and userIds.size !=0">
                             AND app_user_id = #{appUserId}
                         </if>
                 </where>
        ) AS subquery
        WHERE
            rn = 1
        <if test="type != null">
            AND type = #{type}
        </if>
        <if test="appUserId != null">
            AND app_user_id = #{appUserId}
        </if>
    </select>

</mapper>