Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-07 2749626492862339a50789933bb110f691426225

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java
#	ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TApplyChargingPile.java

New file
@@ -0,0 +1,129 @@
package com.ruoyi.chargingPile.api.model;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_apply_charging_pile")
@ApiModel(value="TApplyChargingPile对象", description="")
public class TApplyChargingPile extends BasePojo {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Long appUserId;

    @ApiModelProperty(value = "用电地址")
    @TableField("address")
    private String address;

    @ApiModelProperty(value = "申请容量")
    @TableField("capacity")
    private BigDecimal capacity;

    @ApiModelProperty(value = "用电时间")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @TableField("consumption_time")
    private LocalDate consumptionTime;

    @ApiModelProperty(value = "户主经办（0=关，1=开）")
    @TableField("landlord_handling")
    private Integer landlordHandling;

    @ApiModelProperty(value = "户名")
    @TableField("landlord_name")
    private String landlordName;

    @ApiModelProperty(value = "户主身份证号码")
    @TableField("landlord_id_card")
    private String landlordIdCard;

    @ApiModelProperty(value = "户主手机号")
    @TableField("landlord_phone")
    private String landlordPhone;

    @ApiModelProperty(value = "户主身份证正面")
    @TableField("landlord_front_id_card")
    private String landlordFrontIdCard;

    @ApiModelProperty(value = "户主身份证反面")
    @TableField("landlord_back_id_card")
    private String landlordBackIdCard;

    @ApiModelProperty(value = "产权证明")
    @TableField("title_certificate")
    private String titleCertificate;

    @ApiModelProperty(value = "营业执照")
    @TableField("business_license")
    private String businessLicense;

    @ApiModelProperty(value = "充电桩用户（0=关，1=开）")
    @TableField("charging_pile_user")
    private Integer chargingPileUser;

    @ApiModelProperty(value = "固定车位产权")
    @TableField("fixed_parking_property_rights")
    private String fixedParkingPropertyRights;

    @ApiModelProperty(value = "施工证明")
    @TableField("construction_certificate")
    private String constructionCertificate;

    @ApiModelProperty(value = "经办人姓名")
    @TableField("agent_name")
    private String agentName;

    @ApiModelProperty(value = "经办人身份证号")
    @TableField("agent_id_card")
    private String agentIdCard;

    @ApiModelProperty(value = "经办人手机号")
    @TableField("agent_phone")
    private String agentPhone;

    @ApiModelProperty(value = "经办人身份证正面")
    @TableField("agent_front_id_card")
    private String agentFrontIdCard;

    @ApiModelProperty(value = "经办人身份证背面")
    @TableField("agent_back_id_card")
    private String agentBackIdCard;

    @ApiModelProperty(value = "是否有充电桩（0=否，1=是）")
    @TableField("charging_pile")
    private Integer chargingPile;

    @ApiModelProperty(value = "补充资料")
    @TableField("further_information")
    private String furtherInformation;

    @ApiModelProperty(value = "备注")
    @TableField("remark")
    private String remark;

}

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TChargingPile.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -72,6 +73,7 @@
    private String equipmentType;

    @ApiModelProperty(value = "生产日期")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @TableField("production_date")
    private LocalDate productionDate;


 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java

New file
@@ -0,0 +1,27 @@
package com.ruoyi.order.api.factory;

import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;

/**
 * 充电订单服务降级处理
 * 
 * @author ruoyi
 */
@Component
public class OrderFallbackFactory implements FallbackFactory<ChargingOrderClient>
{
    private static final Logger log = LoggerFactory.getLogger(OrderFallbackFactory.class);


    @Override
    public ChargingOrderClient create(Throwable cause) {
        log.error("商品订单调用失败:{}", cause.getMessage());
        return new ChargingOrderClient() {

        };
    }
}

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java

New file
@@ -0,0 +1,21 @@
package com.ruoyi.order.api.feignClient;

import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
import com.ruoyi.order.api.factory.OrderFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;

import java.util.List;

/**
 * 后台订单服务
 * @author ruoyi
 */
@FeignClient(contextId = "OrderClient", value = ServiceNameConstants.CONTRACT_ORDER, fallbackFactory = OrderFallbackFactory.class)
public interface OrderClient {

    @PostMapping("/t-exchange-order/getSalesCountByGoodsIds")
    R<List<Integer>> getSalesCountByGoodsId(String goodsIds);
}

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

New file
@@ -0,0 +1,142 @@
package com.ruoyi.order.api.model;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_charging_order")
@ApiModel(value="TChargingOrder对象", description="")
public class TChargingOrder extends BasePojo {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.NONE)
    private Long id;

    @ApiModelProperty(value = "订单编号")
    @TableField("code")
    private String code;

    @ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
    @TableField("order_type")
    private Integer orderType;

    @ApiModelProperty(value = "订单分类（1=线上，2=线下）")
    @TableField("order_classification")
    private Integer orderClassification;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Long appUserId;

    @ApiModelProperty(value = "充电车辆 id")
    @TableField("app_user_car_id")
    private Integer appUserCarId;

    @ApiModelProperty(value = "停车场id")
    @TableField("parking_lot_id")
    private Integer parkingLotId;

    @ApiModelProperty(value = "充电桩id")
    @TableField("charging_pile_id")
    private Integer chargingPileId;

    @ApiModelProperty(value = "充电枪id")
    @TableField("charging_gun_id")
    private Integer chargingGunId;

    @ApiModelProperty(value = "充电开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("start_time")
    private LocalDateTime startTime;

    @ApiModelProperty(value = "充电结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("end_time")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "状态（0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）")
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "充值金额")
    @TableField("recharge_amount")
    private BigDecimal rechargeAmount;

    @ApiModelProperty(value = "充值支付方式（1=微信，2=支付宝）")
    @TableField("recharge_payment_type")
    private Integer rechargePaymentType;

    @ApiModelProperty(value = "充值支付状态（1=待支付，2=已支付）")
    @TableField("recharge_payment_status")
    private Integer rechargePaymentStatus;

    @ApiModelProperty(value = "充值支付第三方流水号")
    @TableField("recharge_serial_number")
    private String rechargeSerialNumber;

    @ApiModelProperty(value = "订单金额")
    @TableField("order_amount")
    private BigDecimal orderAmount;

    @ApiModelProperty(value = "优惠券id")
    @TableField("app_coupon_id")
    private Long appCouponId;

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

    @ApiModelProperty(value = "会员折扣")
    @TableField("vip_discount")
    private BigDecimal vipDiscount;

    @ApiModelProperty(value = "会员优惠金额")
    @TableField("vip_discount_amount")
    private BigDecimal vipDiscountAmount;

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

    @ApiModelProperty(value = "退款流水号")
    @TableField("refund_code")
    private String refundCode;

    @ApiModelProperty(value = "退款金额")
    @TableField("refund_amount")
    private BigDecimal refundAmount;

    @ApiModelProperty(value = "退款状态（1=退款中，2=退款成功）")
    @TableField("refund_status")
    private Integer refundStatus;

    @ApiModelProperty(value = "退款第三方流水号")
    @TableField("refund_serial_number")
    private String refundSerialNumber;

    @ApiModelProperty(value = "退款成功时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("refund_time")
    private LocalDateTime refundTime;

}

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

New file
@@ -0,0 +1,68 @@
package com.ruoyi.order.api.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * <p>
 * 
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_charging_order_accounting_strategy")
@ApiModel(value="TChargingOrderAccountingStrategy对象", description="")
public class TChargingOrderAccountingStrategy implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.NONE)
    private Long id;

    @ApiModelProperty(value = "充电订单id")
    @TableField("charging_order_id")
    private Long chargingOrderId;

    @ApiModelProperty(value = "阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）")
    @TableField("type")
    private Integer type;

    @ApiModelProperty(value = "开始时间")
    @TableField("start_time")
    private String startTime;

    @ApiModelProperty(value = "结束时间")
    @TableField("end_time")
    private String endTime;

    @ApiModelProperty(value = "电价")
    @TableField("electrovalence")
    private BigDecimal electrovalence;

    @ApiModelProperty(value = "服务费")
    @TableField("service_charge")
    private BigDecimal serviceCharge;

    @ApiModelProperty(value = "原价服务费")
    @TableField("cost_service_charge")
    private BigDecimal costServiceCharge;

    @ApiModelProperty(value = "充电度数")
    @TableField("charging_capacity")
    private BigDecimal chargingCapacity;


}

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

New file
@@ -0,0 +1,105 @@
package com.ruoyi.order.api.model;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_exchange_order")
@ApiModel(value="TExchangeOrder对象", description="")
public class TExchangeOrder  extends BasePojo {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.NONE)
    private Long id;

    @ApiModelProperty(value = "订单编号")
    @TableField("code")
    private String code;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Long appUserId;

    @ApiModelProperty(value = "订单类型（1=商品，2=优惠券）")
    @TableField("order_type")
    private Integer orderType;

    @ApiModelProperty(value = "商品id")
    @TableField("goods_id")
    private Integer goodsId;

    @ApiModelProperty(value = "优惠券id")
    @TableField("coupon_id")
    private Integer couponId;

    @ApiModelProperty(value = "购买数量")
    @TableField("purchase_quantity")
    private Integer purchaseQuantity;

    @ApiModelProperty(value = "用户收货地址id")
    @TableField("app_user_address_id")
    private Long appUserAddressId;

    @ApiModelProperty(value = "支付积分")
    @TableField("points")
    private Integer points;

    @ApiModelProperty(value = "备注")
    @TableField("remark")
    private String remark;

    @ApiModelProperty(value = "状态（1=待发货，2=待收货，3=已完成，4=已取消）")
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "快递公司")
    @TableField("express_company")
    private String expressCompany;

    @ApiModelProperty(value = "快递号")
    @TableField("express_number")
    private String expressNumber;

    @ApiModelProperty(value = "发货人id")
    @TableField("consigner_id")
    private Integer consignerId;

    @ApiModelProperty(value = "发货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("consigner_time")
    private LocalDateTime consignerTime;

    @ApiModelProperty(value = "收货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("receiving_time")
    private LocalDateTime receivingTime;

    @ApiModelProperty(value = "取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("cancellation_time")
    private LocalDateTime cancellationTime;

    @ApiModelProperty(value = "取消人id")
    @TableField("cancellation_id")
    private Integer cancellationId;

}

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

New file
@@ -0,0 +1,75 @@
package com.ruoyi.order.api.model;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_order_appeal")
@ApiModel(value="TOrderAppeal对象", description="")
public class TOrderAppeal  extends BasePojo {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty(value = "订单类型（1=充电订单，2=购物订单，3=兑换订单，4=会员订单）")
    @TableField("order_type")
    private Integer orderType;

    @ApiModelProperty(value = "订单id")
    @TableField("order_id")
    private Long orderId;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Long appUserId;

    @ApiModelProperty(value = "申诉原因")
    @TableField("reason")
    private String reason;

    @ApiModelProperty(value = "申诉内容")
    @TableField("content")
    private String content;

    @ApiModelProperty(value = "图片地址")
    @TableField("img_url")
    private String imgUrl;

    @ApiModelProperty(value = "申诉状态 (1=待处理,2=已处理)")
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "申诉反馈")
    @TableField("feedback")
    private String feedback;

    @ApiModelProperty(value = "反馈人id")
    @TableField("feedback_user_id")
    private Integer feedbackUserId;

    @ApiModelProperty(value = "反馈时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("feedback_time")
    private LocalDateTime feedbackTime;

}

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

New file
@@ -0,0 +1,67 @@
package com.ruoyi.order.api.model;

import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_order_evaluate")
@ApiModel(value="TOrderEvaluate对象", description="")
public class TOrderEvaluate extends BasePojo {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.NONE)
    private Long id;

    @ApiModelProperty(value = "订单类型（1=充电订单，2=购物订单，3=兑换订单，4=会员订单）")
    @TableField("order_type")
    private Integer orderType;

    @ApiModelProperty(value = "订单id")
    @TableField("order_id")
    private Long orderId;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Long appUserId;

    @ApiModelProperty(value = "评分")
    @TableField("mark")
    private Integer mark;

    @ApiModelProperty(value = "评价内容")
    @TableField("content")
    private String content;

    @ApiModelProperty(value = "图片")
    @TableField("img_url")
    private String imgUrl;

    @ApiModelProperty(value = "评价回复")
    @TableField("evaluation_response")
    private String evaluationResponse;

    @ApiModelProperty(value = "回复时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("response_time")
    private LocalDateTime responseTime;

}

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

New file
@@ -0,0 +1,43 @@
package com.ruoyi.order.api.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;

/**
 * <p>
 * 
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_order_evaluate_tag")
@ApiModel(value="TOrderEvaluateTag对象", description="")
public class TOrderEvaluateTag implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.NONE)
    private Long id;

    @ApiModelProperty(value = "订单评价id")
    @TableField("order_evaluate_id")
    private Long orderEvaluateId;

    @ApiModelProperty(value = "评价标签id")
    @TableField("evaluation_tag_id")
    private Integer evaluationTagId;


}

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

New file
@@ -0,0 +1,108 @@
package com.ruoyi.order.api.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * <p>
 * 
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_order_invoice")
@ApiModel(value="TOrderInvoice对象", description="")
public class TOrderInvoice implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.NONE)
    private Long id;

    @ApiModelProperty(value = "流水号")
    @TableField("code")
    private String code;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Long appUserId;

    @ApiModelProperty(value = "开票订单类型（1=充电订单，2=购物订单，3=兑换订单，4=会员订单）")
    @TableField("order_type")
    private Integer orderType;

    @ApiModelProperty(value = "开票公司")
    @TableField("invoicing_company")
    private String invoicingCompany;

    @ApiModelProperty(value = "发票类型（1=增值税普通发票，2=增值税专用发票）")
    @TableField("invoice_type")
    private Integer invoiceType;

    @ApiModelProperty(value = "发票材质（1=纸质发票，2=电子发票）")
    @TableField("invoice_material")
    private Integer invoiceMaterial;

    @ApiModelProperty(value = "开票方式（1=人工，2=自动）")
    @TableField("invoicing_method")
    private Integer invoicingMethod;

    @ApiModelProperty(value = "抬头类型（1=个人，2=企业）")
    @TableField("invoicing_object_type")
    private Integer invoicingObjectType;

    @ApiModelProperty(value = "名称")
    @TableField("name")
    private String name;

    @ApiModelProperty(value = "纳税识别号")
    @TableField("tax_identification_number")
    private String taxIdentificationNumber;

    @ApiModelProperty(value = "公司地址")
    @TableField("company_address")
    private String companyAddress;

    @ApiModelProperty(value = "公司电话")
    @TableField("company_phone")
    private String companyPhone;

    @ApiModelProperty(value = "开户银行")
    @TableField("deposit_bank")
    private String depositBank;

    @ApiModelProperty(value = "银行账户")
    @TableField("bank_account")
    private String bankAccount;

    @ApiModelProperty(value = "开票总金额")
    @TableField("total_amount")
    private BigDecimal totalAmount;

    @ApiModelProperty(value = "电子发票地址")
    @TableField("invoice_url")
    private String invoiceUrl;

    @ApiModelProperty(value = "邮箱")
    @TableField("mailbox")
    private String mailbox;

    @ApiModelProperty(value = "状态（1=待开票，2=开票中，3=已开票）")
    @TableField("status")
    private Integer status;


}

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

New file
@@ -0,0 +1,64 @@
package com.ruoyi.order.api.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.math.BigDecimal;

/**
 * <p>
 * 
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_order_invoice_detail")
@ApiModel(value="TOrderInvoiceDetail对象", description="")
public class TOrderInvoiceDetail implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.NONE)
    private Long id;

    @ApiModelProperty(value = "订单开票id")
    @TableField("order_invoice_id")
    private Long orderInvoiceId;

    @ApiModelProperty(value = "订单类型（1=充电订单，2=购物订单，3=兑换订单，4=会员订单）")
    @TableField("order_type")
    private Integer orderType;

    @ApiModelProperty(value = "订单id")
    @TableField("order_id")
    private Long orderId;

    @ApiModelProperty(value = "开票金额")
    @TableField("invoice_amount")
    private BigDecimal invoiceAmount;

    @ApiModelProperty(value = "电费税率")
    @TableField("electricity_tariff")
    private BigDecimal electricityTariff;

    @ApiModelProperty(value = "服务费税率")
    @TableField("service_tariff")
    private BigDecimal serviceTariff;

    @ApiModelProperty(value = "增值服务费税率")
    @TableField("added_service_tariff")
    private BigDecimal addedServiceTariff;


}

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

New file
@@ -0,0 +1,161 @@
package com.ruoyi.order.api.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

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

/**
 * <p>
 * 
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_shopping_order")
@ApiModel(value="TShoppingOrder对象", description="")
public class TShoppingOrder extends BasePojo {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.NONE)
    private Long id;

    @ApiModelProperty(value = "订单编号")
    @TableField("code")
    private String code;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Long appUserId;

    @ApiModelProperty(value = "订单类型（1=商品，2=优惠券）")
    @TableField("order_type")
    private Integer orderType;

    @ApiModelProperty(value = "商品id")
    @TableField("goods_id")
    private Integer goodsId;

    @ApiModelProperty(value = "优惠券id")
    @TableField("coupon_id")
    private Integer couponId;

    @ApiModelProperty(value = "购买数量")
    @TableField("purchase_quantity")
    private Integer purchaseQuantity;

    @ApiModelProperty(value = "用户收货地址id")
    @TableField("app_user_address_id")
    private Long appUserAddressId;

    @ApiModelProperty(value = "订单金额")
    @TableField("order_amount")
    private BigDecimal orderAmount;

    @ApiModelProperty(value = "优惠券id")
    @TableField("app_coupon_id")
    private Long appCouponId;

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

    @ApiModelProperty(value = "会员折扣")
    @TableField("vip_discount")
    private BigDecimal vipDiscount;

    @ApiModelProperty(value = "会员优惠金额")
    @TableField("vip_discount_amount")
    private BigDecimal vipDiscountAmount;

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

    @ApiModelProperty(value = "支付状态（1=待支付，2=已支付）")
    @TableField("payment_status")
    private Integer paymentStatus;

    @ApiModelProperty(value = "支付方式（1=微信，2=支付宝）")
    @TableField("payment_type")
    private Integer paymentType;

    @ApiModelProperty(value = "第三方支付流水号")
    @TableField("serial_number")
    private String serialNumber;

    @ApiModelProperty(value = "备注")
    @TableField("remark")
    private String remark;

    @ApiModelProperty(value = "状态（1=待发货，2=待收货，3=已完成，4=已取消）")
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "快递公司")
    @TableField("express_company")
    private String expressCompany;

    @ApiModelProperty(value = "快递号")
    @TableField("express_number")
    private String expressNumber;

    @ApiModelProperty(value = "发货人id")
    @TableField("consigner_id")
    private Integer consignerId;

    @ApiModelProperty(value = "发货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("consigner_time")
    private LocalDateTime consignerTime;

    @ApiModelProperty(value = "收货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("receiving_time")
    private LocalDateTime receivingTime;

    @ApiModelProperty(value = "取消时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("cancellation_time")
    private LocalDateTime cancellationTime;

    @ApiModelProperty(value = "取消人id")
    @TableField("cancellation_id")
    private Integer cancellationId;

    @ApiModelProperty(value = "退款流水号")
    @TableField("refund_code")
    private String refundCode;

    @ApiModelProperty(value = "退款金额")
    @TableField("refund_amount")
    private BigDecimal refundAmount;

    @ApiModelProperty(value = "退款状态（1=退款中，2=退款成功）")
    @TableField("refund_status")
    private Integer refundStatus;

    @ApiModelProperty(value = "退款第三方流水号")
    @TableField("refund_serial_number")
    private String refundSerialNumber;

    @ApiModelProperty(value = "退款成功时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("refund_time")
    private LocalDateTime refundTime;

}

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

New file
@@ -0,0 +1,83 @@
package com.ruoyi.order.api.model;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.math.BigDecimal;

/**
 * <p>
 * 
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_vip_order")
@ApiModel(value="TVipOrder对象", description="")
public class TVipOrder  extends BasePojo {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    @ApiModelProperty(value = "订单编号")
    @TableField("code")
    private String code;

    @ApiModelProperty(value = "用户id")
    @TableField("app_user_id")
    private Long appUserId;

    @ApiModelProperty(value = "类型（1=购买，2=赠送）")
    @TableField("type")
    private Integer type;

    @ApiModelProperty(value = "购买的会员id")
    @TableField("vip_id")
    private Integer vipId;

    @ApiModelProperty(value = "会员类型（1=月卡，2=季卡，3=年卡）")
    @TableField("vip_type")
    private Integer vipType;

    @ApiModelProperty(value = "订单金额")
    @TableField("order_amount")
    private BigDecimal orderAmount;

    @ApiModelProperty(value = "折扣")
    @TableField("discount")
    private BigDecimal discount;

    @ApiModelProperty(value = "折扣金额")
    @TableField("discount_amount")
    private BigDecimal discountAmount;

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

    @ApiModelProperty(value = "支付状态（1=待支付，2=已支付）")
    @TableField("payment_status")
    private Integer paymentStatus;

    @ApiModelProperty(value = "支付方式（1=微信，2=支付宝）")
    @TableField("payment_type")
    private Integer paymentType;

    @ApiModelProperty(value = "第三方支付流水号")
    @TableField("serial_number")
    private String serialNumber;

}

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/query/TOrderAppealQuery.java

New file
@@ -0,0 +1,15 @@
package com.ruoyi.order.api.query;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "TOrderAppealQuery对象", description = "订单申诉查询条件")
public class TOrderAppealQuery extends BasePage {

    @ApiModelProperty(value = "用户id")
    private Long appUserId;

}

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

New file
@@ -0,0 +1,24 @@
package com.ruoyi.order.api.vo;

import com.ruoyi.order.api.model.*;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "TOrderAppealVO对象", description = "订单申诉VO对象")
public class TOrderAppealVO extends TOrderAppeal {

    @ApiModelProperty(value = "充电订单")
    private TChargingOrder chargingOrder;

    @ApiModelProperty(value = "购物订单")
    private TShoppingOrder shoppingOrder;

    @ApiModelProperty(value = "兑换订单")
    private TExchangeOrder exchangeOrder;

    @ApiModelProperty(value = "会员订单")
    private TVipOrder vipOrder;

}

 ruoyi-api/ruoyi-api-order/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +1,2 @@
com.ruoyi.order.api.factory.ChargingOrderFallbackFactory
com.ruoyi.order.api.factory.ChargingOrderFallbackFactory
com.ruoyi.order.api.factory.OrderFallbackFactory

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("gen_table")
@ApiModel(value="GenTable对象", description="")
public class GenTable implements Serializable {
public class GenTable  {

    private static final long serialVersionUID = 1L;


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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("gen_table_column")
@ApiModel(value="GenTableColumn对象", description="")
public class GenTableColumn implements Serializable {
public class GenTableColumn  {

    private static final long serialVersionUID = 1L;


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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("sys_dict_data")
@ApiModel(value="SysDictData对象", description="")
public class SysDictData implements Serializable {
public class SysDictData  {

    private static final long serialVersionUID = 1L;


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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("sys_dict_type")
@ApiModel(value="SysDictType对象", description="")
public class SysDictType implements Serializable {
public class SysDictType  {

    private static final long serialVersionUID = 1L;


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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -25,7 +26,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("sys_notice")
@ApiModel(value="SysNotice对象", description="")
public class SysNotice implements Serializable {
public class SysNotice  {

    private static final long serialVersionUID = 1L;


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

@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_activity")
@ApiModel(value="TActivity对象", description="")
public class TActivity implements Serializable {
public class TActivity extends BasePojo {

    private static final long serialVersionUID = 1L;

@@ -57,14 +58,9 @@
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;
    @ApiModelProperty(value = "活动状态 1未开始 2已开始 3已结束")
    @TableField(exist = false)
    private Integer startState;


}

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

@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_advertising")
@ApiModel(value="TAdvertising对象", description="")
public class TAdvertising implements Serializable {
public class TAdvertising extends BasePojo {

    private static final long serialVersionUID = 1L;

@@ -61,14 +62,9 @@
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;


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

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

@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_company")
@ApiModel(value="TCompany对象", description="")
public class TCompany implements Serializable {
public class TCompany extends BasePojo {

    private static final long serialVersionUID = 1L;

@@ -41,14 +42,7 @@
    @TableField("remark")
    private String remark;

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;
    @ApiModelProperty(value = "人数")
    @TableField(exist = false)
    private Long userCount;

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

@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,7 +23,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_coupon")
@ApiModel(value="TCoupon对象", description="")
public class TCoupon implements Serializable {
public class TCoupon extends BasePojo {

    private static final long serialVersionUID = 1L;

@@ -106,14 +107,6 @@
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;


}

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

@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_enterprise_user_application")
@ApiModel(value="TEnterpriseUserApplication对象", description="")
public class TEnterpriseUserApplication implements Serializable {
public class TEnterpriseUserApplication extends BasePojo {

    private static final long serialVersionUID = 1L;

@@ -53,14 +54,7 @@
    @TableField("remark")
    private String remark;

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;


}

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

@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_evaluation_tag")
@ApiModel(value="TEvaluationTag对象", description="")
public class TEvaluationTag implements Serializable {
public class TEvaluationTag extends BasePojo {

    private static final long serialVersionUID = 1L;

@@ -37,14 +38,7 @@
    @TableField("type")
    private Integer type;

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;


}

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

@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,7 +23,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_goods")
@ApiModel(value="TGoods对象", description="")
public class TGoods implements Serializable {
public class TGoods extends BasePojo {

    private static final long serialVersionUID = 1L;

@@ -98,14 +99,9 @@
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;

    @ApiModelProperty(value = "销量")
    @TableField(exist = false)
    private Integer salesCount;

}

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_html")
@ApiModel(value="THtml对象", description="")
public class THtml implements Serializable {
public class THtml extends BasePojo {

    private static final long serialVersionUID = 1L;


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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_integral_rule")
@ApiModel(value="TIntegralRule对象", description="")
public class TIntegralRule implements Serializable {
public class TIntegralRule extends BasePojo {

    private static final long serialVersionUID = 1L;


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

@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_invoice_type")
@ApiModel(value="TInvoiceType对象", description="")
public class TInvoiceType implements Serializable {
public class TInvoiceType extends BasePojo {

    private static final long serialVersionUID = 1L;

@@ -53,14 +54,7 @@
    @TableField("added_service_tariff")
    private Double addedServiceTariff;

    @ApiModelProperty(value = "删除状态（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;


}

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_notice")
@ApiModel(value="TNotice对象", description="")
public class TNotice implements Serializable {
public class TNotice extends BasePojo {

    private static final long serialVersionUID = 1L;

@@ -44,14 +45,6 @@
    @TableField("end_time")
    private LocalDateTime endTime;

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;


}

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_role_site")
@ApiModel(value="TRoleSite对象", description="")
public class TRoleSite implements Serializable {
public class TRoleSite extends BasePojo {

    private static final long serialVersionUID = 1L;


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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_system_configuration")
@ApiModel(value="TSystemConfiguration对象", description="")
public class TSystemConfiguration implements Serializable {
public class TSystemConfiguration extends BasePojo {

    private static final long serialVersionUID = 1L;


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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_user_site")
@ApiModel(value="TUserSite对象", description="")
public class TUserSite implements Serializable {
public class TUserSite extends BasePojo {

    private static final long serialVersionUID = 1L;


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

@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_user_tag")
@ApiModel(value="TUserTag对象", description="")
public class TUserTag implements Serializable {
public class TUserTag extends BasePojo {

    private static final long serialVersionUID = 1L;

@@ -41,14 +42,7 @@
    @TableField("condition")
    private String condition;

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;


    @ApiModelProperty(value = "到达人数")

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

@@ -1,6 +1,7 @@
package com.ruoyi.other.api.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.web.domain.BasePojo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,7 +22,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_vip")
@ApiModel(value="TVip对象", description="")
public class TVip implements Serializable {
public class TVip extends BasePojo {

    private static final long serialVersionUID = 1L;

@@ -33,7 +34,7 @@
    @TableField("name")
    private String name;

    @ApiModelProperty(value = "是否显示（0=否，1=是）")
    @ApiModelProperty(value = "前端是否显示（0=否，1=是）")
    @TableField("reveal")
    private Integer reveal;

@@ -133,14 +134,7 @@
    @TableField("mall_exclusive_price")
    private Integer mallExclusivePrice;

    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic
    private Integer delFlag;


}

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/AdvertisingDTO.java

New file
@@ -0,0 +1,19 @@
package com.ruoyi.other.api.dto;

import com.ruoyi.common.core.web.domain.BasePojo;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("广告列表查询DTO")
public class AdvertisingDTO extends BasePage {

    @ApiModelProperty(value = "状态1未开始 2进行中 3已结束")
    private Integer startState;
    @ApiModelProperty(value = "标题")
    private String title;


}

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/GoodsDTO.java

New file
@@ -0,0 +1,19 @@
package com.ruoyi.other.api.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("商品管理列表查询DTO")
public class GoodsDTO extends BasePage {
    @ApiModelProperty(value = "商品状态 1上架 2下架")
    private Integer status;
    @ApiModelProperty(value = "商品名称")
    private String name;
    @ApiModelProperty(value = "1现金购买 2积分兑换 ")
    private Integer type;
    @ApiModelProperty(value = "1全部 2已售罄 ")
    private Integer otherState;
}

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveIntegralDTO.java

@@ -7,7 +7,7 @@
import java.util.List;

@Data
@ApiModel("积分规则DTO")
@ApiModel("保存修改-查看详情积分规则DTO")
public class SaveIntegralDTO {

    @ApiModelProperty(value = "id")

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/GoodsFallbackFactory.java

File was deleted

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/GoodsClient.java

File was deleted

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ServiceNameConstants.java

@@ -35,4 +35,5 @@
     * 车辆合同的serviceid
     */
    public static final String CONTRACT_SERVICE = "ruoyi-contract";
    public static final String CONTRACT_ORDER = "ruoyi-order";
}

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BasePojo.java

@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

/**
@@ -22,7 +23,7 @@
    @ApiModelProperty(value = "记录创建时间，前端忽略")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField(value = "create_time", fill = FieldFill.INSERT)
    private Date createTime;
    private LocalDateTime createTime;

    /** 是否删除 0未删除 1已删除 */
    @TableField("del_flag")
@@ -30,11 +31,11 @@
    @TableLogic
    private Boolean delFlag;

    public Date getCreateTime() {
    public LocalDateTime getCreateTime() {
        return createTime;
    }

    public void setCreateTime(Date createTime) {
    public void setCreateTime(LocalDateTime createTime) {
        this.createTime = createTime;
    }


 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java

@@ -46,7 +46,7 @@
    /**
     * 查询计费策略列表
     */
    @ApiOperation(value = "查询计费策略分页列表")
    @ApiOperation(tags = {"后台-计费策略"},value = "查询计费策略分页列表")
    @PostMapping(value = "/pageList")
    public AjaxResult<PageInfo<TAccountingStrategyVO>> pageList(@RequestBody TAccountingStrategyQuery query) {
        return AjaxResult.ok(accountingStrategyService.pageList(query));
@@ -55,7 +55,7 @@
    /**
     * 查询计费策略明细列表
     */
    @ApiOperation(value = "查询计费策略明细列表")
    @ApiOperation(tags = {"后台-计费策略"},value = "查询计费策略明细列表")
    @GetMapping(value = "/queryAccountingStrategyDetailByStrategyId")
    public AjaxResult<List<TAccountingStrategyDetailVO>> queryAccountingStrategyDetailByStrategyId(@RequestParam Integer strategyId) {
        List<TAccountingStrategyDetailVO> list = accountingStrategyDetailService.queryAccountingStrategyDetailByStrategyId(strategyId);
@@ -68,7 +68,7 @@
    /**
     * 添加计费策略管理
     */
    @ApiOperation(value = "添加计费策略")
    @ApiOperation(tags = {"后台-计费策略"},value = "添加计费策略")
    @PostMapping(value = "/add")
    public AjaxResult<Boolean> add(@RequestBody TAccountingStrategyDTO dto) {
        accountingStrategyService.save(dto);
@@ -81,7 +81,7 @@
    /**
     * 修改计费策略
     */
    @ApiOperation(value = "修改计费策略")
    @ApiOperation(tags = {"后台-计费策略"},value = "修改计费策略")
    @PostMapping(value = "/update")
    public AjaxResult<Boolean> update(@RequestBody TAccountingStrategyDTO dto) {
        // 删除计费策略明细信息
@@ -97,7 +97,7 @@
    /**
     * 查看计费策略详情
     */
    @ApiOperation(value = "查看计费策略详情")
    @ApiOperation(tags = {"后台-计费策略"},value = "查看计费策略详情")
    @GetMapping(value = "/getDetailById")
    public AjaxResult<TAccountingStrategy> getDetailById(@RequestParam Integer id) {
        return AjaxResult.ok(accountingStrategyService.getById(id));
@@ -106,7 +106,7 @@
    /**
     * 删除计费策略
     */
    @ApiOperation(value = "删除计费策略")
    @ApiOperation(tags = {"后台-计费策略"},value = "删除计费策略")
    @DeleteMapping(value = "/deleteById")
    public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
        // 刪除计费策略明细信息
@@ -118,7 +118,7 @@
    /**
     * 批量删除计费策略
     */
    @ApiOperation(value = "批量删除计费策略")
    @ApiOperation(tags = {"后台-计费策略"},value = "批量删除计费策略")
    @DeleteMapping(value = "/deleteByIds")
    public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
        // 刪除计费策略明细信息

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java

New file
@@ -0,0 +1,48 @@
package com.ruoyi.chargingPile.controller;


import com.ruoyi.chargingPile.api.model.TApplyChargingPile;
import com.ruoyi.chargingPile.api.model.TCarport;
import com.ruoyi.chargingPile.api.vo.TCarportVO;
import com.ruoyi.chargingPile.service.TApplyChargingPileService;
import com.ruoyi.chargingPile.service.TCarportService;
import com.ruoyi.chargingPile.service.TVehicleRampService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@RestController
@RequestMapping("/t-apply-charging-pile")
public class TApplyChargingPileController {

    private final TApplyChargingPileService applyChargingPileService;

    @Autowired
    public TApplyChargingPileController(TApplyChargingPileService applyChargingPileService) {
        this.applyChargingPileService = applyChargingPileService;
    }

    /**
     * 建桩申请
     */
    @ApiOperation(tags = {"小程序-建桩申请"},value = "建桩申请")
    @PostMapping(value = "/add")
    public AjaxResult<Boolean> add(@RequestBody TApplyChargingPile dto) {
        // TODO 用户id
        dto.setAppUserId(null);
        return AjaxResult.ok(applyChargingPileService.save(dto));
    }

}


 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TCarportController.java

@@ -40,7 +40,7 @@
    /**
     * 通过停车场id查询车库及车道信息
     */
    @ApiOperation(value = "通过停车场id查询车库及车道信息")
    @ApiOperation(tags = {"后台-车库"},value = "通过停车场id查询车库及车道信息")
    @GetMapping(value = "/queryCarportByParkId")
    public AjaxResult<List<TCarportVO>> queryCarportByParkId(@RequestParam(value = "parkingLotId", required = true) Integer parkingLotId) {
        return AjaxResult.ok(carportService.queryCarportByParkId(parkingLotId));
@@ -50,7 +50,7 @@
    /**
     * 添加车库管理
     */
    @ApiOperation(value = "添加车库")
    @ApiOperation(tags = {"后台-车库"},value = "添加车库")
    @PostMapping(value = "/add")
    public AjaxResult<Boolean> add(@RequestBody TCarport dto) {
        return AjaxResult.ok(carportService.save(dto));
@@ -59,7 +59,7 @@
    /**
     * 修改车库
     */
    @ApiOperation(value = "修改车库")
    @ApiOperation(tags = {"后台-车库"},value = "修改车库")
    @PostMapping(value = "/update")
    public AjaxResult<Boolean> update(@RequestBody TCarport dto) {
        return AjaxResult.ok(carportService.updateById(dto));
@@ -68,7 +68,7 @@
    /**
     * 查看车库详情
     */
    @ApiOperation(value = "查看车库详情")
    @ApiOperation(tags = {"后台-车库"},value = "查看车库详情")
    @GetMapping(value = "/getDetailById")
    public AjaxResult<TCarport> getDetailById(@RequestParam Integer id) {
        return AjaxResult.ok(carportService.getById(id));
@@ -77,7 +77,7 @@
    /**
     * 删除车库
     */
    @ApiOperation(value = "删除车库")
    @ApiOperation(tags = {"后台-车库"},value = "删除车库")
    @DeleteMapping(value = "/deleteById")
    public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
        // 刪除车道信息
@@ -89,7 +89,7 @@
    /**
     * 批量删除车库
     */
    @ApiOperation(value = "批量删除车库")
    @ApiOperation(tags = {"后台-车库"},value = "批量删除车库")
    @DeleteMapping(value = "/deleteByIds")
    public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
        // 刪除车道信息

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java

@@ -38,7 +38,7 @@
    /**
     * 查询充电枪列表
     */
    @ApiOperation(value = "查询充电枪分页列表")
    @ApiOperation(tags = {"后台-充电枪"},value = "查询充电枪分页列表")
    @PostMapping(value = "/pageList")
    public AjaxResult<PageInfo<TChargingGunVO>> pageList(@RequestBody TChargingGunQuery query) {
        return AjaxResult.ok(chargingGunService.pageList(query));
@@ -47,7 +47,7 @@
    /**
     * 添加充电枪管理
     */
    @ApiOperation(value = "添加充电枪")
    @ApiOperation(tags = {"后台-充电枪"},value = "添加充电枪")
    @PostMapping(value = "/add")
    public AjaxResult<Boolean> add(@RequestBody TChargingGunDTO dto) {
        return AjaxResult.ok(chargingGunService.save(dto));
@@ -56,7 +56,7 @@
    /**
     * 修改充电枪
     */
    @ApiOperation(value = "修改充电枪")
    @ApiOperation(tags = {"后台-充电枪"},value = "修改充电枪")
    @PostMapping(value = "/update")
    public AjaxResult<Boolean> update(@RequestBody TChargingGunDTO dto) {
        return AjaxResult.ok(chargingGunService.updateById(dto));
@@ -65,7 +65,7 @@
    /**
     * 查看充电枪详情
     */
    @ApiOperation(value = "查看充电枪详情")
    @ApiOperation(tags = {"后台-充电枪"},value = "查看充电枪详情")
    @GetMapping(value = "/getDetailById")
    public AjaxResult<TChargingGun> getDetailById(@RequestParam Integer id) {
        return AjaxResult.ok(chargingGunService.getById(id));
@@ -74,7 +74,7 @@
    /**
     * 删除充电枪
     */
    @ApiOperation(value = "删除充电枪")
    @ApiOperation(tags = {"后台-充电枪"},value = "删除充电枪")
    @DeleteMapping(value = "/deleteById")
    public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
        return AjaxResult.ok(chargingGunService.removeById(id));
@@ -83,7 +83,7 @@
    /**
     * 批量删除充电枪
     */
    @ApiOperation(value = "批量删除充电枪")
    @ApiOperation(tags = {"后台-充电枪"},value = "批量删除充电枪")
    @DeleteMapping(value = "/deleteByIds")
    public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
        return AjaxResult.ok(chargingGunService.removeByIds(ids));
@@ -92,7 +92,7 @@
    /**
     * 结束充电
     */
    @ApiOperation(value = "结束充电")
    @ApiOperation(tags = {"后台-充电枪"},value = "结束充电")
    @PostMapping(value = "/stopCharging")
    public AjaxResult<String> stopCharging() {
        // TODO 硬件 结束充电

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TMonitoringEquipmentController.java

@@ -38,7 +38,7 @@
    /**
     * 查询监控列表
     */
    @ApiOperation(value = "查询监控分页列表")
    @ApiOperation(tags = {"后台-监控"},value = "查询监控分页列表")
    @PostMapping(value = "/pageList")
    public AjaxResult<PageInfo<TMonitoringEquipmentVO>> pageList(@RequestBody TMonitoringEquipmentQuery query) {
        return AjaxResult.ok(monitoringEquipmentService.pageList(query));
@@ -47,7 +47,7 @@
    /**
     * 添加监控管理
     */
    @ApiOperation(value = "添加监控")
    @ApiOperation(tags = {"后台-监控"},value = "添加监控")
    @PostMapping(value = "/add")
    public AjaxResult<Boolean> add(@RequestBody TMonitoringEquipmentDTO dto) {
        return AjaxResult.ok(monitoringEquipmentService.save(dto));
@@ -56,7 +56,7 @@
    /**
     * 修改监控
     */
    @ApiOperation(value = "修改监控")
    @ApiOperation(tags = {"后台-监控"},value = "修改监控")
    @PostMapping(value = "/update")
    public AjaxResult<Boolean> update(@RequestBody TMonitoringEquipmentDTO dto) {
        return AjaxResult.ok(monitoringEquipmentService.updateById(dto));
@@ -65,7 +65,7 @@
    /**
     * 查看监控详情
     */
    @ApiOperation(value = "查看监控详情")
    @ApiOperation(tags = {"后台-监控"},value = "查看监控详情")
    @GetMapping(value = "/getDetailById")
    public AjaxResult<TMonitoringEquipment> getDetailById(@RequestParam Integer id) {
        return AjaxResult.ok(monitoringEquipmentService.getById(id));
@@ -74,7 +74,7 @@
    /**
     * 删除监控
     */
    @ApiOperation(value = "删除监控")
    @ApiOperation(tags = {"后台-监控"},value = "删除监控")
    @DeleteMapping(value = "/deleteById")
    public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
        return AjaxResult.ok(monitoringEquipmentService.removeById(id));
@@ -83,7 +83,7 @@
    /**
     * 批量删除监控
     */
    @ApiOperation(value = "批量删除监控")
    @ApiOperation(tags = {"后台-监控"},value = "批量删除监控")
    @DeleteMapping(value = "/deleteByIds")
    public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
        return AjaxResult.ok(monitoringEquipmentService.removeByIds(ids));

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TParkingLotController.java

@@ -47,7 +47,7 @@
    /**
     * 查询停车场列表
     */
    @ApiOperation(value = "查询停车场分页列表")
    @ApiOperation(tags = {"后台-停车场"},value = "查询停车场分页列表")
    @PostMapping(value = "/pageList")
    public AjaxResult<PageInfo<TParkingLotVO>> pageList(@RequestBody TParkingLotQuery query) {
        return AjaxResult.ok(parkingLotService.pageList(query));
@@ -56,7 +56,7 @@
    /**
     * 查询停车场列表
     */
    @ApiOperation(value = "查询停车场列表")
    @ApiOperation(tags = {"后台-停车场"},value = "查询停车场列表")
    @PostMapping(value = "/list")
    public AjaxResult<List<TParkingLot>> list(@RequestBody TParkingLotQuery query) {
        return AjaxResult.ok(parkingLotService.list(Wrappers.lambdaQuery(TParkingLot.class)
@@ -66,7 +66,7 @@
    /**
     * 添加停车场管理
     */
    @ApiOperation(value = "添加停车场")
    @ApiOperation(tags = {"后台-停车场"},value = "添加停车场")
    @PostMapping(value = "/add")
    public AjaxResult<Boolean> add(@RequestBody TParkingLotDTO dto) {
        return AjaxResult.ok(parkingLotService.save(dto));
@@ -75,7 +75,7 @@
    /**
     * 修改停车场
     */
    @ApiOperation(value = "修改停车场")
    @ApiOperation(tags = {"后台-停车场"},value = "修改停车场")
    @PostMapping(value = "/update")
    public AjaxResult<Boolean> update(@RequestBody TParkingLotDTO dto) {
        return AjaxResult.ok(parkingLotService.updateById(dto));
@@ -84,7 +84,7 @@
    /**
     * 查看停车场详情
     */
    @ApiOperation(value = "查看停车场详情")
    @ApiOperation(tags = {"后台-停车场"},value = "查看停车场详情")
    @GetMapping(value = "/getDetailById")
    public AjaxResult<TParkingLot> getDetailById(@RequestParam Integer id) {
        return AjaxResult.ok(parkingLotService.getById(id));
@@ -93,7 +93,7 @@
    /**
     * 删除停车场
     */
    @ApiOperation(value = "删除停车场")
    @ApiOperation(tags = {"后台-停车场"},value = "删除停车场")
    @DeleteMapping(value = "/deleteById")
    public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
        // 刪除车道信息
@@ -108,7 +108,7 @@
    /**
     * 批量删除停车场
     */
    @ApiOperation(value = "批量删除停车场")
    @ApiOperation(tags = {"后台-停车场"},value = "批量删除停车场")
    @DeleteMapping(value = "/deleteByIds")
    public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
        // 刪除车道信息

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TVehicleRampController.java

@@ -34,7 +34,7 @@
    /**
     * 添加车道管理
     */
    @ApiOperation(value = "添加车道")
    @ApiOperation(tags = {"后台-车道"},value = "添加车道")
    @PostMapping(value = "/add")
    public AjaxResult<Boolean> add(@RequestBody TVehicleRamp dto) {
        return AjaxResult.ok(vehicleRampService.save(dto));
@@ -43,7 +43,7 @@
    /**
     * 修改车道
     */
    @ApiOperation(value = "修改车道")
    @ApiOperation(tags = {"后台-车道"},value = "修改车道")
    @PostMapping(value = "/update")
    public AjaxResult<Boolean> update(@RequestBody TVehicleRamp dto) {
        return AjaxResult.ok(vehicleRampService.updateById(dto));
@@ -52,7 +52,7 @@
    /**
     * 查看车道详情
     */
    @ApiOperation(value = "查看车道详情")
    @ApiOperation(tags = {"后台-车道"},value = "查看车道详情")
    @GetMapping(value = "/getDetailById")
    public AjaxResult<TVehicleRamp> getDetailById(@RequestParam Integer id) {
        return AjaxResult.ok(vehicleRampService.getById(id));
@@ -61,7 +61,7 @@
    /**
     * 删除车道
     */
    @ApiOperation(value = "删除车道")
    @ApiOperation(tags = {"后台-车道"},value = "删除车道")
    @DeleteMapping(value = "/deleteById")
    public AjaxResult<Boolean> deleteById(@RequestParam Integer id) {
        return AjaxResult.ok(vehicleRampService.removeById(id));
@@ -70,7 +70,7 @@
    /**
     * 批量删除车道
     */
    @ApiOperation(value = "批量删除车道")
    @ApiOperation(tags = {"后台-车道"},value = "批量删除车道")
    @DeleteMapping(value = "/deleteByIds")
    public AjaxResult<Boolean> deleteByIds(@RequestBody List<Integer> ids) {
        return AjaxResult.ok(vehicleRampService.removeByIds(ids));
@@ -79,7 +79,7 @@
    /**
     * 开关闸车道
     */
    @ApiOperation(value = "开关闸车道")
    @ApiOperation(tags = {"后台-车道"},value = "开关闸车道")
    @PostMapping(value = "/openOrDown")
    public AjaxResult<String> openOrDown(@RequestBody TVehicleRamp dto) {
        // TODO 硬件 开关闸车道

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/mapper/TApplyChargingPileMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.chargingPile.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.chargingPile.api.model.TApplyChargingPile;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TApplyChargingPileMapper extends BaseMapper<TApplyChargingPile> {

}

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/TApplyChargingPileService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.chargingPile.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.chargingPile.api.model.TApplyChargingPile;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TApplyChargingPileService extends IService<TApplyChargingPile> {

}

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TApplyChargingPileServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.chargingPile.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.chargingPile.api.model.TApplyChargingPile;
import com.ruoyi.chargingPile.mapper.TApplyChargingPileMapper;
import com.ruoyi.chargingPile.service.TApplyChargingPileService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Service
public class TApplyChargingPileServiceImpl extends ServiceImpl<TApplyChargingPileMapper, TApplyChargingPile> implements TApplyChargingPileService {

}

 ruoyi-service/ruoyi-chargingPile/src/main/resources/mapper/chargingPile/TApplyChargingPileMapper.xml

New file
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.chargingPile.mapper.TApplyChargingPileMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.chargingPile.api.model.TApplyChargingPile">
        <id column="id" property="id" />
        <result column="app_user_id" property="appUserId" />
        <result column="address" property="address" />
        <result column="capacity" property="capacity" />
        <result column="consumption_time" property="consumptionTime" />
        <result column="landlord_handling" property="landlordHandling" />
        <result column="landlord_name" property="landlordName" />
        <result column="landlord_id_card" property="landlordIdCard" />
        <result column="landlord_phone" property="landlordPhone" />
        <result column="landlord_front_id_card" property="landlordFrontIdCard" />
        <result column="landlord_back_id_card" property="landlordBackIdCard" />
        <result column="title_certificate" property="titleCertificate" />
        <result column="business_license" property="businessLicense" />
        <result column="charging_pile_user" property="chargingPileUser" />
        <result column="fixed_parking_property_rights" property="fixedParkingPropertyRights" />
        <result column="construction_certificate" property="constructionCertificate" />
        <result column="agent_name" property="agentName" />
        <result column="agent_id_card" property="agentIdCard" />
        <result column="agent_phone" property="agentPhone" />
        <result column="agent_front_id_card" property="agentFrontIdCard" />
        <result column="agent_back_id_card" property="agentBackIdCard" />
        <result column="charging_pile" property="chargingPile" />
        <result column="further_information" property="furtherInformation" />
        <result column="remark" property="remark" />
        <result column="create_time" property="createTime" />
        <result column="del_flag" property="delFlag" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, app_user_id, address, capacity, consumption_time, landlord_handling, landlord_name, landlord_id_card, landlord_phone, landlord_front_id_card, landlord_back_id_card, title_certificate, business_license, charging_pile_user, fixed_parking_property_rights, construction_certificate, agent_name, agent_id_card, agent_phone, agent_front_id_card, agent_back_id_card, charging_pile, further_information, remark, create_time, del_flag
    </sql>

</mapper>

 ruoyi-service/ruoyi-order/pom.xml

@@ -15,6 +15,15 @@
    </description>

    <dependencies>

        <!-- ruoyi-modules-chargingPile-api -->
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-api-order</artifactId>
            <version>3.6.2</version>
            <scope>compile</scope>
        </dependency>

        <!-- SpringCloud Alibaba Nacos -->
        <dependency>
            <groupId>com.alibaba.cloud</groupId>

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

New file
@@ -0,0 +1,22 @@
package com.ruoyi.order.controller;


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Api(tags = "充电订单计费策略明细")
@RestController
@RequestMapping("/t-charging-order-accounting-strategy")
public class TChargingOrderAccountingStrategyController {

}


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

New file
@@ -0,0 +1,22 @@
package com.ruoyi.order.controller;


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Api(tags = "充电订单")
@RestController
@RequestMapping("/t-charging-order")
public class TChargingOrderController {

}


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

New file
@@ -0,0 +1,22 @@
package com.ruoyi.order.controller;


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Api(tags = "积分兑换订单")
@RestController
@RequestMapping("/t-exchange-order")
public class TExchangeOrderController {

}


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

New file
@@ -0,0 +1,60 @@
package com.ruoyi.order.controller;


import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.query.TOrderAppealQuery;
import com.ruoyi.order.api.vo.TOrderAppealVO;
import com.ruoyi.order.service.TOrderAppealService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@RestController
@RequestMapping("/t-order-appeal")
public class TOrderAppealController {

    private final TOrderAppealService orderAppealService;
    private final TokenService tokenService;

    @Autowired
    public TOrderAppealController(TOrderAppealService orderAppealService, TokenService tokenService) {
        this.orderAppealService = orderAppealService;
        this.tokenService = tokenService;
    }

    /**
     * 查询订单申诉列表
     */
    @ApiOperation(tags = {"小程序-订单申诉"},value = "查询订单申诉分页列表")
    @PostMapping(value = "/pageList")
    public AjaxResult<PageInfo<TOrderAppealVO>> pageList(@RequestBody TOrderAppealQuery query) {
        // TODO 用户id 获取小程序当前登录用户id
        Long userId = tokenService.getLoginUser().getUserid();
        query.setAppUserId(userId);
        return AjaxResult.ok(orderAppealService.pageList(query));
    }

    /**
     * 查询订单申诉详情
     */
    @ApiOperation(tags = {"小程序-订单申诉"},value = "查询订单申诉详情")
    @GetMapping(value = "/getDetailById")
    public AjaxResult<TOrderAppealVO> getDetailById(@RequestParam Integer id) {
        return AjaxResult.ok(orderAppealService.getDetailById(id));
    }



}


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

New file
@@ -0,0 +1,22 @@
package com.ruoyi.order.controller;


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Api(tags = "订单评价")
@RestController
@RequestMapping("/t-order-evaluate")
public class TOrderEvaluateController {

}


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

New file
@@ -0,0 +1,22 @@
package com.ruoyi.order.controller;


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Api(tags = "订单评价标签关系表")
@RestController
@RequestMapping("/t-order-evaluate-tag")
public class TOrderEvaluateTagController {

}


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

New file
@@ -0,0 +1,22 @@
package com.ruoyi.order.controller;


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Api(tags = "订单开票")
@RestController
@RequestMapping("/t-order-invoice")
public class TOrderInvoiceController {

}


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

New file
@@ -0,0 +1,22 @@
package com.ruoyi.order.controller;


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Api(tags = "订单开票明细")
@RestController
@RequestMapping("/t-order-invoice-detail")
public class TOrderInvoiceDetailController {

}


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

New file
@@ -0,0 +1,22 @@
package com.ruoyi.order.controller;


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Api(tags = "购物订单")
@RestController
@RequestMapping("/t-shopping-order")
public class TShoppingOrderController {

}


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

New file
@@ -0,0 +1,22 @@
package com.ruoyi.order.controller;


import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Api(tags = "会员订单")
@RestController
@RequestMapping("/t-vip-order")
public class TVipOrderController {

}


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

New file
@@ -0,0 +1,18 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Mapper
public interface TChargingOrderAccountingStrategyMapper extends BaseMapper<TChargingOrderAccountingStrategy> {

}

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

New file
@@ -0,0 +1,18 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.api.model.TChargingOrder;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Mapper
public interface TChargingOrderMapper extends BaseMapper<TChargingOrder> {

}

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

New file
@@ -0,0 +1,18 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.api.model.TExchangeOrder;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Mapper
public interface TExchangeOrderMapper extends BaseMapper<TExchangeOrder> {

}

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

New file
@@ -0,0 +1,29 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TOrderAppeal;
import com.ruoyi.order.api.query.TOrderAppealQuery;
import com.ruoyi.order.api.vo.TOrderAppealVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TOrderAppealMapper extends BaseMapper<TOrderAppeal> {

    /**
     * 查询订单申诉分页列表
     * @param query
     * @param pageInfo
     * @return
     */
    List<TOrderAppealVO> pageList(@Param("query") TOrderAppealQuery query, @Param("pageInfo")PageInfo<TOrderAppealVO> pageInfo);
}

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

New file
@@ -0,0 +1,18 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.api.model.TOrderEvaluate;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Mapper
public interface TOrderEvaluateMapper extends BaseMapper<TOrderEvaluate> {

}

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

New file
@@ -0,0 +1,18 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.api.model.TOrderEvaluateTag;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Mapper
public interface TOrderEvaluateTagMapper extends BaseMapper<TOrderEvaluateTag> {

}

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

New file
@@ -0,0 +1,18 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.api.model.TOrderInvoiceDetail;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Mapper
public interface TOrderInvoiceDetailMapper extends BaseMapper<TOrderInvoiceDetail> {

}

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

New file
@@ -0,0 +1,18 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.api.model.TOrderInvoice;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Mapper
public interface TOrderInvoiceMapper extends BaseMapper<TOrderInvoice> {

}

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

New file
@@ -0,0 +1,18 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.api.model.TShoppingOrder;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Mapper
public interface TShoppingOrderMapper extends BaseMapper<TShoppingOrder> {

}

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

New file
@@ -0,0 +1,18 @@
package com.ruoyi.order.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.order.api.model.TVipOrder;
import org.apache.ibatis.annotations.Mapper;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Mapper
public interface TVipOrderMapper extends BaseMapper<TVipOrder> {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderAccountingStrategyService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TChargingOrderAccountingStrategyService extends IService<TChargingOrderAccountingStrategy> {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.api.model.TChargingOrder;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TChargingOrderService extends IService<TChargingOrder> {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TExchangeOrderService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.api.model.TExchangeOrder;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TExchangeOrderService extends IService<TExchangeOrder> {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderAppealService.java

New file
@@ -0,0 +1,32 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TOrderAppeal;
import com.ruoyi.order.api.query.TOrderAppealQuery;
import com.ruoyi.order.api.vo.TOrderAppealVO;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TOrderAppealService extends IService<TOrderAppeal> {

    /**
     * 查询订单申诉分页列表
     * @param query
     * @return
     */
    PageInfo<TOrderAppealVO> pageList(TOrderAppealQuery query);

    /**
     * 查询订单申诉详情
     * @param id
     * @return
     */
    TOrderAppealVO getDetailById(Integer id);
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.api.model.TOrderEvaluate;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TOrderEvaluateService extends IService<TOrderEvaluate> {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderEvaluateTagService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.api.model.TOrderEvaluateTag;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TOrderEvaluateTagService extends IService<TOrderEvaluateTag> {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderInvoiceDetailService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.api.model.TOrderInvoiceDetail;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TOrderInvoiceDetailService extends IService<TOrderInvoiceDetail> {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TOrderInvoiceService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.api.model.TOrderInvoice;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TOrderInvoiceService extends IService<TOrderInvoice> {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.api.model.TShoppingOrder;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TShoppingOrderService extends IService<TShoppingOrder> {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TVipOrderService.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.order.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.order.api.model.TVipOrder;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
public interface TVipOrderService extends IService<TVipOrder> {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderAccountingStrategyServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
import com.ruoyi.order.mapper.TChargingOrderAccountingStrategyMapper;
import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Service
public class TChargingOrderAccountingStrategyServiceImpl extends ServiceImpl<TChargingOrderAccountingStrategyMapper, TChargingOrderAccountingStrategy> implements TChargingOrderAccountingStrategyService {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.mapper.TChargingOrderMapper;
import com.ruoyi.order.service.TChargingOrderService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Service
public class TChargingOrderServiceImpl extends ServiceImpl<TChargingOrderMapper, TChargingOrder> implements TChargingOrderService {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TExchangeOrderServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.api.model.TExchangeOrder;
import com.ruoyi.order.mapper.TExchangeOrderMapper;
import com.ruoyi.order.service.TExchangeOrderService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Service
public class TExchangeOrderServiceImpl extends ServiceImpl<TExchangeOrderMapper, TExchangeOrder> implements TExchangeOrderService {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderAppealServiceImpl.java

New file
@@ -0,0 +1,85 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.query.TOrderAppealQuery;
import com.ruoyi.order.api.vo.TOrderAppealVO;
import com.ruoyi.order.mapper.*;
import com.ruoyi.order.service.TChargingOrderService;
import com.ruoyi.order.service.TOrderAppealService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Service
public class TOrderAppealServiceImpl extends ServiceImpl<TOrderAppealMapper, TOrderAppeal> implements TOrderAppealService {

    @Autowired
    private TChargingOrderMapper chargingOrderMapper;
    @Autowired
    private TExchangeOrderMapper exchangeOrderMapper;
    @Autowired
    private TShoppingOrderMapper shoppingOrderMapper;
    @Autowired
    private TVipOrderMapper vipOrderMapper;

    @Override
    public PageInfo<TOrderAppealVO> pageList(TOrderAppealQuery query) {
        PageInfo<TOrderAppealVO> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
        List<TOrderAppealVO> list = this.baseMapper.pageList(query,pageInfo);
        List<Long> orderIds = list.stream().map(TOrderAppealVO::getOrderId).collect(Collectors.toList());
        // 查询当前页的订单
        List<TChargingOrder> chargingOrders = chargingOrderMapper.selectList(Wrappers.lambdaQuery(TChargingOrder.class)
                .in(TChargingOrder::getId, orderIds));
        List<TExchangeOrder> exchangeOrders = exchangeOrderMapper.selectList(Wrappers.lambdaQuery(TExchangeOrder.class)
                .in(TExchangeOrder::getId, orderIds));
        List<TShoppingOrder> shoppingOrders = shoppingOrderMapper.selectList(Wrappers.lambdaQuery(TShoppingOrder.class)
                .in(TShoppingOrder::getId, orderIds));
        List<TVipOrder> vipOrders = vipOrderMapper.selectList(Wrappers.lambdaQuery(TVipOrder.class)
                .in(TVipOrder::getId, orderIds));
        list.forEach(item -> {
            if (item.getOrderType() == 1) {
                item.setChargingOrder(chargingOrders.stream().filter(chargingOrder -> chargingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null));
            } else if (item.getOrderType() == 2) {
                item.setExchangeOrder(exchangeOrders.stream().filter(exchangeOrder -> exchangeOrder.getId().equals(item.getOrderId())).findFirst().orElse(null));
            }else if (item.getOrderType() == 3) {
                item.setShoppingOrder(shoppingOrders.stream().filter(shoppingOrder -> shoppingOrder.getId().equals(item.getOrderId())).findFirst().orElse(null));
            }else if (item.getOrderType() == 4) {
                item.setVipOrder(vipOrders.stream().filter(vipOrder -> vipOrder.getId().equals(item.getOrderId())).findFirst().orElse(null));
            }
        });
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public TOrderAppealVO getDetailById(Integer id) {
        TOrderAppeal orderAppeal = this.baseMapper.selectById(id);
        TOrderAppealVO orderAppealVO = new TOrderAppealVO();
        BeanUtils.copyProperties(orderAppeal,orderAppealVO);
        // 查询申诉详情
        if (orderAppeal.getOrderType() == 1) {
            orderAppealVO.setChargingOrder(chargingOrderMapper.selectById(orderAppeal.getOrderId()));
        } else if (orderAppeal.getOrderType() == 2) {
            orderAppealVO.setExchangeOrder(exchangeOrderMapper.selectById(orderAppeal.getOrderId()));
        }else if (orderAppeal.getOrderType() == 3) {
            orderAppealVO.setShoppingOrder(shoppingOrderMapper.selectById(orderAppeal.getOrderId()));
        }else if (orderAppeal.getOrderType() == 4) {
            orderAppealVO.setVipOrder(vipOrderMapper.selectById(orderAppeal.getOrderId()));
        }
        return orderAppealVO;
    }
}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.api.model.TOrderEvaluate;
import com.ruoyi.order.mapper.TOrderEvaluateMapper;
import com.ruoyi.order.service.TOrderEvaluateService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Service
public class TOrderEvaluateServiceImpl extends ServiceImpl<TOrderEvaluateMapper, TOrderEvaluate> implements TOrderEvaluateService {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateTagServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.api.model.TOrderEvaluateTag;
import com.ruoyi.order.mapper.TOrderEvaluateTagMapper;
import com.ruoyi.order.service.TOrderEvaluateTagService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Service
public class TOrderEvaluateTagServiceImpl extends ServiceImpl<TOrderEvaluateTagMapper, TOrderEvaluateTag> implements TOrderEvaluateTagService {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceDetailServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.api.model.TOrderInvoiceDetail;
import com.ruoyi.order.mapper.TOrderInvoiceDetailMapper;
import com.ruoyi.order.service.TOrderInvoiceDetailService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Service
public class TOrderInvoiceDetailServiceImpl extends ServiceImpl<TOrderInvoiceDetailMapper, TOrderInvoiceDetail> implements TOrderInvoiceDetailService {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.api.model.TOrderInvoice;
import com.ruoyi.order.mapper.TOrderInvoiceMapper;
import com.ruoyi.order.service.TOrderInvoiceService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Service
public class TOrderInvoiceServiceImpl extends ServiceImpl<TOrderInvoiceMapper, TOrderInvoice> implements TOrderInvoiceService {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.mapper.TShoppingOrderMapper;
import com.ruoyi.order.service.TShoppingOrderService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Service
public class TShoppingOrderServiceImpl extends ServiceImpl<TShoppingOrderMapper, TShoppingOrder> implements TShoppingOrderService {

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TVipOrderServiceImpl.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.order.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.order.api.model.TVipOrder;
import com.ruoyi.order.mapper.TVipOrderMapper;
import com.ruoyi.order.service.TVipOrderService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2024-08-07
 */
@Service
public class TVipOrderServiceImpl extends ServiceImpl<TVipOrderMapper, TVipOrder> implements TVipOrderService {

}

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

New file
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.TChargingOrderAccountingStrategyMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TChargingOrderAccountingStrategy">
        <id column="id" property="id" />
        <result column="charging_order_id" property="chargingOrderId" />
        <result column="`type`" property="type" />
        <result column="start_time" property="startTime" />
        <result column="end_time" property="endTime" />
        <result column="electrovalence" property="electrovalence" />
        <result column="service_charge" property="serviceCharge" />
        <result column="cost_service_charge" property="costServiceCharge" />
        <result column="charging_capacity" property="chargingCapacity" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, charging_order_id, `type`, start_time, end_time, electrovalence, service_charge, cost_service_charge, charging_capacity
    </sql>

</mapper>

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

New file
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.TChargingOrderMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TChargingOrder">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="order_type" property="orderType" />
        <result column="order_classification" property="orderClassification" />
        <result column="app_user_id" property="appUserId" />
        <result column="app_user_car_id" property="appUserCarId" />
        <result column="parking_lot_id" property="parkingLotId" />
        <result column="charging_pile_id" property="chargingPileId" />
        <result column="charging_gun_id" property="chargingGunId" />
        <result column="start_time" property="startTime" />
        <result column="end_time" property="endTime" />
        <result column="status" property="status" />
        <result column="recharge_amount" property="rechargeAmount" />
        <result column="recharge_payment_type" property="rechargePaymentType" />
        <result column="recharge_payment_status" property="rechargePaymentStatus" />
        <result column="recharge_serial_number" property="rechargeSerialNumber" />
        <result column="order_amount" property="orderAmount" />
        <result column="app_coupon_id" property="appCouponId" />
        <result column="coupon_discount_amount" property="couponDiscountAmount" />
        <result column="vip_discount" property="vipDiscount" />
        <result column="vip_discount_amount" property="vipDiscountAmount" />
        <result column="payment_amount" property="paymentAmount" />
        <result column="refund_code" property="refundCode" />
        <result column="refund_amount" property="refundAmount" />
        <result column="refund_status" property="refundStatus" />
        <result column="refund_serial_number" property="refundSerialNumber" />
        <result column="refund_time" property="refundTime" />
        <result column="create_time" property="createTime" />
        <result column="del_flag" property="delFlag" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, code, order_type, order_classification, app_user_id, app_user_car_id, parking_lot_id, charging_pile_id, charging_gun_id, start_time, end_time, status, recharge_amount, recharge_payment_type, recharge_payment_status, recharge_serial_number, order_amount, app_coupon_id, coupon_discount_amount, vip_discount, vip_discount_amount, payment_amount, refund_code, refund_amount, refund_status, refund_serial_number, refund_time, create_time, del_flag
    </sql>

</mapper>

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

New file
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.TExchangeOrderMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TExchangeOrder">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="app_user_id" property="appUserId" />
        <result column="order_type" property="orderType" />
        <result column="goods_id" property="goodsId" />
        <result column="coupon_id" property="couponId" />
        <result column="purchase_quantity" property="purchaseQuantity" />
        <result column="app_user_address_id" property="appUserAddressId" />
        <result column="points" property="points" />
        <result column="remark" property="remark" />
        <result column="status" property="status" />
        <result column="express_company" property="expressCompany" />
        <result column="express_number" property="expressNumber" />
        <result column="consigner_id" property="consignerId" />
        <result column="consigner_time" property="consignerTime" />
        <result column="receiving_time" property="receivingTime" />
        <result column="cancellation_time" property="cancellationTime" />
        <result column="cancellation_id" property="cancellationId" />
        <result column="create_time" property="createTime" />
        <result column="del_flag" property="delFlag" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, code, app_user_id, order_type, goods_id, coupon_id, purchase_quantity, app_user_address_id, points, remark, status, express_company, express_number, consigner_id, consigner_time, receiving_time, cancellation_time, cancellation_id, create_time, del_flag
    </sql>

</mapper>

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

New file
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.TOrderAppealMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TOrderAppeal">
        <id column="id" property="id" />
        <result column="order_type" property="orderType" />
        <result column="order_id" property="orderId" />
        <result column="app_user_id" property="appUserId" />
        <result column="reason" property="reason" />
        <result column="content" property="content" />
        <result column="img_url" property="imgUrl" />
        <result column="status" property="status" />
        <result column="feedback" property="feedback" />
        <result column="feedback_user_id" property="feedbackUserId" />
        <result column="feedback_time" property="feedbackTime" />
        <result column="create_time" property="createTime" />
        <result column="del_flag" property="delFlag" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, order_type, order_id, app_user_id, reason, content, img_url, status,feedback, feedback_user_id, feedback_time, create_time, del_flag
    </sql>
    <select id="pageList" resultType="com.ruoyi.order.api.vo.TOrderAppealVO">
        SELECT
        <include refid="Base_Column_List"/>
        FROM t_order_appeal
        <where>
            <if test="query.appUserId != null">
                AND app_user_id = #{query.appUserId}
           </if>
            AND del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
        </where>
        ORDER BY create_time DESC
    </select>

</mapper>

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

New file
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.TOrderEvaluateMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TOrderEvaluate">
        <id column="id" property="id" />
        <result column="order_type" property="orderType" />
        <result column="order_id" property="orderId" />
        <result column="app_user_id" property="appUserId" />
        <result column="mark" property="mark" />
        <result column="content" property="content" />
        <result column="img_url" property="imgUrl" />
        <result column="evaluation_response" property="evaluationResponse" />
        <result column="create_time" property="createTime" />
        <result column="response_time" property="responseTime" />
        <result column="del_flag" property="delFlag" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, order_type, order_id, app_user_id, mark, content, img_url, evaluation_response, create_time, response_time, del_flag
    </sql>

</mapper>

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

New file
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.TOrderEvaluateTagMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TOrderEvaluateTag">
        <id column="id" property="id" />
        <result column="order_evaluate_id" property="orderEvaluateId" />
        <result column="evaluation_tag_id" property="evaluationTagId" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, order_evaluate_id, evaluation_tag_id
    </sql>

</mapper>

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

New file
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.TOrderInvoiceDetailMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TOrderInvoiceDetail">
        <id column="id" property="id" />
        <result column="order_invoice_id" property="orderInvoiceId" />
        <result column="order_type" property="orderType" />
        <result column="order_id" property="orderId" />
        <result column="invoice_amount" property="invoiceAmount" />
        <result column="electricity_tariff" property="electricityTariff" />
        <result column="service_tariff" property="serviceTariff" />
        <result column="added_service_tariff" property="addedServiceTariff" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, order_invoice_id, order_type, order_id, invoice_amount, electricity_tariff, service_tariff, added_service_tariff
    </sql>

</mapper>

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

New file
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.TOrderInvoiceMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TOrderInvoice">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="app_user_id" property="appUserId" />
        <result column="order_type" property="orderType" />
        <result column="invoicing_company" property="invoicingCompany" />
        <result column="invoice_type" property="invoiceType" />
        <result column="invoice_material" property="invoiceMaterial" />
        <result column="invoicing_method" property="invoicingMethod" />
        <result column="invoicing_object_type" property="invoicingObjectType" />
        <result column="name" property="name" />
        <result column="tax_identification_number" property="taxIdentificationNumber" />
        <result column="company_address" property="companyAddress" />
        <result column="company_phone" property="companyPhone" />
        <result column="deposit_bank" property="depositBank" />
        <result column="bank_account" property="bankAccount" />
        <result column="total_amount" property="totalAmount" />
        <result column="invoice_url" property="invoiceUrl" />
        <result column="mailbox" property="mailbox" />
        <result column="status" property="status" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, code, app_user_id, order_type, invoicing_company, invoice_type, invoice_material, invoicing_method, invoicing_object_type, name, tax_identification_number, company_address, company_phone, deposit_bank, bank_account, total_amount, invoice_url, mailbox, status
    </sql>

</mapper>

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

New file
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.TShoppingOrderMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TShoppingOrder">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="app_user_id" property="appUserId" />
        <result column="order_type" property="orderType" />
        <result column="goods_id" property="goodsId" />
        <result column="coupon_id" property="couponId" />
        <result column="purchase_quantity" property="purchaseQuantity" />
        <result column="app_user_address_id" property="appUserAddressId" />
        <result column="order_amount" property="orderAmount" />
        <result column="app_coupon_id" property="appCouponId" />
        <result column="coupon_discount_amount" property="couponDiscountAmount" />
        <result column="vip_discount" property="vipDiscount" />
        <result column="vip_discount_amount" property="vipDiscountAmount" />
        <result column="payment_amount" property="paymentAmount" />
        <result column="payment_status" property="paymentStatus" />
        <result column="payment_type" property="paymentType" />
        <result column="serial_number" property="serialNumber" />
        <result column="remark" property="remark" />
        <result column="status" property="status" />
        <result column="express_company" property="expressCompany" />
        <result column="express_number" property="expressNumber" />
        <result column="consigner_id" property="consignerId" />
        <result column="consigner_time" property="consignerTime" />
        <result column="receiving_time" property="receivingTime" />
        <result column="cancellation_time" property="cancellationTime" />
        <result column="cancellation_id" property="cancellationId" />
        <result column="refund_code" property="refundCode" />
        <result column="refund_amount" property="refundAmount" />
        <result column="refund_status" property="refundStatus" />
        <result column="refund_serial_number" property="refundSerialNumber" />
        <result column="refund_time" property="refundTime" />
        <result column="create_time" property="createTime" />
        <result column="del_flag" property="delFlag" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, code, app_user_id, order_type, goods_id, coupon_id, purchase_quantity, app_user_address_id, order_amount, app_coupon_id, coupon_discount_amount, vip_discount, vip_discount_amount, payment_amount, payment_status, payment_type, serial_number, remark, status, express_company, express_number, consigner_id, consigner_time, receiving_time, cancellation_time, cancellation_id, refund_code, refund_amount, refund_status, refund_serial_number, refund_time, create_time, del_flag
    </sql>

</mapper>

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

New file
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.order.mapper.TVipOrderMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.order.api.model.TVipOrder">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="app_user_id" property="appUserId" />
        <result column="type" property="type" />
        <result column="vip_id" property="vipId" />
        <result column="vip_type" property="vipType" />
        <result column="order_amount" property="orderAmount" />
        <result column="discount" property="discount" />
        <result column="discount_amount" property="discountAmount" />
        <result column="payment_amount" property="paymentAmount" />
        <result column="payment_status" property="paymentStatus" />
        <result column="payment_type" property="paymentType" />
        <result column="serial_number" property="serialNumber" />
        <result column="create_time" property="createTime" />
        <result column="del_flag" property="delFlag" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, code, app_user_id, `type`, vip_id, vip_type, order_amount, discount, discount_amount, payment_amount, payment_status, payment_type, serial_number, create_time, del_flag
    </sql>

</mapper>

 ruoyi-service/ruoyi-other/pom.xml

@@ -24,6 +24,14 @@
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-api-other</artifactId>
            <version>3.6.2</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-api-order</artifactId>
            <version>3.6.2</version>
            <scope>compile</scope>
        </dependency>
        <!-- SpringCloud Alibaba Nacos Config -->
        <dependency>

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityController.java

@@ -1,9 +1,16 @@
package com.ruoyi.other.controller;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TActivity;
import com.ruoyi.other.api.domain.TAdvertising;
import com.ruoyi.other.api.dto.AdvertisingDTO;
import com.ruoyi.other.service.TActivityService;
import com.ruoyi.other.service.TAdvertisingService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -14,8 +21,38 @@
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/t-activity")
@RequestMapping("/activity")
public class TActivityController {

    @Autowired
    private TActivityService activityService;
    @PostMapping("/saveActivity")
    @ApiOperation(tags = {"管理后台-活动管理"},value = "活动添加")
    public AjaxResult saveActivity(@RequestBody TActivity dto) {
        activityService.save(dto);
        return AjaxResult.success();
    }
    @GetMapping("/delete")
    @ApiOperation(tags = {"管理后台-活动管理"},value = "活动删除")
    public AjaxResult delete(Integer id) {
        activityService.removeById(id);
        return AjaxResult.success();
    }
    @PostMapping("/updateVip")
    @ApiOperation(tags = {"管理后台-活动管理"},value = "活动修改")
    public AjaxResult updateActivity(@RequestBody TActivity dto) {
        activityService.updateById(dto);
        return AjaxResult.success();
    }
    @GetMapping("/getInfo")
    @ApiOperation(tags = {"管理后台-活动管理"},value = "活动查看详情")
    public AjaxResult<TActivity> getInfo(Integer id) {
        return AjaxResult.ok(activityService.getById(id));
    }
    @ApiOperation(tags = {"管理后台-活动管理"},value = "活动列表分页查询")
    @PostMapping(value = "/pageList")
    public AjaxResult<PageInfo<TActivity>> pageList(@RequestBody AdvertisingDTO dto) {
        return AjaxResult.ok(activityService.pageList(dto));
    }
}


 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TAdvertisingController.java

@@ -1,9 +1,18 @@
package com.ruoyi.other.controller;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TAdvertising;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.dto.AdvertisingDTO;
import com.ruoyi.other.service.TAdvertisingService;
import com.ruoyi.other.service.TVipService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -14,8 +23,38 @@
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/t-advertising")
@RequestMapping("/advertising")
public class TAdvertisingController {

    @Autowired
    private TAdvertisingService advertisingService;
    @PostMapping("/saveAdvertising")
    @ApiOperation(tags = {"管理后台-广告管理"},value = "广告添加")
    public AjaxResult saveAdvertising(@RequestBody TAdvertising dto) {
        advertisingService.save(dto);
        return AjaxResult.success();
    }
    @GetMapping("/delete")
    @ApiOperation(tags = {"管理后台-广告管理"},value = "广告删除")
    public AjaxResult delete(Integer id) {
        advertisingService.removeById(id);
        return AjaxResult.success();
    }
    @PostMapping("/updateVip")
    @ApiOperation(tags = {"管理后台-广告管理"},value = "广告修改")
    public AjaxResult updateVip(@RequestBody TAdvertising dto) {
        advertisingService.updateById(dto);
        return AjaxResult.success();
    }
    @GetMapping("/getInfo")
    @ApiOperation(tags = {"管理后台-广告管理"},value = "广告查看详情")
    public AjaxResult<TAdvertising> getInfo(Integer id) {
        return AjaxResult.ok(advertisingService.getById(id));
    }
    @ApiOperation(tags = {"管理后台-广告管理"},value = "广告列表分页查询")
    @PostMapping(value = "/pageList")
    public AjaxResult<PageInfo<TAdvertising>> pageList(@RequestBody AdvertisingDTO dto) {
        return AjaxResult.ok(advertisingService.pageList(dto));
    }
}


 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEnterpriseUserApplicationController.java

@@ -1,6 +1,15 @@
package com.ruoyi.other.controller;


import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.TEnterpriseUserApplication;
import com.ruoyi.other.service.TEnterpriseUserApplicationService;
import com.sun.xml.internal.bind.v2.TODO;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;
@@ -17,5 +26,22 @@
@RequestMapping("/t-enterprise-user-application")
public class TEnterpriseUserApplicationController {

    private final TEnterpriseUserApplicationService enterpriseUserApplicationService;

    @Autowired
    public TEnterpriseUserApplicationController(TEnterpriseUserApplicationService enterpriseUserApplicationService) {
        this.enterpriseUserApplicationService = enterpriseUserApplicationService;
    }

    /**
     * 添加计费策略管理
     */
    @ApiOperation(tags = {"小程序-计费策略"},value = "添加集团用户申请")
    @PostMapping(value = "/add")
    public AjaxResult<Boolean> add(@RequestBody TEnterpriseUserApplication dto) {
        // TODO 用户id
        return AjaxResult.ok(enterpriseUserApplicationService.save(dto));
    }

}


 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TGoodsController.java

@@ -1,9 +1,18 @@
package com.ruoyi.other.controller;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TActivity;
import com.ruoyi.other.api.domain.TGoods;
import com.ruoyi.other.api.dto.AdvertisingDTO;
import com.ruoyi.other.api.dto.GoodsDTO;
import com.ruoyi.other.service.TActivityService;
import com.ruoyi.other.service.TAdvertisingService;
import com.ruoyi.other.service.TGoodsService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -16,6 +25,37 @@
@RestController
@RequestMapping("/t-goods")
public class TGoodsController {

    @Autowired
    private TGoodsService goodsService;
    @Autowired
    private TActivityService activityService;
    @PostMapping("/saveGoods")
    @ApiOperation(tags = {"管理后台-商品管理"},value = "商品添加")
    public AjaxResult saveActivity(@RequestBody TGoods dto) {
        goodsService.save(dto);
        return AjaxResult.success();
    }
    @GetMapping("/delete")
    @ApiOperation(tags = {"管理后台-商品管理"},value = "商品删除")
    public AjaxResult delete(Integer id) {
        goodsService.removeById(id);
        return AjaxResult.success();
    }
    @PostMapping("/updateVip")
    @ApiOperation(tags = {"管理后台-商品管理"},value = "商品修改")
    public AjaxResult updateActivity(@RequestBody TGoods dto) {
        goodsService.updateById(dto);
        return AjaxResult.success();
    }
    @GetMapping("/getInfo")
    @ApiOperation(tags = {"管理后台-商品管理"},value = "商品查看详情")
    public AjaxResult<TGoods> getInfo(Integer id) {
        return AjaxResult.ok(goodsService.getById(id));
    }
    @ApiOperation(tags = {"管理后台-商品管理"},value = "商品列表分页查询")
    @PostMapping(value = "/pageList")
    public AjaxResult<PageInfo<TGoods>> pageList(@RequestBody GoodsDTO dto) {
        return AjaxResult.ok(goodsService.pageList(dto));
    }
}


 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java

@@ -1,10 +1,20 @@
package com.ruoyi.other.controller;
import java.time.LocalDateTime;
import java.util.Date;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.THtml;
import com.ruoyi.other.api.domain.TIntegralRule;
import com.ruoyi.other.api.dto.SaveIntegralDTO;
import com.ruoyi.other.service.THtmlService;
import com.ruoyi.other.service.TIntegralRuleService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
@@ -18,24 +28,70 @@
@RestController
@RequestMapping("/integral")
public class TIntegralRuleController {
    @Autowired
    private THtmlService htmlService;
    @Autowired
    private TIntegralRuleService integralRuleService;
    @GetMapping("/getSet")
    @ApiOperation(value = "获取积分设置")
    public R<SaveIntegralDTO> getSet() {
        return R.ok();
    public R<TIntegralRule> getSet() {
        TIntegralRule res = integralRuleService.getOne(new QueryWrapper<>());
        return R.ok(res);
    }
    @PostMapping("/saveSet")
    @ApiOperation(value = "保存积分设置")
    public R saveSet(@RequestBody SaveIntegralDTO dto) {
    public R saveSet(@RequestBody TIntegralRule dto) {
        integralRuleService.updateById(dto);
        return R.ok();
    }
    @PostMapping("/getInfo")
    @ApiOperation(value = "获取积分说明")
    public R getInfo() {
        return R.ok();
    @GetMapping("/getInfo")
    @ApiOperation(value = "type 1=积分规则说明，" +
            "2=会员折扣说明，" +
            "3=优惠券说明，" +
            "4=双倍积分说明，" +
            "5=商城专享价说明，" +
            "6=会员协议，" +
            "7=用户协议，" +
            "8=隐私协议，" +
            "9=邀请好友说明，" +
            "10=资质证明，" +
            "11=开票说明")
    public R<String> getInfo(Integer type) {
        THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",type));
        return R.ok(g.getContent());
    }
    @PostMapping("/saveInfo")
    @GetMapping("/saveInfo")
    @ApiOperation(value = "保存积分说明")
    public R saveInfo() {
    @ApiImplicitParams({
            @ApiImplicitParam(name = "info", value = "内容", required = true),
            @ApiImplicitParam(name = "type", value = "type 1=积分规则说明，\" +\n" +
                    "            \"2=会员折扣说明，\" +\n" +
                    "            \"3=优惠券说明，\" +\n" +
                    "            \"4=双倍积分说明，\" +\n" +
                    "            \"5=商城专享价说明，\" +\n" +
                    "            \"6=会员协议，\" +\n" +
                    "            \"7=用户协议，\" +\n" +
                    "            \"8=隐私协议，\" +\n" +
                    "            \"9=邀请好友说明，\" +\n" +
                    "            \"10=资质证明，\" +\n" +
                    "            \"11=开票说明\"", required = true),

    })
    public R saveInfo(String info,Integer type) {
        THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",type));
        if (g == null){
            THtml tHtml = new THtml();
            tHtml.setType(type);
            tHtml.setContent(info);


            tHtml.setCreateTime(LocalDateTime.now());
            tHtml.setDelFlag(false);
            htmlService.save(tHtml);
        }else{
            g.setContent(info);
            htmlService.updateById(g);
        }
        return R.ok();
    }
}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TVipController.java

@@ -1,9 +1,18 @@
package com.ruoyi.other.controller;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TIntegralRule;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.service.TVipService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -14,8 +23,42 @@
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/t-vip")
@RequestMapping("/vip")
public class TVipController {
    @Autowired
    private TVipService vipService;
    @PostMapping("/saveVip")
    @ApiOperation(value = "会员添加")
    public AjaxResult saveVip(@RequestBody TVip dto) {
        vipService.save(dto);
        return AjaxResult.success();
    }
    @GetMapping("/delete")
    @ApiOperation(value = "会员删除")
    public AjaxResult delete(Integer id) {
        vipService.removeById(id);
        return AjaxResult.success();
    }
    @PostMapping("/updateVip")
    @ApiOperation(value = "会员修改")
    public AjaxResult updateVip(@RequestBody TVip dto) {
            vipService.updateById(dto);
        return AjaxResult.success();
    }
    @GetMapping("/getInfo")
    @ApiOperation(value = "会员查看详情")
    public AjaxResult<TVip> getInfo(Integer id) {
        return AjaxResult.ok(vipService.getById(id));
    }
    @ApiOperation(value = "会员列表分页查询")
    @PostMapping(value = "/pageList")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "pageCurr", value = "分页参数，当前页码", required = true),
            @ApiImplicitParam(name = "pageSize", value = "分页参数，每页数量",required = true)
    })
    public AjaxResult<PageInfo<TVip>> pageList(Integer pageCurr,Integer pageSize) {
        return AjaxResult.ok(vipService.pageList(pageCurr,pageSize));
    }

}


 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysDictDataMapper.java

New file
@@ -0,0 +1,17 @@
package com.ruoyi.other.mapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.other.api.domain.SysDictData;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author 无关风月
 * @since 2024-08-06
 */
public interface SysDictDataMapper extends BaseMapper<SysDictData> {

}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysDictTypeMapper.java

New file
@@ -0,0 +1,17 @@
package com.ruoyi.other.mapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.other.api.domain.SysDictType;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author 无关风月
 * @since 2024-08-06
 */
public interface SysDictTypeMapper extends BaseMapper<SysDictType> {

}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysNoticeMapper.java

New file
@@ -0,0 +1,16 @@
package com.ruoyi.other.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.other.api.domain.SysNotice;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author 无关风月
 * @since 2024-08-06
 */
public interface SysNoticeMapper extends BaseMapper<SysNotice> {

}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TActivityMapper.java

@@ -1,7 +1,13 @@
package com.ruoyi.other.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TActivity;
import com.ruoyi.other.api.domain.TAdvertising;
import com.ruoyi.other.api.dto.AdvertisingDTO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,5 @@
 */
public interface TActivityMapper extends BaseMapper<TActivity> {

    List<TActivity> pageList(@Param("pageInfo")PageInfo<TActivity> pageInfo, @Param("req") AdvertisingDTO dto);
}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TAdvertisingMapper.java

@@ -1,7 +1,12 @@
package com.ruoyi.other.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TAdvertising;
import com.ruoyi.other.api.dto.AdvertisingDTO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +18,5 @@
 */
public interface TAdvertisingMapper extends BaseMapper<TAdvertising> {

    List<TAdvertising> pageList(@Param("pageInfo")PageInfo<TAdvertising> pageInfo,@Param("req") AdvertisingDTO dto);
}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TGoodsMapper.java

@@ -1,7 +1,13 @@
package com.ruoyi.other.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TActivity;
import com.ruoyi.other.api.domain.TGoods;
import com.ruoyi.other.api.dto.GoodsDTO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,6 @@
 */
public interface TGoodsMapper extends BaseMapper<TGoods> {

    List<TGoods> pageList(@Param("pageInfo")PageInfo<TGoods> pageInfo, @Param("req") GoodsDTO dto);

}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TVipMapper.java

@@ -1,7 +1,11 @@
package com.ruoyi.other.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TVip;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +17,6 @@
 */
public interface TVipMapper extends BaseMapper<TVip> {

    List<TVip> pageList( @Param("pageInfo")PageInfo<TVip> pageInfo);

}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TActivityService.java

@@ -1,7 +1,9 @@
package com.ruoyi.other.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TActivity;
import com.ruoyi.other.api.dto.AdvertisingDTO;

/**
 * <p>
@@ -13,4 +15,5 @@
 */
public interface TActivityService extends IService<TActivity> {

    PageInfo<TActivity> pageList(AdvertisingDTO dto);
}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TAdvertisingService.java

@@ -1,7 +1,9 @@
package com.ruoyi.other.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TAdvertising;
import com.ruoyi.other.api.dto.AdvertisingDTO;

/**
 * <p>
@@ -13,4 +15,5 @@
 */
public interface TAdvertisingService extends IService<TAdvertising> {

    PageInfo<TAdvertising> pageList(AdvertisingDTO dto);
}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TGoodsService.java

@@ -1,7 +1,9 @@
package com.ruoyi.other.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TGoods;
import com.ruoyi.other.api.dto.GoodsDTO;

/**
 * <p>
@@ -13,4 +15,6 @@
 */
public interface TGoodsService extends IService<TGoods> {

    PageInfo<TGoods> pageList(GoodsDTO dto);

}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java

@@ -1,6 +1,7 @@
package com.ruoyi.other.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TVip;

/**
@@ -13,4 +14,7 @@
 */
public interface TVipService extends IService<TVip> {

    PageInfo<TVip> pageList(Integer pageCurr,Integer pageSize);


}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TActivityServiceImpl.java

@@ -1,10 +1,16 @@
package com.ruoyi.other.service.impl;

import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TActivity;
import com.ruoyi.other.api.domain.TAdvertising;
import com.ruoyi.other.api.dto.AdvertisingDTO;
import com.ruoyi.other.mapper.TActivityMapper;
import com.ruoyi.other.service.TActivityService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

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

/**
 * <p>
@@ -17,4 +23,22 @@
@Service
public class TActivityServiceImpl extends ServiceImpl<TActivityMapper, TActivity> implements TActivityService {

    @Override
    public PageInfo<TActivity> pageList(AdvertisingDTO dto) {

        PageInfo<TActivity> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
        List<TActivity> list = this.baseMapper.pageList(pageInfo,dto);
        for (TActivity tAdvertising : list) {
            // 如果开始时间大于当前时间 那么设置状态startState为1 未开始
            if (tAdvertising.getStartTime().isAfter(LocalDateTime.now())) {
                tAdvertising.setStartState(1);
            } else if (tAdvertising.getEndTime().isBefore(LocalDateTime.now())) {
                tAdvertising.setStartState(3);
            } else {
                tAdvertising.setStartState(2);
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java

@@ -1,10 +1,16 @@
package com.ruoyi.other.service.impl;

import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TAdvertising;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.api.dto.AdvertisingDTO;
import com.ruoyi.other.mapper.TAdvertisingMapper;
import com.ruoyi.other.service.TAdvertisingService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

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

/**
 * <p>
@@ -17,4 +23,22 @@
@Service
public class TAdvertisingServiceImpl extends ServiceImpl<TAdvertisingMapper, TAdvertising> implements TAdvertisingService {

    @Override
    public PageInfo<TAdvertising> pageList(AdvertisingDTO dto) {

        PageInfo<TAdvertising> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
        List<TAdvertising> list = this.baseMapper.pageList(pageInfo,dto);
        for (TAdvertising tAdvertising : list) {
            // 如果开始时间大于当前时间 那么设置状态startState为1 未开始
            if (tAdvertising.getStartTime().isAfter(LocalDateTime.now())) {
                tAdvertising.setStartState(1);
            } else if (tAdvertising.getEndTime().isBefore(LocalDateTime.now())) {
                tAdvertising.setStartState(3);
            } else {
                tAdvertising.setStartState(2);
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java

@@ -1,10 +1,17 @@
package com.ruoyi.other.service.impl;

import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.other.api.domain.TGoods;
import com.ruoyi.other.api.dto.GoodsDTO;
import com.ruoyi.other.mapper.TGoodsMapper;
import com.ruoyi.other.service.TGoodsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.util.List;

/**
 * <p>
@@ -17,4 +24,27 @@
@Service
public class TGoodsServiceImpl extends ServiceImpl<TGoodsMapper, TGoods> implements TGoodsService {

    @Autowired
    private OrderClient orderClient;
    @Override
    public PageInfo<TGoods> pageList(GoodsDTO dto) {
        PageInfo<TGoods> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
        List<TGoods> list = this.baseMapper.pageList(pageInfo,dto);

        StringBuilder stringBuilder = new StringBuilder();
        for (TGoods temp : list) {
            stringBuilder.append(temp.getId()).append(",");
        }
        if (StringUtils.hasLength(stringBuilder)){
            // 去除最后一个字符
            stringBuilder.deleteCharAt(stringBuilder.length()-1);
        }
        String string = stringBuilder.toString();
        List<Integer> data = orderClient.getSalesCountByGoodsId(string).getData();

//        goodsClient
        // 远程调用cha'xun
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java

@@ -1,10 +1,13 @@
package com.ruoyi.other.service.impl;

import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.other.api.domain.TVip;
import com.ruoyi.other.mapper.TVipMapper;
import com.ruoyi.other.service.TVipService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +20,11 @@
@Service
public class TVipServiceImpl extends ServiceImpl<TVipMapper, TVip> implements TVipService {

    @Override
    public PageInfo<TVip> pageList(Integer pageCurr,Integer pageSize) {
        PageInfo<TVip> pageInfo = new PageInfo<>(pageCurr,pageSize);
        List<TVip> list = this.baseMapper.pageList(pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.GenTableColumnMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.GenTableColumn">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.GenTableColumn">
        <id column="column_id" property="columnId" />
        <result column="table_id" property="tableId" />
        <result column="column_name" property="columnName" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.GenTableMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.GenTable">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.GenTable">
        <id column="table_id" property="tableId" />
        <result column="table_name" property="tableName" />
        <result column="table_comment" property="tableComment" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.SysDictDataMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.SysDictData">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.SysDictData">
        <id column="dict_code" property="dictCode" />
        <result column="dict_sort" property="dictSort" />
        <result column="dict_label" property="dictLabel" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.SysDictTypeMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.SysDictType">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.SysDictType">
        <id column="dict_id" property="dictId" />
        <result column="dict_name" property="dictName" />
        <result column="dict_type" property="dictType" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.SysNoticeMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.SysNotice">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.SysNotice">
        <id column="notice_id" property="noticeId" />
        <result column="notice_title" property="noticeTitle" />
        <result column="notice_type" property="noticeType" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TActivityMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TActivity">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TActivity">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="img" property="img" />
@@ -20,5 +20,24 @@
    <sql id="Base_Column_List">
        id, name, img, start_time, end_time, jump_type, jump_url, status, create_time, del_flag
    </sql>
    <select id="pageList" resultType="com.ruoyi.other.api.domain.TActivity">
        select * from t_activity
        <where>
            <if test="req.name != null and req.name != ''">
                AND  `name` LIKE concat('%',#{req.name}, '%')
            </if>
            <if test="req.state == 1">
                AND  start_time >= NOW()
            </if>
            <if test="req.state == 2">
                AND  start_time &lt;= NOW() AND end_time >= NOW()
            </if>
            <if test="req.state == 3">
                AND  end_time &lt;= NOW()
            </if>
            AND del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
        </where>
        ORDER BY create_time DESC
    </select>

</mapper>

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TAdvertisingMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TAdvertising">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TAdvertising">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="img" property="img" />
@@ -21,5 +21,24 @@
    <sql id="Base_Column_List">
        id, name, img, start_time, end_time, position, jump_type, jump_url, status, create_time, del_flag
    </sql>
    <select id="pageList" resultType="com.ruoyi.other.api.domain.TAdvertising">
        select * from t_advertising
        <where>
            <if test="req.name != null and req.name != ''">
                AND  `name` LIKE concat('%',#{req.name}, '%')
            </if>
            <if test="req.state == 1">
                AND  start_time >= NOW()
            </if>
            <if test="req.state == 2">
                AND  start_time &lt;= NOW() AND end_time >= NOW()
            </if>
            <if test="req.state == 3">
                AND  end_time &lt;= NOW()
            </if>
            AND del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
        </where>
        ORDER BY create_time DESC
    </select>

</mapper>

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TCompanyMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TCompany">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TCompany">
        <id column="id" property="id" />
        <result column="code" property="code" />
        <result column="name" property="name" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TCouponMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TCoupon">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TCoupon">
        <id column="id" property="id" />
        <result column="type" property="type" />
        <result column="name" property="name" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TEnterpriseUserApplicationMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TEnterpriseUserApplication">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TEnterpriseUserApplication">
        <id column="id" property="id" />
        <result column="app_user_id" property="appUserId" />
        <result column="company_name" property="companyName" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TEvaluationTagMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TEvaluationTag">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TEvaluationTag">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="type" property="type" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TGoodsMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TGoods">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TGoods">
        <id column="id" property="id" />
        <result column="type" property="type" />
        <result column="name" property="name" />
@@ -30,5 +30,24 @@
    <sql id="Base_Column_List">
        id, type, name, cover_picture, details_picture, dispatch_address, service_description, original_price, preferential_price, vip_price, redeem_points, limit_exchange_times, inventory, underlying_sales, describe, introduce, explain, status, create_time, del_flag
    </sql>
    <select id="pageList" resultType="com.ruoyi.other.api.domain.TGoods">
        select * from t_goods
        <where>
            <if test="req.name != null and req.name != ''">
                AND  `name` LIKE concat('%',#{req.name}, '%')
            </if>
            <if test="req.type != null">
                AND  `type` = #{req.type}
            </if>
            <if test="req.status != null">
                AND  status = #{req.status}
            </if>
            <if test="req.otherState != null and req.otherState = 2">
                AND  inventory = 0
            </if>
            AND del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
        </where>
        ORDER BY create_time DESC
    </select>

</mapper>

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.THtmlMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.THtml">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.THtml">
        <id column="id" property="id" />
        <result column="type" property="type" />
        <result column="content" property="content" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TIntegralRuleMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TIntegralRule">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TIntegralRule">
        <id column="id" property="id" />
        <result column="charge_credit" property="chargeCredit" />
        <result column="credit" property="credit" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TInvoiceTypeMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TInvoiceType">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TInvoiceType">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="invoicing_company" property="invoicingCompany" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TNoticeMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TNotice">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TNotice">
        <id column="id" property="id" />
        <result column="content" property="content" />
        <result column="start_time" property="startTime" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TRoleSiteMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TRoleSite">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TRoleSite">
        <id column="id" property="id" />
        <result column="role_id" property="roleId" />
        <result column="site_id" property="siteId" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TSystemConfigurationMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TSystemConfiguration">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TSystemConfiguration">
        <id column="id" property="id" />
        <result column="type" property="type" />
        <result column="content" property="content" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TUserSiteMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TUserSite">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TUserSite">
        <id column="id" property="id" />
        <result column="user_id" property="userId" />
        <result column="site_id" property="siteId" />

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TUserTagMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TUserTag">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TUserTag">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="standard_condition" property="standardCondition" />

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

File was deleted

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.other.mapper.TVipMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.other.model.TVip">
    <resultMap id="BaseResultMap" type="com.ruoyi.other.api.domain.TVip">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="reveal" property="reveal" />
@@ -39,5 +39,11 @@
    <sql id="Base_Column_List">
        id, name, reveal, monthly_card, monthly_card_reveal, monthly_card_discount, monthly_card_discount_start, monthly_card_discount_end, monthly_card_discount_reveal, season_card, season_card_reveal, season_card_discount, season_card_discount_start, season_card_discount_end, season_card_discount_reveal, annual_card, annual_card_reveal, annual_card_discount, annual_card_discount_start, annual_card_discount_end, annual_card_discount_reveal, discount_times, maximum_deduction, deduction_type, coupon, double_integration, mall_exclusive_price, create_time, del_flag
    </sql>
    <select id="pageList" resultType="com.ruoyi.other.api.domain.TVip">
        select * from t_vip
            where
             del_flag = ${@com.ruoyi.common.core.enums.DelFlagEnum@NO.getCode()}
        ORDER BY create_time DESC
    </select>

</mapper>