代码提交

无关风月

2024-08-22 64cc1da1fe255982c63ba28d3eecf65d4b45822b

代码提交

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java

@@ -118,7 +118,7 @@
    @TableField("app_coupon_id")
    private Long appCouponId;

    @ApiModelProperty(value = "优惠金额")
    @ApiModelProperty(value = "优惠券抵扣金额")
    @TableField("coupon_discount_amount")
    private BigDecimal couponDiscountAmount;

@@ -130,7 +130,7 @@
    @TableField("vip_discount_amount")
    private BigDecimal vipDiscountAmount;

    @ApiModelProperty(value = "支付金额")
    @ApiModelProperty(value = "支付金额（实付）")
    @TableField("payment_amount")
    private BigDecimal paymentAmount;


 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java

@@ -1,6 +1,7 @@
package com.ruoyi.order.api.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TOrderEvaluate;
import io.swagger.annotations.ApiModel;
@@ -8,15 +9,12 @@
import lombok.Data;

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

@Data
@ApiModel(value = "SiteDetailEvaluateVO对象",description = "站点详情订单评价")
public class ChargingOrderVO extends TChargingOrder {
    @ApiModelProperty(value = "订单id")
    private Long id;
    @ApiModelProperty(value = "用户id")
    private Long userId;
    @ApiModelProperty(value = "站点名称")
    private String siteName;
    @ApiModelProperty(value = "充电终端名称 桩+枪")
@@ -41,4 +39,5 @@
    private Integer count;
    @ApiModelProperty(value = "1明星充电 2快电 3新电途")
    private Integer orderSource;

}

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TActivityVO.java

@@ -23,5 +23,4 @@
    private BigDecimal vipActivity;
    @ApiModelProperty(value = "赠送会员")
    private BigDecimal grantVip;

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java

@@ -46,6 +46,6 @@
    List<TChargingOrder> getNoInvoicedOrder(@Param("appUserId") Long appUserId, @Param("month") String month,
                                            @Param("pageCurr") Integer pageCurr, @Param("pageSize") Integer pageSize);

    List<ChargingOrderVO> chargingOrder(@Param("pageInfo") PageInfo<ChargingOrderVO> pageInfo, ChargingOrderQuery dto, String startTime1, String startTime2, String endTime1, String endTime11);
    List<ChargingOrderVO> chargingOrder(@Param("pageInfo") PageInfo<ChargingOrderVO> pageInfo, @Param("req") ChargingOrderQuery dto, @Param("startTime1")String startTime1, @Param("startTime2")String startTime2,@Param("endTime1") String endTime1,@Param("endTime2") String endTime11);

}

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -55,9 +55,6 @@
            limit #{pageCurr}, #{pageSize}
        </if>
    </select>
    
    
    
    <select id="getNoInvoicedOrder" resultMap="BaseResultMap">
        select * from t_charging_order where del_flag = 0 and app_user_id = #{appUserId}
        <if test="null != month and '' != month">
@@ -69,4 +66,10 @@
            limit #{pageCurr}, #{pageSize}
        </if>
    </select>

    <select id="chargingOrder" resultType="com.ruoyi.order.api.vo.ChargingOrderVO">
        select t1.*
        from t_charging_order t1

    </select>
</mapper>

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TShoppingOrderMapper.xml

@@ -57,7 +57,7 @@
            <if test="null != req.code and req.code!=''">
                and t1.code  LIKE CONCAT('%',#{req.code},'%')
            </if>
            <if test="req.type != null and req.type != '' and req.type == 1">
            <if test="req.type != null and ·req.type != '' and req.type == 1">
                and t1.coupon_discount_amount  != null and t1.coupon_discount_amount  != 0
            </if>
            <if test="req.type != null and req.type != '' and req.type == 2">