Merge branch 'master' of http://git.yn-ce.com/git/fujun/dxCard-service

fujun / dxCard-service

Browse code Merge branch 'master' of http://git.yn-ce.com/git/fujun/dxCard-service # Conflicts: # jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardDeliveryPersonController.java # jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/entity/CardDeliveryPerson.java master
commit 027beedf987892b83fa3ef7627fccf6248eedbd0 2 parents 8e955c5 + 3ee7c06 jiangqihao authored on 26 Sep

Browse code

# Conflicts:
#	jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/controller/CardDeliveryPersonController.java
#	jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/entity/CardDeliveryPerson.java

master

commit 027beedf987892b83fa3ef7627fccf6248eedbd0

2 parents 8e955c5 + 3ee7c06

jiangqihao authored on 26 Sep

Patch

Showing 4 changed files

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/dto/CardDeliveryPersonDTO.java 0 → 100644
package org.jeecg.modules.system.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; import java.io.Serializable; /** * @program: jeecg-boot * @description: * @author: Mr.Yang * @create: 2025-09-26 10:26 / @Data public class CardDeliveryPersonDTO implements Serializable { / * id,新建时可不传 / private String id; /* * 送卡人姓名 / private String name; /* * 送卡人手机号 / private String phone; /* * 电信工号 / private String dxWorkNo; /省/ private String province; /*市/ private String city; /*区/ private String area; /*详细地址/ private String address; }

Ignore Space Show notes View

jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/dto/CardDeliveryPersonDTO.java 0 → 100644

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/dto/CardDeliveryPersonStatusDTO.java 0 → 100644
package org.jeecg.modules.system.dto; import lombok.Data; import java.io.Serializable; /** * @program: jeecg-boot * @description: * @author: Mr.Yang * @create: 2025-09-26 10:48 / @Data public class CardDeliveryPersonStatusDTO implements Serializable { / * id / private String id; /* * 状态 0:停用、1:启用 */ private String status; }

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/entity/CardApplicationCustomers.java
package org.jeecg.modules.system.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** * @Description: 办卡客户 * @Author: jeecg-boot * @Date: 2025-09-26 * @Version: V1.0 / @Data @TableName("card_application_customers") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @Schema(description="办卡客户") public class CardApplicationCustomers implements Serializable { private static final long serialVersionUID = 1L; /id/ @TableId(type = IdType.ASSIGN_ID) @Schema(description = "id") private java.lang.String id; /*创建人/ @Schema(description = "创建人") private java.lang.String createBy; /*创建日期/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "创建日期") private java.util.Date createTime; /*更新人/ @Schema(description = "更新人") private java.lang.String updateBy; /*更新日期/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "更新日期") private java.util.Date updateTime; /*所属部门/ @Schema(description = "所属部门") private java.lang.String sysOrgCode; /*分销客户id/ @Excel(name = "分销客户id", width = 15) @Schema(description = "分销客户id") private java.lang.String distributionCustomersId; /*分销客户姓名/ @Excel(name = "分销客户姓名", width = 15) @Schema(description = "分销客户姓名") private java.lang.String distributionCustomersName; /*分销客户手机号/ @Excel(name = "分销客户手机号", width = 15) @Schema(description = "分销客户手机号") private java.lang.String distributionCustomersPhone; /*办卡客户id/ @Excel(name = "办卡客户id", width = 15) @Schema(description = "办卡客户id") private java.lang.String cardApplicationId; /*办卡姓名/ @Excel(name = "办卡姓名", width = 15) @Schema(description = "办卡姓名") private java.lang.String cardApplicationName; /*办卡手机号/ @Excel(name = "办卡手机号", width = 15) @Schema(description = "办卡手机号") private java.lang.String cardApplicationPhone; /*预约单号/ @Excel(name = "预约单号", width = 15) @Schema(description = "预约单号") private java.lang.String reservationNumber; /*省/ @Excel(name = "省", width = 15) @Schema(description = "省") private java.lang.String province; /*市/ @Excel(name = "市", width = 15) @Schema(description = "市") private java.lang.String city; /*区/ @Excel(name = "区", width = 15) @Schema(description = "区") private java.lang.String area; /*详细地址/ @Excel(name = "详细地址", width = 15) @Schema(description = "详细地址") private java.lang.String address; /*预约时间/ @Excel(name = "预约时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "预约时间") private java.util.Date reservationTime; /*办理手机号/ @Excel(name = "办理手机号", width = 15) @Schema(description = "办理手机号") private java.lang.String transactionPhone; /*应返还佣金/ @Excel(name = "应返还佣金", width = 15) @Schema(description = "应返还佣金") private java.math.BigDecimal refundableCommission; /*实际返还佣金/ @Excel(name = "实际返还佣金", width = 15) @Schema(description = "实际返还佣金") private java.lang.String actualCommission; /*返还时间/ @Excel(name = "返还时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "返还时间") private java.util.Date refundableTime; /*首充金额/ @Excel(name = "首充金额", width = 15) @Schema(description = "首充金额") private java.math.BigDecimal amount; } package org.jeecg.modules.system.entity; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; import org.jeecg.common.constant.ProvinceCityArea; import org.jeecg.common.util.SpringContextUtils; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; import io.swagger.v3.oas.annotations.media.Schema; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** * @Description: 办卡客户 * @Author: jeecg-boot * @Date: 2025-09-24 * @Version: V1.0 / @Data @TableName("card_application_customers") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) @Schema(description="办卡客户") public class CardApplicationCustomers implements Serializable { private static final long serialVersionUID = 1L; /主键/ @TableId(type = IdType.ASSIGN_ID) @Schema(description = "主键") private java.lang.String id; /*创建人/ @Schema(description = "创建人") private java.lang.String createBy; /*创建日期/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "创建日期") private java.util.Date createTime; /*更新人/ @Schema(description = "更新人") private java.lang.String updateBy; /*更新日期/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "更新日期") private java.util.Date updateTime; /*所属部门/ @Schema(description = "所属部门") private java.lang.String sysOrgCode; /*姓名/ @Excel(name = "姓名", width = 15) @Schema(description = "姓名") private java.lang.String name; /*手机号/ @Excel(name = "手机号", width = 15) @Schema(description = "手机号") private java.lang.String phone; /*办卡姓名/ @Excel(name = "办卡姓名", width = 15) @Schema(description = "办卡姓名") private java.lang.String cardApplicationName; /*办卡手机号/ @Excel(name = "办卡手机号", width = 15) @Schema(description = "办卡手机号") private java.lang.String cardApplicationPhone; /*预约单号/ @Excel(name = "预约单号", width = 15) @Schema(description = "预约单号") private java.lang.String reservationNumber; /*省/ @Excel(name = "省", width = 15) @Schema(description = "省") private java.lang.String province; /*市/ @Excel(name = "市", width = 15) @Schema(description = "市") private java.lang.String city; /*区/ @Excel(name = "区", width = 15) @Schema(description = "区") private java.lang.String area; /*详细地址/ @Excel(name = "详细地址", width = 15) @Schema(description = "详细地址") private java.lang.String address; /*预约时间/ @Excel(name = "预约时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @Schema(description = "预约时间") private java.util.Date reservationTime; }

Ignore Space Show notes View

jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/entity/CardApplicationCustomers.java

package org.jeecg.modules.system.entity;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

/**
 * @Description: 办卡客户
 * @Author: jeecg-boot
 * @Date:   2025-09-26
 * @Version: V1.0
 */
@Data
@TableName("card_application_customers")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="办卡客户")
public class CardApplicationCustomers implements Serializable {
    private static final long serialVersionUID = 1L;

/**id*/
    @TableId(type = IdType.ASSIGN_ID)
    @Schema(description = "id")
    private java.lang.String id;
    /**创建人*/
    @Schema(description = "创建人")
    private java.lang.String createBy;
    /**创建日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "创建日期")
    private java.util.Date createTime;
    /**更新人*/
    @Schema(description = "更新人")
    private java.lang.String updateBy;
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "更新日期")
    private java.util.Date updateTime;
    /**所属部门*/
    @Schema(description = "所属部门")
    private java.lang.String sysOrgCode;
    /**分销客户id*/
    @Excel(name = "分销客户id", width = 15)
    @Schema(description = "分销客户id")
    private java.lang.String distributionCustomersId;
    /**分销客户姓名*/
    @Excel(name = "分销客户姓名", width = 15)
    @Schema(description = "分销客户姓名")
    private java.lang.String distributionCustomersName;
    /**分销客户手机号*/
    @Excel(name = "分销客户手机号", width = 15)
    @Schema(description = "分销客户手机号")
    private java.lang.String distributionCustomersPhone;
    /**办卡客户id*/
    @Excel(name = "办卡客户id", width = 15)
    @Schema(description = "办卡客户id")
    private java.lang.String cardApplicationId;
    /**办卡姓名*/
    @Excel(name = "办卡姓名", width = 15)
    @Schema(description = "办卡姓名")
    private java.lang.String cardApplicationName;
    /**办卡手机号*/
    @Excel(name = "办卡手机号", width = 15)
    @Schema(description = "办卡手机号")
    private java.lang.String cardApplicationPhone;
    /**预约单号*/
    @Excel(name = "预约单号", width = 15)
    @Schema(description = "预约单号")
    private java.lang.String reservationNumber;
    /**省*/
    @Excel(name = "省", width = 15)
    @Schema(description = "省")
    private java.lang.String province;
    /**市*/
    @Excel(name = "市", width = 15)
    @Schema(description = "市")
    private java.lang.String city;
    /**区*/
    @Excel(name = "区", width = 15)
    @Schema(description = "区")
    private java.lang.String area;
    /**详细地址*/
    @Excel(name = "详细地址", width = 15)
    @Schema(description = "详细地址")
    private java.lang.String address;
    /**预约时间*/
    @Excel(name = "预约时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "预约时间")
    private java.util.Date reservationTime;
    /**办理手机号*/
    @Excel(name = "办理手机号", width = 15)
    @Schema(description = "办理手机号")
    private java.lang.String transactionPhone;
    /**应返还佣金*/
    @Excel(name = "应返还佣金", width = 15)
    @Schema(description = "应返还佣金")
    private java.math.BigDecimal refundableCommission;
    /**实际返还佣金*/
    @Excel(name = "实际返还佣金", width = 15)
    @Schema(description = "实际返还佣金")
    private java.lang.String actualCommission;
    /**返还时间*/
    @Excel(name = "返还时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "返还时间")
    private java.util.Date refundableTime;
    /**首充金额*/
    @Excel(name = "首充金额", width = 15)
    @Schema(description = "首充金额")
    private java.math.BigDecimal amount;
}

package org.jeecg.modules.system.entity;

/**
 * @Description: 办卡客户
 * @Author: jeecg-boot
 * @Date:   2025-09-24
 * @Version: V1.0
 */
@Data
@TableName("card_application_customers")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description="办卡客户")
public class CardApplicationCustomers implements Serializable {
    private static final long serialVersionUID = 1L;

/**主键*/
    @TableId(type = IdType.ASSIGN_ID)
    @Schema(description = "主键")
    private java.lang.String id;
    /**创建人*/
    @Schema(description = "创建人")
    private java.lang.String createBy;
    /**创建日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "创建日期")
    private java.util.Date createTime;
    /**更新人*/
    @Schema(description = "更新人")
    private java.lang.String updateBy;
    /**更新日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "更新日期")
    private java.util.Date updateTime;
    /**所属部门*/
    @Schema(description = "所属部门")
    private java.lang.String sysOrgCode;
    /**姓名*/
    @Excel(name = "姓名", width = 15)
    @Schema(description = "姓名")
    private java.lang.String name;
    /**手机号*/
    @Excel(name = "手机号", width = 15)
    @Schema(description = "手机号")
    private java.lang.String phone;
    /**办卡姓名*/
    @Excel(name = "办卡姓名", width = 15)
    @Schema(description = "办卡姓名")
    private java.lang.String cardApplicationName;
    /**办卡手机号*/
    @Excel(name = "办卡手机号", width = 15)
    @Schema(description = "办卡手机号")
    private java.lang.String cardApplicationPhone;
    /**预约单号*/
    @Excel(name = "预约单号", width = 15)
    @Schema(description = "预约单号")
    private java.lang.String reservationNumber;
    /**省*/
    @Excel(name = "省", width = 15)
    @Schema(description = "省")
    private java.lang.String province;
    /**市*/
    @Excel(name = "市", width = 15)
    @Schema(description = "市")
    private java.lang.String city;
    /**区*/
    @Excel(name = "区", width = 15)
    @Schema(description = "区")
    private java.lang.String area;
    /**详细地址*/
    @Excel(name = "详细地址", width = 15)
    @Schema(description = "详细地址")
    private java.lang.String address;
    /**预约时间*/
    @Excel(name = "预约时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @Schema(description = "预约时间")
    private java.util.Date reservationTime;
}

Ignore Space Show notes View jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/vo/CardDeliveryPersonVO.java 0 → 100644
package org.jeecg.modules.system.vo; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; /** * @program: jeecg-boot * @description: * @author: Mr.Yang * @create: 2025-09-26 10:15 / @Data public class CardDeliveryPersonVO implements Serializable { / * 送卡人id / private String id; /* * 送卡人姓名 / private String name; /* * 送卡人手机号 / private String phone; /* * 送卡人电信工号 / private String dxWorkNo; /* * 所属省 / private String province; /* * 所属市 / private String city; /* * 所属区 / private String area; /* * 送卡人详细地址 / private String address; /* * 应收送卡费用 / private BigDecimal receivableFee; /* * 已收送卡费用 / private BigDecimal allFee; /* * 创建时间 / private String createTime; /* * 状态 */ private String status; }

Ignore Space Show notes View

jeecg-boot-module/jeecg-module-service/src/main/java/org/jeecg/modules/system/vo/CardDeliveryPersonVO.java 0 → 100644

Show line notes below