xuhy
2 天以前 4f3441c452e49ba339fb50fb83c05e0e0f083eb9
对象实体生成
5个文件已修改
14个文件已添加
409 ■■■■■ 已修改文件
generator/src/test/java/com/xizang/CodeGeneratorTests.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmChangePointsController.java 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicPointsController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementCommissionController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-test.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCrmClinicPointsMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementCommissionMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmChangePoints.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmClinicPoints.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementCommission.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/query/TCrmChangePointsQuery.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmClinicPointsService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementCommissionService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicPointsServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementCommissionServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmChangePointsVO.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TCrmChangePointsMapper.xml 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TCrmClinicPointsMapper.xml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TErpProcurementCommissionMapper.xml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
generator/src/test/java/com/xizang/CodeGeneratorTests.java
@@ -144,7 +144,7 @@
//         strategy.setTablePrefix(pc.getModuleName() + "");
//        strategy.setLikeTable(new LikeTable("room"));
        //strategy.setLikeTable(new LikeTable("member"));
        strategy.setLikeTable(new LikeTable("t_sys_message_config"));// 生成表名
        strategy.setLikeTable(new LikeTable("t_erp_procurement_commission"));// 生成表名
//        strategy.setLikeTable(new LikeTable("t_hotel"));// 生成表名
//        strategy.setLikeTable(new LikeTable("t_scan_message"));// 生成表名
//        strategy.setNotLikeTable(new LikeTable("hotel_info"));// 不生成表名
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmChangePointsController.java
@@ -1,6 +1,19 @@
package com.ruoyi.web.controller.api;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.query.TCrmBranchQuery;
import com.ruoyi.system.query.TCrmChangePointsQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TCrmBranchVO;
import com.ruoyi.system.vo.TCrmChangePointsVO;
import io.swagger.annotations.Api;
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;
@@ -13,9 +26,44 @@
 * @author xiaochen
 * @since 2025-09-02
 */
@Api(tags = "修改积分记录")
@RestController
@RequestMapping("/t-crm-change-points")
public class TCrmChangePointsController {
    private final TCrmChangePointsService crmChangePointsService;
    private final TokenService tokenService;
    @Autowired
    public TCrmChangePointsController(TCrmChangePointsService crmChangePointsService, TokenService tokenService) {
        this.crmChangePointsService = crmChangePointsService;
        this.tokenService = tokenService;
    }
    /**
     * 分公司积分变更明细分页列表
     */
//    @ApiOperation(value = "分公司积分变更明细分页列表")
//    @PostMapping(value = "/pageListBranch")
//    public R<PageInfo<TCrmChangePointsVO>> pageListBranch(@RequestBody TCrmChangePointsQuery query) {
//        return R.ok(crmChangePointsService.pageListBranch(query));
//    }
//    /**
//     * 业务员积分变更明细分页列表
//     */
//    @ApiOperation(value = "业务员积分变更明细分页列表")
//    @PostMapping(value = "/pageListBranch")
//    public R<PageInfo<TCrmChangePointsVO>> pageListSalesperson(@RequestBody TCrmChangePointsQuery query) {
//        return R.ok(crmChangePointsService.pageListSalesperson(query));
//    }
//    /**
//     * 诊所积分变更明细分页列表
//     */
//    @ApiOperation(value = "诊所积分变更明细分页列表")
//    @PostMapping(value = "/pageListClinic")
//    public R<PageInfo<TCrmChangePointsVO>> pageListClinic(@RequestBody TCrmChangePointsQuery query) {
//        return R.ok(crmChangePointsService.pageListClinic(query));
//    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmClinicPointsController.java
New file
@@ -0,0 +1,20 @@
package com.ruoyi.web.controller.api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * <p>
 * 积分表 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-10-09
 */
@RestController
@RequestMapping("/t-crm-clinic-points")
public class TCrmClinicPointsController {
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementCommissionController.java
New file
@@ -0,0 +1,20 @@
package com.ruoyi.web.controller.api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * <p>
 * erp采购分佣记录 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2025-10-09
 */
@RestController
@RequestMapping("/t-erp-procurement-commission")
public class TErpProcurementCommissionController {
}
ruoyi-admin/src/main/resources/application-test.yml
@@ -205,8 +205,8 @@
  subAppId: 1
  appId: OP00000003
  serialNo: 00dfba8194c41b84cf
  priKeyStr: C:\Users\Admin\Desktop\test\OP00000003_private_key.pem
  lklNotifyCerStr: F:\demo\demo\src\lkl-apigw-v2.cer
  priKeyStr: D:\app\cert\lakala\OP00000003_private_key.pem
  lklNotifyCerStr: D:\app\cert\lakala\lkl-apigw-v2.cer
  sm4Key: LHo55AjrT4aDhAIBZhb5KQ==
  serverUrl: https://test.wsmsd.cn/
payment:
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TCrmClinicPointsMapper.java
New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.model.TCrmClinicPoints;
/**
 * <p>
 * 积分表 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2025-10-09
 */
public interface TCrmClinicPointsMapper extends BaseMapper<TCrmClinicPoints> {
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementCommissionMapper.java
New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.model.TErpProcurementCommission;
/**
 * <p>
 * erp采购分佣记录 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2025-10-09
 */
public interface TErpProcurementCommissionMapper extends BaseMapper<TErpProcurementCommission> {
}
ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmChangePoints.java
@@ -29,11 +29,19 @@
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;
    @ApiModelProperty(value = "分公司id、业务员id")
    @ApiModelProperty(value = "分公司id、业务员id、诊所id")
    @TableField("branch_salesperson_id")
    private String branchSalespersonId;
    @ApiModelProperty(value = "用户类型 1=分公司 2=业务员")
    @ApiModelProperty(value = "采购id")
    @TableField("procurement_id")
    private String procurementId;
    @ApiModelProperty(value = "兑换id")
    @TableField("exchange_id")
    private String exchangeId;
    @ApiModelProperty(value = "用户类型 1=分公司 2=业务员 3=诊所")
    @TableField("user_type")
    private Integer userType;
@@ -41,6 +49,10 @@
    @TableField("change_type")
    private Integer changeType;
    @ApiModelProperty(value = "变更原因 1=诊所采购 2=商城兑换 3=管理员修改")
    @TableField("change_reason")
    private Integer changeReason;
    @ApiModelProperty(value = "变更数量")
    @TableField("change_value")
    private Integer changeValue;
ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmClinicPoints.java
New file
@@ -0,0 +1,55 @@
package com.ruoyi.system.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 xiaochen
 * @since 2025-10-09
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_crm_clinic_points")
@ApiModel(value="TCrmClinicPoints对象", description="积分表")
public class TCrmClinicPoints implements Serializable {
    private static final long serialVersionUID = 1L;
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;
    @ApiModelProperty(value = "诊所id")
    @TableField("clinic_id")
    private String clinicId;
    @ApiModelProperty(value = "积分数")
    @TableField("points")
    private Double points;
    @ApiModelProperty(value = "积分到期时间")
    @TableField("expire_time")
    private LocalDateTime expireTime;
    @ApiModelProperty(value = "积分获得时间")
    @TableField("create_time")
    private LocalDateTime createTime;
    @ApiModelProperty(value = "已使用")
    @TableField("use_points")
    private Double usePoints;
}
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementCommission.java
New file
@@ -0,0 +1,55 @@
package com.ruoyi.system.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>
 * erp采购分佣记录
 * </p>
 *
 * @author xiaochen
 * @since 2025-10-09
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_erp_procurement_commission")
@ApiModel(value="TErpProcurementCommission对象", description="erp采购分佣记录")
public class TErpProcurementCommission implements Serializable {
    private static final long serialVersionUID = 1L;
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;
    @ApiModelProperty(value = "分佣类型 1=分公司 2=业务员 ")
    @TableField("commission_type")
    private Integer commissionType;
    @ApiModelProperty(value = "分公司业务员id")
    @TableField("branch_salesperson_id")
    private String branchSalespersonId;
    @ApiModelProperty(value = "采购id")
    @TableField("procurement_id")
    private String procurementId;
    @ApiModelProperty(value = "金额")
    @TableField("money")
    private Double money;
    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;
}
ruoyi-system/src/main/java/com/ruoyi/system/query/TCrmChangePointsQuery.java
New file
@@ -0,0 +1,27 @@
package com.ruoyi.system.query;
import com.ruoyi.common.core.domain.model.TimeRangeQueryBody;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "修改积分记录查询参数query")
public class TCrmChangePointsQuery extends TimeRangeQueryBody {
    @ApiModelProperty(value = "分公司名称")
    private String branchName;
    @ApiModelProperty(value = "业务员名称")
    private String salespersonName;
    @ApiModelProperty(value = "诊所名称")
    private String clinicName;
    @ApiModelProperty(value = "变更类型 1=增加 2=减少")
    private Integer changeType;
    @ApiModelProperty(value = "变更原因 1=诊所采购 2=商城兑换 3=管理员修改")
    private Integer changeReason;
}
ruoyi-system/src/main/java/com/ruoyi/system/service/TCrmClinicPointsService.java
New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TCrmClinicPoints;
/**
 * <p>
 * 积分表 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-10-09
 */
public interface TCrmClinicPointsService extends IService<TCrmClinicPoints> {
}
ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementCommissionService.java
New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.model.TErpProcurementCommission;
/**
 * <p>
 * erp采购分佣记录 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2025-10-09
 */
public interface TErpProcurementCommissionService extends IService<TErpProcurementCommission> {
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmClinicPointsServiceImpl.java
New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.TCrmClinicPointsMapper;
import com.ruoyi.system.model.TCrmClinicPoints;
import com.ruoyi.system.service.TCrmClinicPointsService;
import org.springframework.stereotype.Service;
/**
 * <p>
 * 积分表 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-10-09
 */
@Service
public class TCrmClinicPointsServiceImpl extends ServiceImpl<TCrmClinicPointsMapper, TCrmClinicPoints> implements TCrmClinicPointsService {
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementCommissionServiceImpl.java
New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.TErpProcurementCommissionMapper;
import com.ruoyi.system.model.TErpProcurementCommission;
import com.ruoyi.system.service.TErpProcurementCommissionService;
import org.springframework.stereotype.Service;
/**
 * <p>
 * erp采购分佣记录 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2025-10-09
 */
@Service
public class TErpProcurementCommissionServiceImpl extends ServiceImpl<TErpProcurementCommissionMapper, TErpProcurementCommission> implements TErpProcurementCommissionService {
}
ruoyi-system/src/main/java/com/ruoyi/system/vo/TCrmChangePointsVO.java
New file
@@ -0,0 +1,13 @@
package com.ruoyi.system.vo;
import com.ruoyi.system.model.TCrmChangePoints;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@Data
@ApiModel(value = "修改积分记录视图对象TCrmChangePointsVO")
public class TCrmChangePointsVO extends TCrmChangePoints {
}
ruoyi-system/src/main/resources/mapper/system/TCrmChangePointsMapper.xml
@@ -6,8 +6,11 @@
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TCrmChangePoints">
        <id column="id" property="id" />
        <result column="branch_salesperson_id" property="branchSalespersonId" />
        <result column="procurement_id" property="procurementId" />
        <result column="exchange_id" property="exchangeId" />
        <result column="user_type" property="userType" />
        <result column="change_type" property="changeType" />
        <result column="change_reason" property="changeReason" />
        <result column="change_value" property="changeValue" />
        <result column="remarks" property="remarks" />
        <result column="create_time" property="createTime" />
@@ -19,7 +22,7 @@
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, branch_salesperson_id, user_type, change_type, change_value, remarks, create_time, update_time, create_by, update_by, disabled
        id, branch_salesperson_id,procurement_id,exchange_id, user_type, change_type,change_reason, change_value, remarks, create_time, update_time, create_by, update_by, disabled
    </sql>
</mapper>
ruoyi-system/src/main/resources/mapper/system/TCrmClinicPointsMapper.xml
New file
@@ -0,0 +1,20 @@
<?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.system.mapper.TCrmClinicPointsMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TCrmClinicPoints">
        <id column="id" property="id" />
        <result column="clinic_id" property="clinicId" />
        <result column="points" property="points" />
        <result column="expire_time" property="expireTime" />
        <result column="create_time" property="createTime" />
        <result column="use_points" property="usePoints" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, clinic_id, points, expire_time, create_time, use_points
    </sql>
</mapper>
ruoyi-system/src/main/resources/mapper/system/TErpProcurementCommissionMapper.xml
New file
@@ -0,0 +1,20 @@
<?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.system.mapper.TErpProcurementCommissionMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TErpProcurementCommission">
        <id column="id" property="id" />
        <result column="commission_type" property="commissionType" />
        <result column="branch_salesperson_id" property="branchSalespersonId" />
        <result column="procurement_id" property="procurementId" />
        <result column="money" property="money" />
        <result column="create_time" property="createTime" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, commission_type, branch_salesperson_id, procurement_id, money, create_time
    </sql>
</mapper>