边民收益设置，企业费用设置

app.pid

@@ -1 +1 @@
-24208
+24296

sp-core/sp-base/src/main/java/com/pj/current/config/MyConfig.java

@@ -29,8 +29,12 @@ public class MyConfig {
 	/** 
 	 * 本项目部署到的服务器域名（文件上传、微信支付等等模块  要用到） 
 	 */
-	private String domain;			
-	
+	private String domain;
+	/**
+	 * 文件上传url前缀
+	 */
+	private String uploadServerPrefix;
+
 	/**
 	 * 是否彩色SQL日志 
 	 */

sp-core/sp-base/src/main/java/com/pj/project4sp/uploadfile/UploadUtil.java

@@ -38,13 +38,13 @@ public class UploadUtil {
 		String fileFolder = new File(uploadConfig.rootFolder).getAbsolutePath() + "/" +
 				uploadConfig.httpPrefix + flieTypeFolder + currDateFolder + "/";
 		// 对外暴露的http路径
-		//String httpUrl = getDoMain() + uploadConfig.httpPrefix + flieTypeFolder + currDateFolder + "/" + fileName;
+		String httpUrl = getDoMain() + uploadConfig.httpPrefix + flieTypeFolder + currDateFolder + "/" + fileName;
 		//去掉前缀ip端口，从前台实时获取当前服务ip与端口
-		String httpUrl = uploadConfig.httpPrefix + flieTypeFolder + currDateFolder + "/" + fileName;
+//		String httpUrl = uploadConfig.httpPrefix + flieTypeFolder + currDateFolder + "/" + fileName;
 
 		// 2、如果文件夹不存在，则先创建
 		File dirFile = new File(fileFolder);
-		if(dirFile.exists() == false) {
+		if(!dirFile.exists()) {
 			dirFile.mkdirs();
 		}
 
@@ -102,7 +102,7 @@ public class UploadUtil {
 
 	/** 返回本服务器域名信息  */
 	static String getDoMain() {
-		return SystemObject.config.getDomain();
+		return SystemObject.config.getUploadServerPrefix();
 	}
 
 }

sp-generate/src/main/java/com/pj/SpGenerateApplication.java

@@ -23,7 +23,7 @@ public class SpGenerateApplication {
 		// ===================================  设置连接信息  =================================== 
         FlyConfig config = new FlyConfig();
         config.setDriverClassName("com.mysql.cj.jdbc.Driver");
-        config.setUrl("jdbc:mysql://47.101.143.145:3006/transport-system?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC");
+        config.setUrl("jdbc:mysql://47.101.143.145:3006/leveltwo-system?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC");
         config.setUsername("yun_user");
         config.setPassword("yun_Root@1123");
         config.setPrintSql(true);		// 是否打印sql  
@@ -37,11 +37,11 @@ public class SpGenerateApplication {
 		
 		// ===================================  一些全局设置  =================================== 
 		GenCfgManager.cfg
-			.setProjectPath("E://developer_tools//idea//project//market-server//sp-service//transport-server//src//main//java//com//pj//")	// 总项目地址 (生成代码的路径)
-	        .setServerProjectName("market-server/sp-service/sp-admin")				// 服务端 - 项目名称
+			.setProjectPath("d://project//market")	// 总项目地址 (生成代码的路径)
+	        .setServerProjectName("/market-server/sp-service/level-two-server")				// 服务端 - 项目名称
 //	        .setServerProjectName("sp-com/sp-core")			// 服务端 - 项目名称 (sp-com多模块版填此格式)
 	        .setCodePath("src/main/java/")					// 服务端代码 - 存放路径 
-	        .setPackagePath( "com.pj.project")				// 服务端代码 - 总包名 
+	        .setPackagePath( "com.pj")				// 服务端代码 - 总包名
 	        .setPackage_utils("com.pj.utils.sg.*")			// 服务端代码 - util类包地址 
 	        .setAuthor("yzs")						// 服务端代码 - 代码作者 (一定要换成您的大名哦，哈哈)
 	        .setAdminProjectName("market-admin-ui")				// 后台管理 - 项目名称
@@ -64,7 +64,7 @@ public class SpGenerateApplication {
 			.setOutFC(false)					// 是否输出FC.java工厂类
 			.setDefaultMeunIcon("el-icon-folder-opened")	// 生成后台管理页面时，默认的菜单图标
 			.setWebLibImportWay(2) 			// 前端js库导入方式(1=cdn导入, 2=本地导入[需将sa-admin附带js包复制到kj文件夹])
-			 .addTableName("tb_car_record")	// 添加要生成的表 (单个添加)
+			 .addTableName("tb_fee_item_record","tb_people_profit_record")	// 添加要生成的表 (单个添加)
 //			.addTableAll()		// 添加要生成的表 (一次性添加所有表)
             .removeTableName("sp_role", "sp_role_permission", "sp_admin", "sp_apilog", "sp_cfg")	// 移除这些内置的表，不必生成代码
             ; 

sp-generate/src/main/java/com/pj/gen/GenUtil.java

@@ -66,10 +66,10 @@ public class GenUtil {
 			System.out.println(t.getModelName() + "Controller 写入成功：\t\t" + controllerPath);
 
 			// Util 
-			String utilPath = t.getServerIoPath() + t.getMkNameBig() + "Util.java";	// 路径 
-			String utilContent = FreeMarkerUtil.getResult("mybatis/Util.ftl", "t", t);		// 内容 
-			SUtil.outFile(utilPath, utilContent);
-			System.out.println(t.getModelName() + "Util 写入成功：\t\t" + utilPath);
+//			String utilPath = t.getServerIoPath() + t.getMkNameBig() + "Util.java";	// 路径
+//			String utilContent = FreeMarkerUtil.getResult("mybatis/Util.ftl", "t", t);		// 内容
+//			SUtil.outFile(utilPath, utilContent);
+//			System.out.println(t.getModelName() + "Util 写入成功：\t\t" + utilPath);
 
 			// 多打印一行，模块之间有个间隔 
 			System.out.println();	

sp-service/level-one-server/src/main/java/com/pj/tb_order/MethodOrderService.java

@@ -65,6 +65,7 @@ public class MethodOrderService {
                 if(tbPeople == null)throw new ServiceException("当前用户未认证边民!");
                 //根据组进行匹配订单
                 so.put("groupId",tbPeople.getGroupId());
+                so.put("buyUserId",fk);
                 break;
             case 2: //互市组组长
                 so.put("buyUserId",fk);

sp-service/level-two-server/src/main/java/com/pj/tb_company/TbCompany.java

@@ -0,0 +1,168 @@
+package com.pj.tb_company;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.EqualsAndHashCode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Model: tb_company -- 企业管理
+ * @author yzs 
+ */
+@Data
+@Accessors(chain = true)
+@TableName(TbCompany.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class TbCompany extends Model<TbCompany> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id 
+	 */
+	private static final long serialVersionUID = 1L;	
+	/**
+	 * 此模块对应的表名 
+	 */
+	public static final String TABLE_NAME = "tb_company";	
+	/**
+	 * 此模块对应的权限码 
+	 */
+	public static final String PERMISSION_CODE = "tb-company-list";
+	public static final String PERMISSION_CODE_ADD = "tb-company-add";
+	public static final String PERMISSION_CODE_EDIT = "tb-company-edit";
+	public static final String PERMISSION_CODE_DEL = "tb-company-del";
+
+
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 *  
+	 */
+	@TableId(type = IdType.AUTO)
+	private Long id;	
+
+	/**
+	 * 名称 
+	 */
+	private String name;	
+
+	/**
+	 * 法人 
+	 */
+	private String legalPerson;	
+
+	/**
+	 * 身份证号 
+	 */
+	private String idCard;	
+
+	/**
+	 * 手机号码 
+	 */
+	private String contact;	
+
+	/**
+	 * 营业执照 
+	 */
+	private String businessLicense;	
+
+	/**
+	 * 银行编号(CMB= 招商银行) 
+	 */
+	private String bankNo;	
+
+	/**
+	 * 银行名称 
+	 */
+	private String bankName;	
+
+	/**
+	 * 银行账号 
+	 */
+	private String bankAccount;	
+
+	/**
+	 * 税号 
+	 */
+	private String dutyParagraph;	
+
+	/**
+	 * 地址全路径如1,22,333 
+	 */
+	private String addressIds;	
+
+	/**
+	 * 地址 
+	 */
+	private String address;	
+
+	/**
+	 * 详细地址 
+	 */
+	private String detail;	
+
+	/**
+	 * 创建时间 
+	 */
+	private Date createTime;
+
+	/**
+	 * 创建人编号 
+	 */
+	private String createBy;	
+
+	/**
+	 * 创建人名称 
+	 */
+	private String createName;	
+
+	/**
+	 * 更新时间 
+	 */
+	private Date updateTime;
+
+	/**
+	 * 更新人编号 
+	 */
+	private String updateBy;	
+
+	/**
+	 * 更新人名称 
+	 */
+	private String updateName;	
+
+	/**
+	 * 删除状态(0=禁用,1=启用) 
+	 */
+	private Long deleteStatus;	
+
+	/**
+	 * 是否锁住 
+	 */
+	private Integer isLock=0;
+
+	/**
+	 * 互市区ID 
+	 */
+
+	private String tradeAreaId;
+
+	/**
+	 * 互市区名称 
+	 */
+	private String tradeAreaName;	
+
+
+
+
+
+	
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_company/TbCompanyController.java

@@ -0,0 +1,93 @@
+package com.pj.tb_company;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.pj.utils.sg.*;
+import com.pj.project4sp.SP;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+
+/**
+ * Controller: tb_company -- 企业管理
+ * @author yzs 
+ */
+@RestController
+@RequestMapping("/TbCompany/")
+public class TbCompanyController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbCompanyService tbCompanyService;
+
+	/** 增 */  
+	@RequestMapping("add")
+	@SaCheckPermission(TbCompany.PERMISSION_CODE_ADD)
+	public AjaxJson add(TbCompany t){
+		tbCompanyService.add(t);
+		t = tbCompanyService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+	@SaCheckPermission(TbCompany.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 tbCompanyService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+	@SaCheckPermission(TbCompany.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(TbCompany.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+	@SaCheckPermission(TbCompany.PERMISSION_CODE_EDIT)
+	public AjaxJson update(TbCompany t){
+		tbCompanyService.update(t);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+		@SaCheckPermission(TbCompany.PERMISSION_CODE)
+	public AjaxJson getById(Long id){
+		TbCompany t = tbCompanyService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+		@SaCheckPermission(TbCompany.PERMISSION_CODE)
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbCompany> list = tbCompanyService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+	
+	
+	
+	/** 改 - 删除状态(0=禁用,1=启用) */  
+	@RequestMapping("updateDeleteStatus")
+	@SaCheckPermission(TbCompany.PERMISSION_CODE_EDIT)
+	public AjaxJson updateDeleteStatus(Long id, Long value){
+		int line = SP.publicMapper.updateColumnById(TbCompany.TABLE_NAME, "delete_status", value, id);
+		return AjaxJson.getByLine(line);
+	}
+	
+	
+
+	
+	
+	
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_company/TbCompanyMapper.java

@@ -0,0 +1,30 @@
+package com.pj.tb_company;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.pj.utils.so.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Mapper: tb_company -- 企业管理
+ * @author yzs 
+ */
+
+@Mapper
+@Repository
+public interface TbCompanyMapper extends BaseMapper <TbCompany> {
+
+
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
+	List<TbCompany> getList(SoMap so);
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_company/TbCompanyMapper.xml

@@ -0,0 +1,85 @@
+<?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.pj.tb_company.TbCompanyMapper">
+
+
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select id, name, legal_person, id_card, contact, business_license, bank_no, bank_name, bank_account, duty_paragraph, address_ids, address, detail, create_time, create_by, create_name, update_time, update_by, update_name, delete_status, is_lock, trade_area_id, trade_area_name from tb_company  -->
+	
+	<!-- 通用映射：自动模式 -->
+	<resultMap id="model" autoMapping="true" type="com.pj.tb_company.TbCompany"></resultMap>
+	
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select * 
+		from tb_company 
+	</sql>
+
+	
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
+	<select id="getList" resultMap="model">
+		<include refid="select_sql"></include>
+		<where>
+			<if test=' this.has("id") '> and id = #{id} </if>
+			<if test=' this.has("name") '> and name = #{name} </if>
+			<if test=' this.has("legalPerson") '> and legal_person = #{legalPerson} </if>
+			<if test=' this.has("idCard") '> and id_card = #{idCard} </if>
+			<if test=' this.has("contact") '> and contact = #{contact} </if>
+			<if test=' this.has("bankNo") '> and bank_no = #{bankNo} </if>
+			<if test=' this.has("bankName") '> and bank_name = #{bankName} </if>
+			<if test=' this.has("bankAccount") '> and bank_account = #{bankAccount} </if>
+			<if test=' this.has("dutyParagraph") '> and duty_paragraph = #{dutyParagraph} </if>
+			<if test=' this.has("addressIds") '> and address_ids = #{addressIds} </if>
+			<if test=' this.has("address") '> and address = #{address} </if>
+			<if test=' this.has("detail") '> and detail = #{detail} </if>
+			<if test=' this.has("createTime") '> and create_time = #{createTime} </if>
+			<if test=' this.has("createBy") '> and create_by = #{createBy} </if>
+			<if test=' this.has("createName") '> and create_name = #{createName} </if>
+			<if test=' this.has("updateTime") '> and update_time = #{updateTime} </if>
+			<if test=' this.has("updateBy") '> and update_by = #{updateBy} </if>
+			<if test=' this.has("updateName") '> and update_name = #{updateName} </if>
+			<if test=' this.has("deleteStatus") '> and delete_status = #{deleteStatus} </if>
+			<if test=' this.has("isLock") '> and is_lock = #{isLock} </if>
+			<if test=' this.has("tradeAreaId") '> and trade_area_id = #{tradeAreaId} </if>
+			<if test=' this.has("tradeAreaName") '> and trade_area_name = #{tradeAreaName} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> id desc </when>
+			<when test='sortType == 2'> name desc </when>
+			<when test='sortType == 3'> legal_person desc </when>
+			<when test='sortType == 4'> id_card desc </when>
+			<when test='sortType == 5'> contact desc </when>
+			<when test='sortType == 6'> bank_no desc </when>
+			<when test='sortType == 7'> bank_name desc </when>
+			<when test='sortType == 8'> bank_account desc </when>
+			<when test='sortType == 9'> duty_paragraph desc </when>
+			<when test='sortType == 10'> address_ids desc </when>
+			<when test='sortType == 11'> address desc </when>
+			<when test='sortType == 12'> detail desc </when>
+			<when test='sortType == 13'> create_time desc </when>
+			<when test='sortType == 14'> create_by desc </when>
+			<when test='sortType == 15'> create_name desc </when>
+			<when test='sortType == 16'> update_time desc </when>
+			<when test='sortType == 17'> update_by desc </when>
+			<when test='sortType == 18'> update_name desc </when>
+			<when test='sortType == 19'> delete_status desc </when>
+			<when test='sortType == 20'> is_lock desc </when>
+			<when test='sortType == 21'> trade_area_id desc </when>
+			<when test='sortType == 22'> trade_area_name desc </when>
+			<otherwise> id desc </otherwise>
+		</choose>
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+</mapper>

sp-service/level-two-server/src/main/java/com/pj/tb_company/TbCompanyService.java

@@ -0,0 +1,92 @@
+package com.pj.tb_company;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.pj.api.consts.FeignFactory;
+import com.pj.api.dto.DistrictDTO;
+import com.pj.current.satoken.StpUserUtil;
+import com.pj.tb_fee_item.TbFeeItem;
+import com.pj.tb_fee_item.TbFeeItemService;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * Service: tb_company -- 企业管理
+ *
+ * @author yzs
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class TbCompanyService extends ServiceImpl<TbCompanyMapper, TbCompany> implements IService<TbCompany> {
+
+    /**
+     * 底层 Mapper 对象
+     */
+    @Autowired
+    TbCompanyMapper tbCompanyMapper;
+    @Resource
+    private TbFeeItemService tbFeeItemService;
+
+    /**
+     * 增
+     */
+    void add(TbCompany t) {
+        save(t);
+        List<DistrictDTO> districtDTOS = FeignFactory.adminInterface.getDistrictList(t.getAddressIds());
+        t.setAddress(districtDTOS.stream().map(DistrictDTO::getDistrict)
+                .collect(Collectors.joining())).setCreateTime(new Date())
+                .setCreateBy(StpUserUtil.getLoginIdAsString())
+                .setCreateName(StpUserUtil.getPCLoginInfo().getLoginName());
+        updateById(t);
+    }
+
+    /**
+     * 删
+     */
+    void delete(Long id) {
+        List<TbFeeItem> feeItems = tbFeeItemService.findByCompanyId(id);
+        if (!feeItems.isEmpty()){
+            feeItems.forEach(tbFeeItem -> tbFeeItem.setCompanyId("").setCompanyName(""));
+            tbFeeItemService.updateBatchById(feeItems);
+        }
+        removeById(id);
+    }
+
+    /**
+     * 改
+     */
+    void update(TbCompany t) {
+        updateById(t);
+        List<DistrictDTO> districtDTOS = FeignFactory.adminInterface.getDistrictList(t.getAddressIds());
+        t.setAddress(districtDTOS.stream().map(DistrictDTO::getDistrict)
+                .collect(Collectors.joining())).setUpdateTime(new Date())
+                .setUpdateBy(StpUserUtil.getLoginIdAsString())
+                .setUpdateName(StpUserUtil.getPCLoginInfo().getLoginName());
+        updateById(t);
+
+    }
+
+    /**
+     * 查
+     */
+    TbCompany getById(Long id) {
+        return super.getById(id);
+    }
+
+    /**
+     * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+     */
+    List<TbCompany> getList(SoMap so) {
+        return tbCompanyMapper.getList(so);
+    }
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item/FeeTypeEnum.java

@@ -0,0 +1,16 @@
+package com.pj.tb_fee_item;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum FeeTypeEnum {
+    TRADE_MONEY_TYPE(1,"按交易额计算"),
+    TRADE_ONCE_TYPE(2,"按次数计算");
+
+    private int type;
+    private String desc;
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item/TbFeeItem.java

@@ -0,0 +1,115 @@
+package com.pj.tb_fee_item;
+
+import java.io.Serializable;
+import java.util.*;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.EqualsAndHashCode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Model: tb_fee_item -- 费项管理
+ * @author yzs 
+ */
+@Data
+@Accessors(chain = true)
+@TableName(TbFeeItem.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class TbFeeItem extends Model<TbFeeItem> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id 
+	 */
+	private static final long serialVersionUID = 1L;	
+	/**
+	 * 此模块对应的表名 
+	 */
+	public static final String TABLE_NAME = "tb_fee_item";	
+	/**
+	 * 此模块对应的权限码 
+	 */
+	public static final String PERMISSION_CODE = "tb-fee-item-list";
+	public static final String PERMISSION_CODE_ADD = "tb-fee-item-add";
+	public static final String PERMISSION_CODE_EDIT = "tb-fee-item-edit";
+	public static final String PERMISSION_CODE_DEL = "tb-fee-item-del";
+
+
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 主键 
+	 */
+	private String id;
+
+	/**
+	 * 企业ID 
+	 */
+	private String companyId=null;
+
+	/**
+	 * 收费企业 
+	 */
+	private String companyName;	
+
+	/**
+	 * 名称 
+	 */
+	private String name;	
+
+	/**
+	 * 类型(1=按交易额收取,2=按次收取) 
+	 */
+	private String feeType;	
+
+	/**
+	 * 百分比fee_type=1时生效 
+	 */
+	private Double percent;	
+
+	/**
+	 * 收费金额 fee_type=2时生效 
+	 */
+	private Double feeMoney;	
+
+	/**
+	 * 状态(0=禁用,1=启用) 
+	 */
+	private Integer status=1;
+
+	/**
+	 * 创建时间 
+	 */
+	private Date createTime;	
+
+	/**
+	 * 更新者id 
+	 */
+	private String updateBy;	
+
+	/**
+	 * 更新者名称 
+	 */
+	private String updateByName;	
+
+	/**
+	 * 更新时间 
+	 */
+	private Date updateTime;	
+
+	/**
+	 * 更新人 
+	 */
+	private Long updateById;	
+
+
+
+
+
+	
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item/TbFeeItemController.java

@@ -0,0 +1,91 @@
+package com.pj.tb_fee_item;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.pj.utils.sg.*;
+import com.pj.project4sp.SP;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+
+/**
+ * Controller: tb_fee_item -- 费项管理
+ * @author yzs 
+ */
+@RestController
+@RequestMapping("/TbFeeItem/")
+public class TbFeeItemController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbFeeItemService tbFeeItemService;
+
+	/** 增 */  
+	@RequestMapping("add")
+	@SaCheckPermission(TbFeeItem.PERMISSION_CODE_ADD)
+	public AjaxJson add(TbFeeItem t){
+		tbFeeItemService.add(t);
+		t = tbFeeItemService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+	@SaCheckPermission(TbFeeItem.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 tbFeeItemService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+	@SaCheckPermission(TbFeeItem.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(TbFeeItem.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+	@SaCheckPermission(TbFeeItem.PERMISSION_CODE_EDIT)
+	public AjaxJson update(TbFeeItem t){
+		tbFeeItemService.update(t);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+		@SaCheckPermission(TbFeeItem.PERMISSION_CODE)
+	public AjaxJson getById(Long id){
+		TbFeeItem t = tbFeeItemService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+		@SaCheckPermission(TbFeeItem.PERMISSION_CODE)
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbFeeItem> list = tbFeeItemService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+
+
+	/** 改 - 状态(0=禁用,1=启用) */
+	@RequestMapping("updateStatus")
+	@SaCheckPermission(TbFeeItem.PERMISSION_CODE_EDIT)
+	public AjaxJson updateStatus(String id, String value){
+		int line = SP.publicMapper.updateColumnById(TbFeeItem.TABLE_NAME, "status", value, id);
+		return AjaxJson.getByLine(line);
+	}
+	
+
+	
+	
+	
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item/TbFeeItemMapper.java

@@ -0,0 +1,30 @@
+package com.pj.tb_fee_item;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.pj.utils.so.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Mapper: tb_fee_item -- 费项管理
+ * @author yzs 
+ */
+
+@Mapper
+@Repository
+public interface TbFeeItemMapper extends BaseMapper <TbFeeItem> {
+
+
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
+	List<TbFeeItem> getList(SoMap so);
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item/TbFeeItemMapper.xml

@@ -0,0 +1,65 @@
+<?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.pj.tb_fee_item.TbFeeItemMapper">
+
+
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select id, company_id, company_name, name, fee_type, percent, fee_money, status, create_time, update_by, update_by_name, update_time, update_by_id from tb_fee_item  -->
+	
+	<!-- 通用映射：自动模式 -->
+	<resultMap id="model" autoMapping="true" type="com.pj.tb_fee_item.TbFeeItem"></resultMap>
+	
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select * 
+		from tb_fee_item 
+	</sql>
+
+	
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
+	<select id="getList" resultMap="model">
+		<include refid="select_sql"></include>
+		<where>
+			<if test=' this.has("id") '> and id = #{id} </if>
+			<if test=' this.has("companyId") '> and company_id = #{companyId} </if>
+			<if test=' this.has("companyName") '> and company_name = #{companyName} </if>
+			<if test=' this.has("name") '> and name like concat('%',#{name},'%') </if>
+			<if test=' this.has("feeType") '> and fee_type = #{feeType} </if>
+			<if test=' this.has("percent") '> and percent = #{percent} </if>
+			<if test=' this.has("feeMoney") '> and fee_money = #{feeMoney} </if>
+			<if test=' this.has("status") '> and status = #{status} </if>
+			<if test=' this.has("updateBy") '> and update_by = #{updateBy} </if>
+			<if test=' this.has("updateByName") '> and update_by_name = #{updateByName} </if>
+			<if test=' this.has("updateById") '> and update_by_id = #{updateById} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> id desc </when>
+			<when test='sortType == 2'> company_id desc </when>
+			<when test='sortType == 3'> company_name desc </when>
+			<when test='sortType == 4'> name desc </when>
+			<when test='sortType == 5'> fee_type desc </when>
+			<when test='sortType == 6'> percent desc </when>
+			<when test='sortType == 7'> fee_money desc </when>
+			<when test='sortType == 8'> status desc </when>
+			<when test='sortType == 9'> create_time desc </when>
+			<when test='sortType == 10'> update_by desc </when>
+			<when test='sortType == 11'> update_by_name desc </when>
+			<when test='sortType == 12'> update_time desc </when>
+			<when test='sortType == 13'> update_by_id desc </when>
+			<otherwise> id desc </otherwise>
+		</choose>
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+</mapper>

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item/TbFeeItemService.java

@@ -0,0 +1,67 @@
+package com.pj.tb_fee_item;
+
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.pj.current.satoken.StpUserUtil;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Service: tb_fee_item -- 费项管理
+ * @author yzs 
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class TbFeeItemService extends ServiceImpl<TbFeeItemMapper, TbFeeItem> implements IService<TbFeeItem>{
+
+	/** 底层 Mapper 对象 */
+	@Autowired
+	TbFeeItemMapper tbFeeItemMapper;
+
+	/** 增 */
+	void add(TbFeeItem t){
+		t.setCreateTime(new Date()).setUpdateTime(new Date());
+		save(t);
+	}
+
+	/** 删 */
+	void delete(Long id){
+		removeById(id);
+	}
+
+	/** 改 */
+	void update(TbFeeItem t){
+		t.setCreateTime(new Date()).setUpdateTime(new Date())
+				.setUpdateBy(StpUserUtil.getLoginIdAsString())
+				.setUpdateByName(StpUserUtil.getLoginName());
+		updateById(t);
+
+	}
+
+	/** 查 */
+	TbFeeItem getById(Long id){
+		return super.getById(id);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	List<TbFeeItem> getList(SoMap so) { 
+		return tbFeeItemMapper.getList(so);	
+	}
+
+	/**
+	 * 根据收费公司查找
+	 * @param companyId
+	 * @return
+	 */
+	public List<TbFeeItem> findByCompanyId(Long companyId) {
+		QueryWrapper<TbFeeItem>ew=new QueryWrapper<>();
+		ew.lambda().eq(TbFeeItem::getCompanyId,companyId);
+		return list(ew);
+	}
+}

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item_record/TbFeeItemRecord.java

@@ -0,0 +1,125 @@
+package com.pj.tb_fee_item_record;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.EqualsAndHashCode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Model: tb_fee_item_record -- 费项订单
+ * @author yzs 
+ */
+@Data
+@Accessors(chain = true)
+@TableName(TbFeeItemRecord.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class TbFeeItemRecord extends Model<TbFeeItemRecord> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id 
+	 */
+	private static final long serialVersionUID = 1L;	
+	/**
+	 * 此模块对应的表名 
+	 */
+	public static final String TABLE_NAME = "tb_fee_item_record";	
+	/**
+	 * 此模块对应的权限码 
+	 */
+	public static final String PERMISSION_CODE = "tb-fee-item-record-list";
+	public static final String PERMISSION_CODE_ADD = "tb-fee-item-record-add";
+	public static final String PERMISSION_CODE_EDIT = "tb-fee-item-record-edit";
+	public static final String PERMISSION_CODE_DEL = "tb-fee-item-record-del";
+
+
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 主键 
+	 */
+	@TableId(type = IdType.AUTO)
+	private Long id;	
+
+	/**
+	 * 订单号 
+	 */
+	private String orderNo;	
+
+	/**
+	 * 费项ID 
+	 */
+	private Long itemId;	
+
+	/**
+	 * 收费类型类型(1=按交易额收取,2=按次收取) 
+	 */
+	private String feeType;	
+
+	/**
+	 * 类型对应的数值 
+	 */
+	private Double feeNum;	
+
+	/**
+	 * 收费项目 
+	 */
+	private String itemName;	
+
+	/**
+	 * 收费金额 
+	 */
+	private Double itemPrice;	
+
+	/**
+	 * 收费企业 
+	 */
+	private String companyName;	
+
+	/**
+	 * 企业ID 
+	 */
+	private Long companyId;	
+
+	/**
+	 * 二级市场订单 
+	 */
+	private Long levelTwoOrderId;	
+
+	/**
+	 * 二级订单单号 
+	 */
+	private String levelTwoOrderNo;	
+
+	/**
+	 * 创建时间 
+	 */
+	private String createTime;	
+
+	/**
+	 * 支付/划拨时间 
+	 */
+	private String payTime;	
+
+	/**
+	 * 支付/划拨状态(0=未划拨,1=划拨成功,2=划拨失败) 
+	 */
+	private String payStatus;	
+
+	/**
+	 * 支付备注 
+	 */
+	private String payRemark;	
+
+
+
+
+
+	
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item_record/TbFeeItemRecordController.java

@@ -0,0 +1,87 @@
+package com.pj.tb_fee_item_record;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import com.pj.utils.sg.*;
+import com.pj.project4sp.SP;
+
+import com.pj.current.satoken.StpUserUtil;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+
+/**
+ * Controller: tb_fee_item_record -- 费项订单
+ * @author yzs 
+ */
+@RestController
+@RequestMapping("/TbFeeItemRecord/")
+public class TbFeeItemRecordController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbFeeItemRecordService tbFeeItemRecordService;
+
+	/** 增 */  
+	@RequestMapping("add")
+	@SaCheckPermission(TbFeeItemRecord.PERMISSION_CODE_ADD)
+	public AjaxJson add(TbFeeItemRecord t){
+		tbFeeItemRecordService.add(t);
+		t = tbFeeItemRecordService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+	@SaCheckPermission(TbFeeItemRecord.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 tbFeeItemRecordService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+	@SaCheckPermission(TbFeeItemRecord.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(TbFeeItemRecord.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+	@SaCheckPermission(TbFeeItemRecord.PERMISSION_CODE_EDIT)
+	public AjaxJson update(TbFeeItemRecord t){
+		tbFeeItemRecordService.update(t);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+		@SaCheckPermission(TbFeeItemRecord.PERMISSION_CODE)
+	public AjaxJson getById(Long id){
+		TbFeeItemRecord t = tbFeeItemRecordService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+		@SaCheckPermission(TbFeeItemRecord.PERMISSION_CODE)
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbFeeItemRecord> list = tbFeeItemRecordService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+	
+	
+	
+	
+
+	
+	
+	
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item_record/TbFeeItemRecordMapper.java

@@ -0,0 +1,30 @@
+package com.pj.tb_fee_item_record;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.pj.utils.so.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Mapper: tb_fee_item_record -- 费项订单
+ * @author yzs 
+ */
+
+@Mapper
+@Repository
+public interface TbFeeItemRecordMapper extends BaseMapper <TbFeeItemRecord> {
+
+
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
+	List<TbFeeItemRecord> getList(SoMap so);
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item_record/TbFeeItemRecordMapper.xml

@@ -0,0 +1,71 @@
+<?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.pj.tb_fee_item_record.TbFeeItemRecordMapper">
+
+
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select id, order_no, item_id, fee_type, fee_num, item_name, item_price, company_name, company_id, level_two_order_id, level_two_order_no, create_time, pay_time, pay_status, pay_remark from tb_fee_item_record  -->
+	
+	<!-- 通用映射：自动模式 -->
+	<resultMap id="model" autoMapping="true" type="com.pj.tb_fee_item_record.TbFeeItemRecord"></resultMap>
+	
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select * 
+		from tb_fee_item_record 
+	</sql>
+
+	
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
+	<select id="getList" resultMap="model">
+		<include refid="select_sql"></include>
+		<where>
+			<if test=' this.has("id") '> and id = #{id} </if>
+			<if test=' this.has("orderNo") '> and order_no = #{orderNo} </if>
+			<if test=' this.has("itemId") '> and item_id = #{itemId} </if>
+			<if test=' this.has("feeType") '> and fee_type = #{feeType} </if>
+			<if test=' this.has("feeNum") '> and fee_num = #{feeNum} </if>
+			<if test=' this.has("itemName") '> and item_name = #{itemName} </if>
+			<if test=' this.has("itemPrice") '> and item_price = #{itemPrice} </if>
+			<if test=' this.has("companyName") '> and company_name = #{companyName} </if>
+			<if test=' this.has("companyId") '> and company_id = #{companyId} </if>
+			<if test=' this.has("levelTwoOrderId") '> and level_two_order_id = #{levelTwoOrderId} </if>
+			<if test=' this.has("levelTwoOrderNo") '> and level_two_order_no = #{levelTwoOrderNo} </if>
+			<if test=' this.has("createTime") '> and create_time = #{createTime} </if>
+			<if test=' this.has("payTime") '> and pay_time = #{payTime} </if>
+			<if test=' this.has("payStatus") '> and pay_status = #{payStatus} </if>
+			<if test=' this.has("payRemark") '> and pay_remark = #{payRemark} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> id desc </when>
+			<when test='sortType == 2'> order_no desc </when>
+			<when test='sortType == 3'> item_id desc </when>
+			<when test='sortType == 4'> fee_type desc </when>
+			<when test='sortType == 5'> fee_num desc </when>
+			<when test='sortType == 6'> item_name desc </when>
+			<when test='sortType == 7'> item_price desc </when>
+			<when test='sortType == 8'> company_name desc </when>
+			<when test='sortType == 9'> company_id desc </when>
+			<when test='sortType == 10'> level_two_order_id desc </when>
+			<when test='sortType == 11'> level_two_order_no desc </when>
+			<when test='sortType == 12'> create_time desc </when>
+			<when test='sortType == 13'> pay_time desc </when>
+			<when test='sortType == 14'> pay_status desc </when>
+			<when test='sortType == 15'> pay_remark desc </when>
+			<otherwise> id desc </otherwise>
+		</choose>
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+</mapper>

sp-service/level-two-server/src/main/java/com/pj/tb_fee_item_record/TbFeeItemRecordService.java

@@ -0,0 +1,51 @@
+package com.pj.tb_fee_item_record;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import com.pj.utils.sg.*;
+
+/**
+ * Service: tb_fee_item_record -- 费项订单
+ * @author yzs 
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class TbFeeItemRecordService extends ServiceImpl<TbFeeItemRecordMapper, TbFeeItemRecord> implements IService<TbFeeItemRecord>{
+
+	/** 底层 Mapper 对象 */
+	@Autowired
+	TbFeeItemRecordMapper tbFeeItemRecordMapper;
+
+	/** 增 */
+	void add(TbFeeItemRecord t){
+		save(t);
+	}
+
+	/** 删 */
+	void delete(Long id){
+		removeById(id);
+	}
+
+	/** 改 */
+	void update(TbFeeItemRecord t){
+		updateById(t);
+
+	}
+
+	/** 查 */
+	TbFeeItemRecord getById(Long id){
+		return super.getById(id);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	List<TbFeeItemRecord> getList(SoMap so) { 
+		return tbFeeItemRecordMapper.getList(so);	
+	}
+	
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_people_profit/TbPeopleProfit.java

@@ -0,0 +1,70 @@
+package com.pj.tb_people_profit;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * Model: tb_people_profit -- 边民收益设置
+ * @author qzyReal 
+ */
+@Data
+@Accessors(chain = true)
+@TableName(TbPeopleProfit.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class TbPeopleProfit extends Model<TbPeopleProfit> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id 
+	 */
+	private static final long serialVersionUID = 1L;	
+	/**
+	 * 此模块对应的表名 
+	 */
+	public static final String TABLE_NAME = "tb_people_profit";	
+	/**
+	 * 此模块对应的权限码 
+	 */
+	public static final String PERMISSION_CODE = "tb-people-profit";	
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 主键 
+	 */
+
+	public String id;
+
+	/**
+	 * 类型(0=均分,1=按笔数算,2=交易比例) 
+	 */
+	public int type;
+
+	/**
+	 * 类型名称 
+	 */
+	public String typeName;	
+
+	/**
+	 * 状态(0=启用,1=禁用) 
+	 */
+	public String status;	
+
+	/**
+	 * 数值 
+	 */
+	public Double num;	
+
+
+
+
+
+	
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_people_profit/TbPeopleProfitController.java

@@ -0,0 +1,92 @@
+package com.pj.tb_people_profit;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.pj.project4sp.SP;
+import com.pj.utils.sg.AjaxJson;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+
+/**
+ * Controller: tb_people_profit -- 边民收益设置
+ * @author qzyReal 
+ */
+@RestController
+@RequestMapping("/TbPeopleProfit/")
+public class TbPeopleProfitController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbPeopleProfitService tbPeopleProfitService;
+
+	/** 增 */  
+	@RequestMapping("add")
+	//@SaCheckPermission(TbPeopleProfit.PERMISSION_CODE)
+	@Transactional(rollbackFor = Exception.class)
+	public AjaxJson add(TbPeopleProfit t){
+		tbPeopleProfitService.add(t);
+		t = tbPeopleProfitService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+	//@SaCheckPermission(TbPeopleProfit.PERMISSION_CODE)
+	public AjaxJson delete(Long id){
+		int line = tbPeopleProfitService.delete(id);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+	//@SaCheckPermission(TbPeopleProfit.PERMISSION_CODE)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
+		int line = SP.publicMapper.deleteByIds(TbPeopleProfit.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+	@SaCheckPermission(TbPeopleProfit.PERMISSION_CODE)
+	public AjaxJson update(TbPeopleProfit t){
+		int line = tbPeopleProfitService.update(t);
+		return AjaxJson.getByLine(line);
+	}
+
+    /** 查 - 根据id */
+    @RequestMapping("getOne")
+    public AjaxJson getOne(){
+        TbPeopleProfit t = tbPeopleProfitService.getOne();
+        return AjaxJson.getSuccessData(t);
+    }
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+	public AjaxJson getById(Long id){
+		TbPeopleProfit t = tbPeopleProfitService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbPeopleProfit> list = tbPeopleProfitService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+	
+	
+
+	
+	
+	
+	
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_people_profit/TbPeopleProfitMapper.java

@@ -0,0 +1,56 @@
+package com.pj.tb_people_profit;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.pj.utils.so.SoMap;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Mapper: tb_people_profit -- 边民收益设置
+ * @author qzyReal 
+ */
+
+@Mapper
+@Repository
+public interface TbPeopleProfitMapper extends BaseMapper <TbPeopleProfit> {
+
+	/**
+	 * 增  
+	 * @param t 实体对象 
+	 * @return 受影响行数 
+	 */
+	int add(TbPeopleProfit t);
+
+	/**
+	 * 删  
+	 * @param id 要删除的数据id  
+	 * @return 受影响行数 
+	 */
+	int delete(Long id);	 
+
+	/** 
+	 * 改  
+	 * @param t 实体对象 
+	 * @return 受影响行数 
+	 */
+	int update(TbPeopleProfit t);
+
+	/** 
+	 * 查 - 根据id  
+	 * @param id 要查询的数据id 
+	 * @return 实体对象 
+	 */
+	TbPeopleProfit getById(Long id);	 
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
+	List<TbPeopleProfit> getList(SoMap so);
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_people_profit/TbPeopleProfitMapper.xml

@@ -0,0 +1,84 @@
+<?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.pj.tb_people_profit.TbPeopleProfitMapper">
+
+	<!-- 增 [G] -->
+	<insert id="add">
+		insert into 
+		tb_people_profit (id, type, type_name, status, num) 
+		values (#{id}, #{type}, #{typeName}, #{status}, #{num}) 
+	</insert>
+
+	<!-- 删 -->
+	<delete id="delete">
+		delete from tb_people_profit 
+		where id = #{id}
+	</delete>
+
+	<!-- 改 [G] -->
+	<update id="update">
+		update tb_people_profit set
+		id = #{id}, 
+		type = #{type}, 
+		type_name = #{typeName}, 
+		status = #{status}, 
+		num = #{num}
+		where id = #{id}
+	</update>
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select id, type, type_name, status, num from tb_people_profit  -->
+	
+	<!-- 通用映射：手动模式 -->
+	<resultMap id="model" type="com.pj.tb_people_profit.TbPeopleProfit">
+		<result property="id" column="id" />
+		<result property="type" column="type" />
+		<result property="typeName" column="type_name" />
+		<result property="status" column="status" />
+		<result property="num" column="num" />
+	</resultMap>
+	
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select * 
+		from tb_people_profit 
+	</sql>
+	
+	<!-- 查 - 根据id -->
+	<select id="getById" resultMap="model">
+		<include refid="select_sql"></include>
+		where id = #{id}
+	</select>
+	
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
+	<select id="getList" resultMap="model">
+		<include refid="select_sql"></include>
+		<where>
+			<if test=' this.isNotNull("id") '> and id = #{id} </if>
+			<if test=' this.isNotNull("type") '> and type = #{type} </if>
+			<if test=' this.isNotNull("typeName") '> and type_name = #{typeName} </if>
+			<if test=' this.isNotNull("status") '> and status = #{status} </if>
+			<if test=' this.isNotNull("num") '> and num = #{num} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> id desc </when>
+			<when test='sortType == 2'> type desc </when>
+			<when test='sortType == 3'> type_name desc </when>
+			<when test='sortType == 4'> status desc </when>
+			<when test='sortType == 5'> num desc </when>
+			<otherwise> id </otherwise>
+		</choose>
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+</mapper>

sp-service/level-two-server/src/main/java/com/pj/tb_people_profit/TbPeopleProfitService.java

@@ -0,0 +1,73 @@
+package com.pj.tb_people_profit;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Service: tb_people_profit -- 边民收益设置
+ *
+ * @author qzyReal
+ */
+@Service
+public class TbPeopleProfitService extends ServiceImpl<TbPeopleProfitMapper, TbPeopleProfit> implements IService<TbPeopleProfit> {
+
+    /**
+     * 底层 Mapper 对象
+     */
+    @Autowired
+    TbPeopleProfitMapper tbPeopleProfitMapper;
+
+    /**
+     * 增
+     */
+    int add(TbPeopleProfit t) {
+        return tbPeopleProfitMapper.add(t);
+    }
+
+    /**
+     * 删
+     */
+    int delete(Long id) {
+        return tbPeopleProfitMapper.delete(id);
+    }
+
+    /**
+     * 改
+     */
+    int update(TbPeopleProfit t) {
+        return tbPeopleProfitMapper.update(t);
+    }
+
+    /**
+     * 查
+     */
+    TbPeopleProfit getById(Long id) {
+        return tbPeopleProfitMapper.getById(id);
+    }
+
+    /**
+     * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+     */
+    List<TbPeopleProfit> getList(SoMap so) {
+        return tbPeopleProfitMapper.getList(so);
+    }
+
+    public TbPeopleProfit getActiveOne() {
+        QueryWrapper<TbPeopleProfit> ew = new QueryWrapper<>();
+        ew.eq("status", 1);
+        return this.getOne(ew);
+    }
+
+    public TbPeopleProfit getOne() {
+        SoMap so = SoMap.getRequestSoMap();
+        List<TbPeopleProfit> list = tbPeopleProfitMapper.getList(so);
+        return  list.isEmpty() ? null : list.get(0);
+    }
+}

sp-service/level-two-server/src/main/java/com/pj/tb_people_profit_record/TbPeopleProfitRecord.java

@@ -0,0 +1,110 @@
+package com.pj.tb_people_profit_record;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.EqualsAndHashCode;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * Model: tb_people_profit_record -- 边民收益记录
+ * @author yzs 
+ */
+@Data
+@Accessors(chain = true)
+@TableName(TbPeopleProfitRecord.TABLE_NAME)
+@EqualsAndHashCode(callSuper = false)
+public class TbPeopleProfitRecord extends Model<TbPeopleProfitRecord> implements Serializable {
+
+	// ---------- 模块常量 ----------
+	/**
+	 * 序列化版本id 
+	 */
+	private static final long serialVersionUID = 1L;	
+	/**
+	 * 此模块对应的表名 
+	 */
+	public static final String TABLE_NAME = "tb_people_profit_record";	
+	/**
+	 * 此模块对应的权限码 
+	 */
+	public static final String PERMISSION_CODE = "tb-people-profit-record-list";
+	public static final String PERMISSION_CODE_ADD = "tb-people-profit-record-add";
+	public static final String PERMISSION_CODE_EDIT = "tb-people-profit-record-edit";
+	public static final String PERMISSION_CODE_DEL = "tb-people-profit-record-del";
+
+
+
+
+	// ---------- 表中字段 ----------
+	/**
+	 * 主键 
+	 */
+	@TableId(type = IdType.AUTO)
+	private Long id;	
+
+	/**
+	 * 边民ID 
+	 */
+	private Long peopleId;	
+
+	/**
+	 * 边民姓名 
+	 */
+	private String peopleName;	
+
+	/**
+	 * 二级市场订单ID 
+	 */
+	private Long levelTwoOrderId;	
+
+	/**
+	 * 二级市场订单号 
+	 */
+	private String levelTwoOrderNo;	
+
+	/**
+	 * 收益金额 
+	 */
+	private Double price;	
+
+	/**
+	 * 收益类型(0=均分,1=按笔数算,2=交易比例) 
+	 */
+	private String profitType;	
+
+	/**
+	 * 收益数值 
+	 */
+	private Double profitNum;	
+
+	/**
+	 * 创建时间 
+	 */
+	private String createTime;	
+
+	/**
+	 * 支付/划拨时间 
+	 */
+	private String payTime;	
+
+	/**
+	 * 支付/划拨状态(0=未划拨,1=划拨成功,2=划拨失败) 
+	 */
+	private String payStatus;	
+
+	/**
+	 * 支付备注 
+	 */
+	private String payRemark;	
+
+
+
+
+
+	
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_people_profit_record/TbPeopleProfitRecordController.java

@@ -0,0 +1,87 @@
+package com.pj.tb_people_profit_record;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import com.pj.utils.sg.*;
+import com.pj.project4sp.SP;
+
+import com.pj.current.satoken.StpUserUtil;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+
+/**
+ * Controller: tb_people_profit_record -- 边民收益记录
+ * @author yzs 
+ */
+@RestController
+@RequestMapping("/TbPeopleProfitRecord/")
+public class TbPeopleProfitRecordController {
+
+	/** 底层 Service 对象 */
+	@Autowired
+	TbPeopleProfitRecordService tbPeopleProfitRecordService;
+
+	/** 增 */  
+	@RequestMapping("add")
+	@SaCheckPermission(TbPeopleProfitRecord.PERMISSION_CODE_ADD)
+	public AjaxJson add(TbPeopleProfitRecord t){
+		tbPeopleProfitRecordService.add(t);
+		t = tbPeopleProfitRecordService.getById(SP.publicMapper.getPrimarykey());
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 删 */  
+	@RequestMapping("delete")
+	@SaCheckPermission(TbPeopleProfitRecord.PERMISSION_CODE_DEL)
+	public AjaxJson delete(Long id){
+		 tbPeopleProfitRecordService.delete(id);
+		return AjaxJson.getSuccess();
+	}
+	
+	/** 删 - 根据id列表 */  
+	@RequestMapping("deleteByIds")
+	@SaCheckPermission(TbPeopleProfitRecord.PERMISSION_CODE_DEL)
+	public AjaxJson deleteByIds(){
+		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
+		int line = SP.publicMapper.deleteByIds(TbPeopleProfitRecord.TABLE_NAME, ids);
+		return AjaxJson.getByLine(line);
+	}
+	
+	/** 改 */  
+	@RequestMapping("update")
+	@SaCheckPermission(TbPeopleProfitRecord.PERMISSION_CODE_EDIT)
+	public AjaxJson update(TbPeopleProfitRecord t){
+		tbPeopleProfitRecordService.update(t);
+		return AjaxJson.getSuccess();
+	}
+
+	/** 查 - 根据id */  
+	@RequestMapping("getById")
+		@SaCheckPermission(TbPeopleProfitRecord.PERMISSION_CODE)
+	public AjaxJson getById(Long id){
+		TbPeopleProfitRecord t = tbPeopleProfitRecordService.getById(id);
+		return AjaxJson.getSuccessData(t);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	@RequestMapping("getList")
+		@SaCheckPermission(TbPeopleProfitRecord.PERMISSION_CODE)
+	public AjaxJson getList() { 
+		SoMap so = SoMap.getRequestSoMap();
+		List<TbPeopleProfitRecord> list = tbPeopleProfitRecordService.getList(so.startPage());
+		return AjaxJson.getPageData(so.getDataCount(), list);
+	}
+	
+	
+	
+	
+
+	
+	
+	
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_people_profit_record/TbPeopleProfitRecordMapper.java

@@ -0,0 +1,30 @@
+package com.pj.tb_people_profit_record;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.pj.utils.so.*;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Mapper: tb_people_profit_record -- 边民收益记录
+ * @author yzs 
+ */
+
+@Mapper
+@Repository
+public interface TbPeopleProfitRecordMapper extends BaseMapper <TbPeopleProfitRecord> {
+
+
+
+	/**
+	 * 查集合 - 根据条件（参数为空时代表忽略指定条件）
+	 * @param so 参数集合 
+	 * @return 数据列表 
+	 */
+	List<TbPeopleProfitRecord> getList(SoMap so);
+
+
+}

sp-service/level-two-server/src/main/java/com/pj/tb_people_profit_record/TbPeopleProfitRecordMapper.xml

@@ -0,0 +1,65 @@
+<?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.pj.tb_people_profit_record.TbPeopleProfitRecordMapper">
+
+
+
+
+	<!-- ================================== 查询相关 ================================== -->
+	<!-- select id, people_id, people_name, level_two_order_id, level_two_order_no, price, profit_type, profit_num, create_time, pay_time, pay_status, pay_remark from tb_people_profit_record  -->
+	
+	<!-- 通用映射：自动模式 -->
+	<resultMap id="model" autoMapping="true" type="com.pj.tb_people_profit_record.TbPeopleProfitRecord"></resultMap>
+	
+	<!-- 公共查询sql片段 -->
+	<sql id="select_sql">
+		select * 
+		from tb_people_profit_record 
+	</sql>
+
+	
+	<!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
+	<select id="getList" resultMap="model">
+		<include refid="select_sql"></include>
+		<where>
+			<if test=' this.has("id") '> and id = #{id} </if>
+			<if test=' this.has("peopleId") '> and people_id = #{peopleId} </if>
+			<if test=' this.has("peopleName") '> and people_name = #{peopleName} </if>
+			<if test=' this.has("levelTwoOrderId") '> and level_two_order_id = #{levelTwoOrderId} </if>
+			<if test=' this.has("levelTwoOrderNo") '> and level_two_order_no = #{levelTwoOrderNo} </if>
+			<if test=' this.has("price") '> and price = #{price} </if>
+			<if test=' this.has("profitType") '> and profit_type = #{profitType} </if>
+			<if test=' this.has("profitNum") '> and profit_num = #{profitNum} </if>
+			<if test=' this.has("createTime") '> and create_time = #{createTime} </if>
+			<if test=' this.has("payTime") '> and pay_time = #{payTime} </if>
+			<if test=' this.has("payStatus") '> and pay_status = #{payStatus} </if>
+			<if test=' this.has("payRemark") '> and pay_remark = #{payRemark} </if>
+		</where>
+		order by
+		<choose>
+			<when test='sortType == 1'> id desc </when>
+			<when test='sortType == 2'> people_id desc </when>
+			<when test='sortType == 3'> people_name desc </when>
+			<when test='sortType == 4'> level_two_order_id desc </when>
+			<when test='sortType == 5'> level_two_order_no desc </when>
+			<when test='sortType == 6'> price desc </when>
+			<when test='sortType == 7'> profit_type desc </when>
+			<when test='sortType == 8'> profit_num desc </when>
+			<when test='sortType == 9'> create_time desc </when>
+			<when test='sortType == 10'> pay_time desc </when>
+			<when test='sortType == 11'> pay_status desc </when>
+			<when test='sortType == 12'> pay_remark desc </when>
+			<otherwise> id desc </otherwise>
+		</choose>
+	</select>
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+</mapper>

sp-service/level-two-server/src/main/java/com/pj/tb_people_profit_record/TbPeopleProfitRecordService.java

@@ -0,0 +1,51 @@
+package com.pj.tb_people_profit_record;
+
+import java.util.List;
+import com.pj.utils.so.SoMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import com.pj.utils.sg.*;
+
+/**
+ * Service: tb_people_profit_record -- 边民收益记录
+ * @author yzs 
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class TbPeopleProfitRecordService extends ServiceImpl<TbPeopleProfitRecordMapper, TbPeopleProfitRecord> implements IService<TbPeopleProfitRecord>{
+
+	/** 底层 Mapper 对象 */
+	@Autowired
+	TbPeopleProfitRecordMapper tbPeopleProfitRecordMapper;
+
+	/** 增 */
+	void add(TbPeopleProfitRecord t){
+		save(t);
+	}
+
+	/** 删 */
+	void delete(Long id){
+		removeById(id);
+	}
+
+	/** 改 */
+	void update(TbPeopleProfitRecord t){
+		updateById(t);
+
+	}
+
+	/** 查 */
+	TbPeopleProfitRecord getById(Long id){
+		return super.getById(id);
+	}
+
+	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
+	List<TbPeopleProfitRecord> getList(SoMap so) { 
+		return tbPeopleProfitRecordMapper.getList(so);	
+	}
+	
+
+}

sp-service/sp-admin/src/main/java/com/pj/project4sp/admin4login/SpAccAdminController.java

@@ -12,6 +12,7 @@ import cn.hutool.json.JSONUtil;
 import com.pj.current.satoken.AuthConst;
 import com.pj.utils.cache.RedisUtil;
 import com.wf.captcha.ArithmeticCaptcha;
+import com.wf.captcha.SpecCaptcha;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -78,7 +79,7 @@ public class SpAccAdminController {
 	private TimedCache<String, RSA> KEY_CACHE = CacheUtil.newTimedCache(60000);
 	@PostMapping("captcha")
 	public AjaxJson render() {
-		ArithmeticCaptcha captcha = new ArithmeticCaptcha(130, 48);
+		SpecCaptcha captcha = new SpecCaptcha(130, 48);
 		String key = UUID.randomUUID().toString();
 		String verCode = captcha.text().toLowerCase();   // 获取验证码的字符
 		RedisUtil.setBySECONDS(key, verCode, 60);