代码提交

无关风月

2024-08-23 84c4034c32703ab573b5d01af01cf9226f812ba7

代码提交

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

@@ -64,8 +64,12 @@
    @ApiModelProperty(value = "上架状态（0=否，1=是）")
    @TableField("status")
    private Integer status;


    @ApiModelProperty(value = "小程序id")
    @TableField("applet_id")
    private String appletId;
    @ApiModelProperty(value = "小程序名称")
    @TableField("applet_name")
    private String appletName;

    @ApiModelProperty(value = "广告状态 1未开始 2已开始 3已结束")
    @TableField(exist = false)

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java

@@ -93,6 +93,7 @@
            case 1:
                for (int i = 0; i < split.length-1; i++) {
                    Integer reduce = tShoppingOrderService.list(new QueryWrapper<TShoppingOrder>()
                                    .eq("order_type",1)
                                    .eq("goods_id", split[i])
                                    .eq("payment_status", 2)
                                    .ne("refund_status", 2))
@@ -103,6 +104,8 @@
            case 2:
                for (int i = 0; i < split.length-1; i++) {
                    Integer reduce = exchangeOrderService.list(new QueryWrapper<TExchangeOrder>()
                                            .eq("order_type",1)
                                    .ne("status",4)
                                    .eq("goods_id", split[i])
                                    )
                            .stream().map(TExchangeOrder::getPurchaseQuantity).reduce(0, Integer::sum);

 ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TAdvertisingMapper.xml

@@ -15,6 +15,8 @@
        <result column="status" property="status" />
        <result column="create_time" property="createTime" />
        <result column="del_flag" property="delFlag" />
        <result column="applet_id" property="appletId" />
        <result column="applet_name" property="appletName" />
    </resultMap>

    <!-- 通用查询结果列 -->