8.7

luodangjia

2024-08-07 556737eabee039000c817005311cd65f0dd48786

8.7

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UnitListQueryDto.java

New file
@@ -0,0 +1,9 @@
package com.ruoyi.account.api.dto;

import com.ruoyi.common.core.web.page.BasePage;
import lombok.Data;

@Data
public class UnitListQueryDto extends BasePage {
    String companyName;
}

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java

New file
@@ -0,0 +1,86 @@
package com.ruoyi.account.api.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
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;
import java.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_coupon")
@ApiModel(value="TAppCoupon对象", description="")
public class TAppCoupon implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId("id")
    private Long id;

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

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

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

    @ApiModelProperty(value = "获得方式（1=积分兑换，2=现金购买）")
    @TableField("ways_to_obtain")
    private Integer waysToObtain;

    @ApiModelProperty(value = "兑换积分")
    @TableField("redeem_points")
    private Integer redeemPoints;

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

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

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

    @ApiModelProperty(value = "支付完成时间")
    @TableField("payment_time")
    private LocalDateTime paymentTime;

    @ApiModelProperty(value = "状态（1=未使用，2=已使用）")
    @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-account/src/main/java/com/ruoyi/account/api/model/TAppUser.java

New file
@@ -0,0 +1,113 @@
package com.ruoyi.account.api.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
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.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user")
@ApiModel(value="TAppUser对象", description="")
public class TAppUser implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId("id")
    private Long id;

    @ApiModelProperty(value = "用户")
    @TableField("name")
    private String name;

    @ApiModelProperty(value = "手机号")
    @TableField("phone")
    private String phone;

    @ApiModelProperty(value = "头像")
    @TableField("avatar")
    private String avatar;

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

    @ApiModelProperty(value = "会员到期时间")
    @TableField("vip_end_time")
    private LocalDateTime vipEndTime;

    @ApiModelProperty(value = "单位id")
    @TableField("company_id")
    private Integer companyId;

    @ApiModelProperty(value = "身份证号")
    @TableField("id_card")
    private String idCard;

    @ApiModelProperty(value = "认证状态（0=否，1=是）")
    @TableField("auth_status")
    private Integer authStatus;

    @ApiModelProperty(value = "微信openid")
    @TableField("wx_openid")
    private String wxOpenid;

    @ApiModelProperty(value = "支付宝openid")
    @TableField("ali_openid")
    private String aliOpenid;

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

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

    @ApiModelProperty(value = "省区划代码")
    @TableField("province_code")
    private String provinceCode;

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

    @ApiModelProperty(value = "市区划代码")
    @TableField("city_code")
    private String cityCode;

    @ApiModelProperty(value = "状态（1=正常，2=冻结，3=注销）")
    @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("last_login_time")
    private LocalDateTime lastLoginTime;


}

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserAddress.java

New file
@@ -0,0 +1,81 @@
package com.ruoyi.account.api.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
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.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_address")
@ApiModel(value="TAppUserAddress对象", description="")
public class TAppUserAddress implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId("id")
    private Long id;

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

    @ApiModelProperty(value = "收货人")
    @TableField("name")
    private String name;

    @ApiModelProperty(value = "手机号码")
    @TableField("phone")
    private String phone;

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

    @ApiModelProperty(value = "市编号")
    @TableField("city_code")
    private String cityCode;

    @ApiModelProperty(value = "详细地址")
    @TableField("address")
    private String address;

    @ApiModelProperty(value = "经度")
    @TableField("lon")
    private String lon;

    @ApiModelProperty(value = "纬度")
    @TableField("lat")
    private String lat;

    @ApiModelProperty(value = "默认地址（0=否，1=是）")
    @TableField("default_address")
    private Integer defaultAddress;

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

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


}

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserCar.java

New file
@@ -0,0 +1,69 @@
package com.ruoyi.account.api.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
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.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_car")
@ApiModel(value="TAppUserCar对象", description="")
public class TAppUserCar implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId("id")
    private Long id;

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

    @ApiModelProperty(value = "车牌")
    @TableField("license_plate")
    private String licensePlate;

    @ApiModelProperty(value = "车辆品牌")
    @TableField("vehicle_brand")
    private String vehicleBrand;

    @ApiModelProperty(value = "车型")
    @TableField("vehicle_model")
    private String vehicleModel;

    @ApiModelProperty(value = "车辆用途")
    @TableField("vehicle_use")
    private String vehicleUse;

    @ApiModelProperty(value = "续航")
    @TableField("endurance")
    private String endurance;

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

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


}

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserIntegralChange.java

New file
@@ -0,0 +1,63 @@
package com.ruoyi.account.api.model;

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.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_integral_change")
@ApiModel(value="TAppUserIntegralChange对象", description="")
public class TAppUserIntegralChange implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId("id")
    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=邀请好友得，5=添加车辆得，6=兑换商品减）")
    @TableField("change_type")
    private Integer changeType;

    @ApiModelProperty(value = "历史积分")
    @TableField("historical_integral")
    private Integer historicalIntegral;

    @ApiModelProperty(value = "当前积分")
    @TableField("current_integral")
    private Integer currentIntegral;

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

    @ApiModelProperty(value = "扩展字段")
    @TableField("extension")
    private String extension;


}

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserSign.java

New file
@@ -0,0 +1,52 @@
package com.ruoyi.account.api.model;

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.time.LocalDate;
import java.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_sign")
@ApiModel(value="TAppUserSign对象", description="")
public class TAppUserSign implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId("id")
    private Long id;

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

    @ApiModelProperty(value = "签到天")
    @TableField("sign_day")
    private LocalDate signDay;

    @ApiModelProperty(value = "奖励积分")
    @TableField("reward_points")
    private Integer rewardPoints;

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


}

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppUserTag.java

New file
@@ -0,0 +1,47 @@
package com.ruoyi.account.api.model;

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.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_app_user_tag")
@ApiModel(value="TAppUserTag对象", description="")
public class TAppUserTag implements Serializable {

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId("id")
    private Long id;

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

    @ApiModelProperty(value = "用户标签id")
    @TableField("user_tag_id")
    private Integer userTagId;

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


}

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInviteUser.java

New file
@@ -0,0 +1,52 @@
package com.ruoyi.account.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.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_invite_user")
@ApiModel(value="TInviteUser对象", description="")
public class TInviteUser implements Serializable {

    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 = "被邀请用户id")
    @TableField("be_invited_app_user_id")
    private Long beInvitedAppUserId;

    @ApiModelProperty(value = "奖励积分")
    @TableField("award")
    private Integer award;

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


}

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java

New file
@@ -0,0 +1,84 @@
package com.ruoyi.account.api.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
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.time.LocalDateTime;

/**
 * <p>
 * 
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_invoice_information")
@ApiModel(value="TInvoiceInformation对象", description="")
public class TInvoiceInformation implements Serializable {

    private static final long serialVersionUID = 1L;

    @TableId("id")
    private Long id;

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

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

    @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 = "设置默认（0=否，1=是）")
    @TableField("default")
    private Integer default;

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

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


}

 ruoyi-api/ruoyi-api-other/pom.xml

@@ -28,6 +28,12 @@
                </exclusion>
            </exclusions>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-api-account</artifactId>
            <version>3.6.2</version>
            <scope>compile</scope>
        </dependency>

    </dependencies>


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

@@ -49,6 +49,9 @@
    @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/factory/OtherFallbackFactory.java

New file
@@ -0,0 +1,45 @@
package com.ruoyi.other.api.factory;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.dto.UnitListQueryDto;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.TCompany;
import com.ruoyi.other.api.feignClient.GoodsClient;
import com.ruoyi.other.api.feignClient.OtherClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;

/**
 * 商品服务降级处理
 * 
 * @author ruoyi
 */
@Component
public class OtherFallbackFactory implements FallbackFactory<OtherClient>
{
    private static final Logger log = LoggerFactory.getLogger(OtherFallbackFactory.class);

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

            @Override
            public R<Page<TCompany>> queryUnitPage(UnitListQueryDto unitListQueryDto) {
                return R.fail("查询单位列表失败:" + throwable.getMessage());
            }

            @Override
            public R unitAddorUpadate(TCompany tCompany) {
                return R.fail("单位添加失败:" + throwable.getMessage());
            }

            @Override
            public R unitDelete(Integer id) {
                return R.fail("删除单位失败:" + throwable.getMessage());
            }
        };
    }
}

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

New file
@@ -0,0 +1,29 @@
package com.ruoyi.other.api.feignClient;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.dto.UnitListQueryDto;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.TCompany;
import com.ruoyi.other.api.factory.GoodsFallbackFactory;
import com.ruoyi.other.api.factory.OtherFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;

/**
 * 商品服务
 * @author ruoyi
 */
@FeignClient(contextId = "UnitClient", value = ServiceNameConstants.CONTRACT_SERVICE, fallbackFactory = OtherFallbackFactory.class)
public interface OtherClient {

    @PostMapping(value = "/t-company/unit/page")
    R<Page<TCompany>> queryUnitPage(@RequestBody UnitListQueryDto unitListQueryDto);

    @PostMapping(value = "/t-company/unit/addOrUpdate")
    R unitAddorUpadate(@RequestBody TCompany tCompany);
    @PostMapping(value = "/t-company/unit/delete")
    R unitDelete(@RequestParam Integer id);
}

 ruoyi-service/ruoyi-account/pom.xml

@@ -100,6 +100,18 @@
            <artifactId>spring-boot-starter-test</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-api-account</artifactId>
            <version>3.6.2</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.ruoyi</groupId>
            <artifactId>ruoyi-api-other</artifactId>
            <version>3.6.2</version>
            <scope>compile</scope>
        </dependency>

    </dependencies>


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppCouponController.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.account.controller;


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

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/t-app-coupon")
public class TAppCouponController {

}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserAddressController.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.account.controller;


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

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/t-app-user-address")
public class TAppUserAddressController {

}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserCarController.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.account.controller;


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

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/t-app-user-car")
public class TAppUserCarController {

}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java

New file
@@ -0,0 +1,66 @@
package com.ruoyi.account.controller;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.dto.UnitListQueryDto;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.service.TAppUserService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.other.api.domain.TCompany;
import com.ruoyi.other.api.feignClient.OtherClient;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/t-app-user")
public class TAppUserController {

    @Resource
    private OtherClient otherClient;
    @Resource
    private TAppUserService appUserService;

    @ApiOperation(value = "单位管理列表", tags = {"用户管理-单位管理"})
    @PostMapping(value = "/unit/page")
    public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
        //拿到单位列表
        R<Page<TCompany>> pageR = otherClient.queryUnitPage(unitListQueryDto);
        Page<TCompany> data = pageR.getData();
        //拿到单位的用户数
        for (TCompany record : data.getRecords()) {
            record.setUserCount(appUserService.lambdaQuery().eq(TAppUser::getCompanyId, record.getId()).count());
        }
        return R.ok(data);
    }

    @ApiOperation(value = "单位管理添加或编辑", tags = {"用户管理-单位管理"})
    @PostMapping(value = "/unit/addOrUpdate")
    public R add(@RequestBody TCompany tCompany) {
        //拿到单位列表
       otherClient.unitAddorUpadate(tCompany);
        return R.ok();
    }
    @ApiOperation(value = "单位管理删除", tags = {"用户管理-单位管理"})
    @PostMapping(value = "/unit/delete/{id}")
    public R add(@PathVariable Integer id) {
        otherClient.unitDelete(id);
        return R.ok();

    }

}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserIntegralChangeController.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.account.controller;


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

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/t-app-user-integral-change")
public class TAppUserIntegralChangeController {

}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserSignController.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.account.controller;


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

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/t-app-user-sign")
public class TAppUserSignController {

}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.account.controller;


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

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/t-app-user-tag")
public class TAppUserTagController {

}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInviteUserController.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.account.controller;


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

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/t-invite-user")
public class TInviteUserController {

}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TInvoiceInformationController.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.account.controller;


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

/**
 * <p>
 *  前端控制器
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/t-invoice-information")
public class TInvoiceInformationController {

}


 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppCouponMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.account.api.model.TAppCoupon;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppCouponMapper extends BaseMapper<TAppCoupon> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserAddressMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.account.api.model.TAppUserAddress;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppUserAddressMapper extends BaseMapper<TAppUserAddress> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserCarMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.account.api.model.TAppUserCar;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppUserCarMapper extends BaseMapper<TAppUserCar> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserIntegralChangeMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.account.api.model.TAppUserIntegralChange;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppUserIntegralChangeMapper extends BaseMapper<TAppUserIntegralChange> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.account.api.model.TAppUser;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppUserMapper extends BaseMapper<TAppUser> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserSignMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.account.api.model.TAppUserSign;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppUserSignMapper extends BaseMapper<TAppUserSign> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TAppUserTagMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.account.api.model.TAppUserTag;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppUserTagMapper extends BaseMapper<TAppUserTag> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TInviteUserMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.account.api.model.TInviteUser;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TInviteUserMapper extends BaseMapper<TInviteUser> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/mapper/TInvoiceInformationMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.account.api.model.TInvoiceInformation;

/**
 * <p>
 *  Mapper 接口
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TInvoiceInformationMapper extends BaseMapper<TInvoiceInformation> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppCouponService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.TAppCoupon;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppCouponService extends IService<TAppCoupon> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserAddressService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.TAppUserAddress;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppUserAddressService extends IService<TAppUserAddress> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserCarService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.TAppUserCar;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppUserCarService extends IService<TAppUserCar> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserIntegralChangeService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.TAppUserIntegralChange;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppUserIntegralChangeService extends IService<TAppUserIntegralChange> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.TAppUser;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppUserService extends IService<TAppUser> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserSignService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.TAppUserSign;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppUserSignService extends IService<TAppUserSign> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TAppUserTagService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.TAppUserTag;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TAppUserTagService extends IService<TAppUserTag> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TInviteUserService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.TInviteUser;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TInviteUserService extends IService<TInviteUser> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/TInvoiceInformationService.java

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.account.api.model.TInvoiceInformation;

/**
 * <p>
 *  服务类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
public interface TInvoiceInformationService extends IService<TInvoiceInformation> {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.mapper.TAppCouponMapper;
import com.ruoyi.account.service.TAppCouponService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Service
public class TAppCouponServiceImpl extends ServiceImpl<TAppCouponMapper, TAppCoupon> implements TAppCouponService {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserAddressServiceImpl.java

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.TAppUserAddress;
import com.ruoyi.account.mapper.TAppUserAddressMapper;
import com.ruoyi.account.service.TAppUserAddressService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Service
public class TAppUserAddressServiceImpl extends ServiceImpl<TAppUserAddressMapper, TAppUserAddress> implements TAppUserAddressService {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserCarServiceImpl.java

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.account.mapper.TAppUserCarMapper;
import com.ruoyi.account.service.TAppUserCarService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Service
public class TAppUserCarServiceImpl extends ServiceImpl<TAppUserCarMapper, TAppUserCar> implements TAppUserCarService {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserIntegralChangeServiceImpl.java

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.TAppUserIntegralChange;
import com.ruoyi.account.mapper.TAppUserIntegralChangeMapper;
import com.ruoyi.account.service.TAppUserIntegralChangeService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Service
public class TAppUserIntegralChangeServiceImpl extends ServiceImpl<TAppUserIntegralChangeMapper, TAppUserIntegralChange> implements TAppUserIntegralChangeService {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserServiceImpl.java

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.mapper.TAppUserMapper;
import com.ruoyi.account.service.TAppUserService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Service
public class TAppUserServiceImpl extends ServiceImpl<TAppUserMapper, TAppUser> implements TAppUserService {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserSignServiceImpl.java

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.TAppUserSign;
import com.ruoyi.account.mapper.TAppUserSignMapper;
import com.ruoyi.account.service.TAppUserSignService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Service
public class TAppUserSignServiceImpl extends ServiceImpl<TAppUserSignMapper, TAppUserSign> implements TAppUserSignService {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppUserTagServiceImpl.java

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.TAppUserTag;
import com.ruoyi.account.mapper.TAppUserTagMapper;
import com.ruoyi.account.service.TAppUserTagService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Service
public class TAppUserTagServiceImpl extends ServiceImpl<TAppUserTagMapper, TAppUserTag> implements TAppUserTagService {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInviteUserServiceImpl.java

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.TInviteUser;
import com.ruoyi.account.mapper.TInviteUserMapper;
import com.ruoyi.account.service.TInviteUserService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Service
public class TInviteUserServiceImpl extends ServiceImpl<TInviteUserMapper, TInviteUser> implements TInviteUserService {

}

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TInvoiceInformationServiceImpl.java

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

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.model.TInvoiceInformation;
import com.ruoyi.account.mapper.TInvoiceInformationMapper;
import com.ruoyi.account.service.TInvoiceInformationService;
import org.springframework.stereotype.Service;

/**
 * <p>
 *  服务实现类
 * </p>
 *
 * @author luodangjia
 * @since 2024-08-06
 */
@Service
public class TInvoiceInformationServiceImpl extends ServiceImpl<TInvoiceInformationMapper, TInvoiceInformation> implements TInvoiceInformationService {

}

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

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


import org.springframework.web.bind.annotation.RequestMapping;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.dto.UnitListQueryDto;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.TCompany;
import com.ruoyi.other.service.TCompanyService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;

import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.time.LocalDateTime;

/**
 * <p>
@@ -16,6 +23,35 @@
@RestController
@RequestMapping("/t-company")
public class TCompanyController {
    @Resource
    private TCompanyService companyService;

    //单位分页
    @PostMapping(value = "/unit/page")
    public R<Page<TCompany>> unitPage(@RequestBody UnitListQueryDto unitListQueryDto) {
        Page<TCompany> page = companyService.lambdaQuery()
                .orderByDesc(TCompany::getCreateTime)
                .like(unitListQueryDto.getCompanyName()!=null&& unitListQueryDto.getCompanyName().isEmpty(), TCompany::getName, unitListQueryDto.getCompanyName())
                .page(Page.of(unitListQueryDto.getPageCurr(), unitListQueryDto.getPageSize()));
        return R.ok(page);

    }
    //单位添加
    @PostMapping(value = "/unit/addOrUpdate")
    public R add(@RequestBody TCompany tCompany) {
        if (tCompany.getId()==null){
            tCompany.setCreateTime(LocalDateTime.now());
        }
      companyService.saveOrUpdate(tCompany);
      return R.ok();
    }

    @PostMapping(value = "/unit/delete")
    public R add(@RequestParam Integer id) {
        companyService.removeById(id);

        return R.ok();
    }

}