ioioio 3 роки тому
батько
коміт
8c1dbf0589
34 змінених файлів з 1676 додано та 3 видалено
  1. 34 0
      blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/JdCorpsDTO.java
  2. 34 0
      blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/JdEmployeeDTO.java
  3. 34 0
      blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/JdModuleDTO.java
  4. 34 0
      blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/JdTenantDTO.java
  5. 63 0
      blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/JdCorps.java
  6. 62 0
      blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/JdEmployee.java
  7. 68 0
      blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/JdModule.java
  8. 57 0
      blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/JdTenant.java
  9. 36 0
      blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/JdCorpsVO.java
  10. 36 0
      blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/JdEmployeeVO.java
  11. 36 0
      blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/JdModuleVO.java
  12. 36 0
      blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/JdTenantVO.java
  13. 126 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/controller/JdCorpsController.java
  14. 126 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/controller/JdEmployeeController.java
  15. 126 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/controller/JdModuleController.java
  16. 126 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/controller/JdTenantController.java
  17. 42 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdCorpsMapper.java
  18. 19 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdCorpsMapper.xml
  19. 42 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdEmployeeMapper.java
  20. 19 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdEmployeeMapper.xml
  21. 42 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdModuleMapper.java
  22. 20 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdModuleMapper.xml
  23. 42 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdTenantMapper.java
  24. 21 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdTenantMapper.xml
  25. 41 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/service/IJdCorpsService.java
  26. 41 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/service/IJdEmployeeService.java
  27. 41 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/service/IJdModuleService.java
  28. 41 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/service/IJdTenantService.java
  29. 41 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/JdCorpsServiceImpl.java
  30. 41 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/JdEmployeeServiceImpl.java
  31. 41 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/JdModuleServiceImpl.java
  32. 41 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/JdTenantServiceImpl.java
  33. 66 3
      blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java
  34. 1 0
      blade-service/trade-finance/src/main/java/org/springblade/finance/tool/JdyTool.java

+ 34 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/JdCorpsDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.dto;
+
+import org.springblade.finance.entity.JdCorps;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JdCorpsDTO extends JdCorps {
+	private static final long serialVersionUID = 1L;
+
+}

+ 34 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/JdEmployeeDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.dto;
+
+import org.springblade.finance.entity.JdEmployee;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JdEmployeeDTO extends JdEmployee {
+	private static final long serialVersionUID = 1L;
+
+}

+ 34 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/JdModuleDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.dto;
+
+import org.springblade.finance.entity.JdModule;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 租户jd模块表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JdModuleDTO extends JdModule {
+	private static final long serialVersionUID = 1L;
+
+}

+ 34 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/JdTenantDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.dto;
+
+import org.springblade.finance.entity.JdTenant;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 租户jd配置信息表数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JdTenantDTO extends JdTenant {
+	private static final long serialVersionUID = 1L;
+
+}

+ 63 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/JdCorps.java

@@ -0,0 +1,63 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.entity;
+
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Data
+@ApiModel(value = "JdCorps对象", description = "JdCorps对象")
+public class JdCorps implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	/**
+	* 供应商名称
+	*/
+		@ApiModelProperty(value = "供应商名称")
+		private String corpsName;
+	/**
+	* 供应商编号
+	*/
+		@ApiModelProperty(value = "供应商编号")
+		private String corpsCode;
+	/**
+	* 所属账套id
+	*/
+		@ApiModelProperty(value = "所属账套id")
+		private String accountId;
+	/**
+	* 所属账套
+	*/
+		@ApiModelProperty(value = "所属账套")
+		private String accountName;
+
+	@ApiModelProperty(value = "租户id")
+	private String tenantId;
+
+
+}

+ 62 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/JdEmployee.java

@@ -0,0 +1,62 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.entity;
+
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Data
+@ApiModel(value = "JdEmployee对象", description = "JdEmployee对象")
+public class JdEmployee implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	/**
+	* 业务员
+	*/
+		@ApiModelProperty(value = "业务员")
+		private String employeeName;
+	/**
+	* 业务员编码
+	*/
+		@ApiModelProperty(value = "业务员编码")
+		private String employeeCode;
+	/**
+	* 所属账套id
+	*/
+		@ApiModelProperty(value = "所属账套id")
+		private String accountId;
+	/**
+	* 所属账套
+	*/
+		@ApiModelProperty(value = "所属账套")
+		private String accountName;
+
+
+	@ApiModelProperty(value = "租户id")
+	private String tenantId;
+}

+ 68 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/JdModule.java

@@ -0,0 +1,68 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.entity;
+
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 租户jd模块表实体类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Data
+@ApiModel(value = "JdModule对象", description = "租户jd模块表")
+public class JdModule implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	/**
+	* 模块名称
+	*/
+		@ApiModelProperty(value = "模块名称")
+		private String module;
+	/**
+	* d 或 c
+	*/
+		@ApiModelProperty(value = "d 或 c")
+		private String dc;
+	/**
+	* 科目编码
+	*/
+		@ApiModelProperty(value = "科目编码")
+		private String projectCode;
+	/**
+	* 所属账套id
+	*/
+		@ApiModelProperty(value = "所属账套id")
+		private String accountId;
+	/**
+	* 所属账套
+	*/
+		@ApiModelProperty(value = "所属账套")
+		private String accountName;
+
+	@ApiModelProperty(value = "租户id")
+	private String tenantId;
+
+
+}

+ 57 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/JdTenant.java

@@ -0,0 +1,57 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.entity;
+
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 租户jd配置信息表实体类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Data
+@ApiModel(value = "JdTenant对象", description = "租户jd配置信息表")
+public class JdTenant implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	/**
+	* 租户名称
+	*/
+		@ApiModelProperty(value = "租户名称")
+		private String tenantName;
+	private String clientId;
+	private String clientSecret;
+	private String username;
+	private String password;
+	/**
+	* 0.未启动 1启动
+	*/
+		@ApiModelProperty(value = "0.未启动 1启动")
+		private Boolean isEnable;
+
+	@ApiModelProperty(value = "租户id")
+	private String tenantId;
+
+
+}

+ 36 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/JdCorpsVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.vo;
+
+import org.springblade.finance.entity.JdCorps;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "JdCorpsVO对象", description = "JdCorpsVO对象")
+public class JdCorpsVO extends JdCorps {
+	private static final long serialVersionUID = 1L;
+
+}

+ 36 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/JdEmployeeVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.vo;
+
+import org.springblade.finance.entity.JdEmployee;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "JdEmployeeVO对象", description = "JdEmployeeVO对象")
+public class JdEmployeeVO extends JdEmployee {
+	private static final long serialVersionUID = 1L;
+
+}

+ 36 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/JdModuleVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.vo;
+
+import org.springblade.finance.entity.JdModule;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 租户jd模块表视图实体类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "JdModuleVO对象", description = "租户jd模块表")
+public class JdModuleVO extends JdModule {
+	private static final long serialVersionUID = 1L;
+
+}

+ 36 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/JdTenantVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.vo;
+
+import org.springblade.finance.entity.JdTenant;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 租户jd配置信息表视图实体类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "JdTenantVO对象", description = "租户jd配置信息表")
+public class JdTenantVO extends JdTenant {
+	private static final long serialVersionUID = 1L;
+
+}

+ 126 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/controller/JdCorpsController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.finance.entity.JdCorps;
+import org.springblade.finance.vo.JdCorpsVO;
+import org.springblade.finance.service.IJdCorpsService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/jdcorps")
+@Api(value = "", tags = "接口")
+public class JdCorpsController extends BladeController {
+
+	private final IJdCorpsService jdCorpsService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入jdCorps")
+	public R<JdCorps> detail(JdCorps jdCorps) {
+		JdCorps detail = jdCorpsService.getOne(Condition.getQueryWrapper(jdCorps));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入jdCorps")
+	public R<IPage<JdCorps>> list(JdCorps jdCorps, Query query) {
+		IPage<JdCorps> pages = jdCorpsService.page(Condition.getPage(query), Condition.getQueryWrapper(jdCorps));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入jdCorps")
+	public R<IPage<JdCorpsVO>> page(JdCorpsVO jdCorps, Query query) {
+		IPage<JdCorpsVO> pages = jdCorpsService.selectJdCorpsPage(Condition.getPage(query), jdCorps);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入jdCorps")
+	public R save(@Valid @RequestBody JdCorps jdCorps) {
+		return R.status(jdCorpsService.save(jdCorps));
+	}
+
+	/**
+	 * 修改 
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入jdCorps")
+	public R update(@Valid @RequestBody JdCorps jdCorps) {
+		return R.status(jdCorpsService.updateById(jdCorps));
+	}
+
+	/**
+	 * 新增或修改 
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入jdCorps")
+	public R submit(@Valid @RequestBody JdCorps jdCorps) {
+		return R.status(jdCorpsService.saveOrUpdate(jdCorps));
+	}
+
+	
+	/**
+	 * 删除 
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(jdCorpsService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

+ 126 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/controller/JdEmployeeController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.finance.entity.JdEmployee;
+import org.springblade.finance.vo.JdEmployeeVO;
+import org.springblade.finance.service.IJdEmployeeService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/jdemployee")
+@Api(value = "", tags = "接口")
+public class JdEmployeeController extends BladeController {
+
+	private final IJdEmployeeService jdEmployeeService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入jdEmployee")
+	public R<JdEmployee> detail(JdEmployee jdEmployee) {
+		JdEmployee detail = jdEmployeeService.getOne(Condition.getQueryWrapper(jdEmployee));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入jdEmployee")
+	public R<IPage<JdEmployee>> list(JdEmployee jdEmployee, Query query) {
+		IPage<JdEmployee> pages = jdEmployeeService.page(Condition.getPage(query), Condition.getQueryWrapper(jdEmployee));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入jdEmployee")
+	public R<IPage<JdEmployeeVO>> page(JdEmployeeVO jdEmployee, Query query) {
+		IPage<JdEmployeeVO> pages = jdEmployeeService.selectJdEmployeePage(Condition.getPage(query), jdEmployee);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入jdEmployee")
+	public R save(@Valid @RequestBody JdEmployee jdEmployee) {
+		return R.status(jdEmployeeService.save(jdEmployee));
+	}
+
+	/**
+	 * 修改 
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入jdEmployee")
+	public R update(@Valid @RequestBody JdEmployee jdEmployee) {
+		return R.status(jdEmployeeService.updateById(jdEmployee));
+	}
+
+	/**
+	 * 新增或修改 
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入jdEmployee")
+	public R submit(@Valid @RequestBody JdEmployee jdEmployee) {
+		return R.status(jdEmployeeService.saveOrUpdate(jdEmployee));
+	}
+
+	
+	/**
+	 * 删除 
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(jdEmployeeService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

+ 126 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/controller/JdModuleController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.finance.entity.JdModule;
+import org.springblade.finance.vo.JdModuleVO;
+import org.springblade.finance.service.IJdModuleService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 租户jd模块表 控制器
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/jdmodule")
+@Api(value = "租户jd模块表", tags = "租户jd模块表接口")
+public class JdModuleController extends BladeController {
+
+	private final IJdModuleService jdModuleService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入jdModule")
+	public R<JdModule> detail(JdModule jdModule) {
+		JdModule detail = jdModuleService.getOne(Condition.getQueryWrapper(jdModule));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 租户jd模块表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入jdModule")
+	public R<IPage<JdModule>> list(JdModule jdModule, Query query) {
+		IPage<JdModule> pages = jdModuleService.page(Condition.getPage(query), Condition.getQueryWrapper(jdModule));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 租户jd模块表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入jdModule")
+	public R<IPage<JdModuleVO>> page(JdModuleVO jdModule, Query query) {
+		IPage<JdModuleVO> pages = jdModuleService.selectJdModulePage(Condition.getPage(query), jdModule);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 租户jd模块表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入jdModule")
+	public R save(@Valid @RequestBody JdModule jdModule) {
+		return R.status(jdModuleService.save(jdModule));
+	}
+
+	/**
+	 * 修改 租户jd模块表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入jdModule")
+	public R update(@Valid @RequestBody JdModule jdModule) {
+		return R.status(jdModuleService.updateById(jdModule));
+	}
+
+	/**
+	 * 新增或修改 租户jd模块表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入jdModule")
+	public R submit(@Valid @RequestBody JdModule jdModule) {
+		return R.status(jdModuleService.saveOrUpdate(jdModule));
+	}
+
+	
+	/**
+	 * 删除 租户jd模块表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(jdModuleService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

+ 126 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/controller/JdTenantController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.finance.entity.JdTenant;
+import org.springblade.finance.vo.JdTenantVO;
+import org.springblade.finance.service.IJdTenantService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ * 租户jd配置信息表 控制器
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/jdtenant")
+@Api(value = "租户jd配置信息表", tags = "租户jd配置信息表接口")
+public class JdTenantController extends BladeController {
+
+	private final IJdTenantService jdTenantService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入jdTenant")
+	public R<JdTenant> detail(JdTenant jdTenant) {
+		JdTenant detail = jdTenantService.getOne(Condition.getQueryWrapper(jdTenant));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 租户jd配置信息表
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入jdTenant")
+	public R<IPage<JdTenant>> list(JdTenant jdTenant, Query query) {
+		IPage<JdTenant> pages = jdTenantService.page(Condition.getPage(query), Condition.getQueryWrapper(jdTenant));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 租户jd配置信息表
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入jdTenant")
+	public R<IPage<JdTenantVO>> page(JdTenantVO jdTenant, Query query) {
+		IPage<JdTenantVO> pages = jdTenantService.selectJdTenantPage(Condition.getPage(query), jdTenant);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 租户jd配置信息表
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入jdTenant")
+	public R save(@Valid @RequestBody JdTenant jdTenant) {
+		return R.status(jdTenantService.save(jdTenant));
+	}
+
+	/**
+	 * 修改 租户jd配置信息表
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入jdTenant")
+	public R update(@Valid @RequestBody JdTenant jdTenant) {
+		return R.status(jdTenantService.updateById(jdTenant));
+	}
+
+	/**
+	 * 新增或修改 租户jd配置信息表
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入jdTenant")
+	public R submit(@Valid @RequestBody JdTenant jdTenant) {
+		return R.status(jdTenantService.saveOrUpdate(jdTenant));
+	}
+
+	
+	/**
+	 * 删除 租户jd配置信息表
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(jdTenantService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

+ 42 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdCorpsMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.mapper;
+
+import org.springblade.finance.entity.JdCorps;
+import org.springblade.finance.vo.JdCorpsVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+public interface JdCorpsMapper extends BaseMapper<JdCorps> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param jdCorps
+	 * @return
+	 */
+	List<JdCorpsVO> selectJdCorpsPage(IPage page, JdCorpsVO jdCorps);
+
+}

+ 19 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdCorpsMapper.xml

@@ -0,0 +1,19 @@
+<?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="org.springblade.finance.mapper.JdCorpsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="jdCorpsResultMap" type="org.springblade.finance.entity.JdCorps">
+        <id column="id" property="id"/>
+        <result column="corps_name" property="corpsName"/>
+        <result column="corps_code" property="corpsCode"/>
+        <result column="account_id" property="accountId"/>
+        <result column="account_name" property="accountName"/>
+    </resultMap>
+
+
+    <select id="selectJdCorpsPage" resultMap="jdCorpsResultMap">
+        select * from jd_corps where is_deleted = 0
+    </select>
+
+</mapper>

+ 42 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdEmployeeMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.mapper;
+
+import org.springblade.finance.entity.JdEmployee;
+import org.springblade.finance.vo.JdEmployeeVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+public interface JdEmployeeMapper extends BaseMapper<JdEmployee> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param jdEmployee
+	 * @return
+	 */
+	List<JdEmployeeVO> selectJdEmployeePage(IPage page, JdEmployeeVO jdEmployee);
+
+}

+ 19 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdEmployeeMapper.xml

@@ -0,0 +1,19 @@
+<?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="org.springblade.finance.mapper.JdEmployeeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="jdEmployeeResultMap" type="org.springblade.finance.entity.JdEmployee">
+        <id column="id" property="id"/>
+        <result column="employee_name" property="employeeName"/>
+        <result column="employee_code" property="employeeCode"/>
+        <result column="account_id" property="accountId"/>
+        <result column="account_name" property="accountName"/>
+    </resultMap>
+
+
+    <select id="selectJdEmployeePage" resultMap="jdEmployeeResultMap">
+        select * from jd_employee where is_deleted = 0
+    </select>
+
+</mapper>

+ 42 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdModuleMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.mapper;
+
+import org.springblade.finance.entity.JdModule;
+import org.springblade.finance.vo.JdModuleVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 租户jd模块表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+public interface JdModuleMapper extends BaseMapper<JdModule> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param jdModule
+	 * @return
+	 */
+	List<JdModuleVO> selectJdModulePage(IPage page, JdModuleVO jdModule);
+
+}

+ 20 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdModuleMapper.xml

@@ -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="org.springblade.finance.mapper.JdModuleMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="jdModuleResultMap" type="org.springblade.finance.entity.JdModule">
+        <id column="id" property="id"/>
+        <result column="module" property="module"/>
+        <result column="dc" property="dc"/>
+        <result column="project_code" property="projectCode"/>
+        <result column="account_id" property="accountId"/>
+        <result column="account_name" property="accountName"/>
+    </resultMap>
+
+
+    <select id="selectJdModulePage" resultMap="jdModuleResultMap">
+        select * from jd_module where is_deleted = 0
+    </select>
+
+</mapper>

+ 42 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdTenantMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.mapper;
+
+import org.springblade.finance.entity.JdTenant;
+import org.springblade.finance.vo.JdTenantVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ * 租户jd配置信息表 Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+public interface JdTenantMapper extends BaseMapper<JdTenant> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param jdTenant
+	 * @return
+	 */
+	List<JdTenantVO> selectJdTenantPage(IPage page, JdTenantVO jdTenant);
+
+}

+ 21 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/JdTenantMapper.xml

@@ -0,0 +1,21 @@
+<?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="org.springblade.finance.mapper.JdTenantMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="jdTenantResultMap" type="org.springblade.finance.entity.JdTenant">
+        <id column="id" property="id"/>
+        <result column="tenant_name" property="tenantName"/>
+        <result column="client_id" property="clientId"/>
+        <result column="client_secret" property="clientSecret"/>
+        <result column="username" property="username"/>
+        <result column="password" property="password"/>
+        <result column="is_enable" property="isEnable"/>
+    </resultMap>
+
+
+    <select id="selectJdTenantPage" resultMap="jdTenantResultMap">
+        select * from jd_tenant where is_deleted = 0
+    </select>
+
+</mapper>

+ 41 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/service/IJdCorpsService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.service;
+
+import org.springblade.finance.entity.JdCorps;
+import org.springblade.finance.vo.JdCorpsVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+public interface IJdCorpsService extends IService<JdCorps> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param jdCorps
+	 * @return
+	 */
+	IPage<JdCorpsVO> selectJdCorpsPage(IPage<JdCorpsVO> page, JdCorpsVO jdCorps);
+
+}

+ 41 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/service/IJdEmployeeService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.service;
+
+import org.springblade.finance.entity.JdEmployee;
+import org.springblade.finance.vo.JdEmployeeVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+public interface IJdEmployeeService extends IService<JdEmployee> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param jdEmployee
+	 * @return
+	 */
+	IPage<JdEmployeeVO> selectJdEmployeePage(IPage<JdEmployeeVO> page, JdEmployeeVO jdEmployee);
+
+}

+ 41 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/service/IJdModuleService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.service;
+
+import org.springblade.finance.entity.JdModule;
+import org.springblade.finance.vo.JdModuleVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 租户jd模块表 服务类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+public interface IJdModuleService extends IService<JdModule> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param jdModule
+	 * @return
+	 */
+	IPage<JdModuleVO> selectJdModulePage(IPage<JdModuleVO> page, JdModuleVO jdModule);
+
+}

+ 41 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/service/IJdTenantService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.service;
+
+import org.springblade.finance.entity.JdTenant;
+import org.springblade.finance.vo.JdTenantVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 租户jd配置信息表 服务类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+public interface IJdTenantService extends IService<JdTenant> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param jdTenant
+	 * @return
+	 */
+	IPage<JdTenantVO> selectJdTenantPage(IPage<JdTenantVO> page, JdTenantVO jdTenant);
+
+}

+ 41 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/JdCorpsServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.service.impl;
+
+import org.springblade.finance.entity.JdCorps;
+import org.springblade.finance.vo.JdCorpsVO;
+import org.springblade.finance.mapper.JdCorpsMapper;
+import org.springblade.finance.service.IJdCorpsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Service
+public class JdCorpsServiceImpl extends ServiceImpl<JdCorpsMapper, JdCorps> implements IJdCorpsService {
+
+	@Override
+	public IPage<JdCorpsVO> selectJdCorpsPage(IPage<JdCorpsVO> page, JdCorpsVO jdCorps) {
+		return page.setRecords(baseMapper.selectJdCorpsPage(page, jdCorps));
+	}
+
+}

+ 41 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/JdEmployeeServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.service.impl;
+
+import org.springblade.finance.entity.JdEmployee;
+import org.springblade.finance.vo.JdEmployeeVO;
+import org.springblade.finance.mapper.JdEmployeeMapper;
+import org.springblade.finance.service.IJdEmployeeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Service
+public class JdEmployeeServiceImpl extends ServiceImpl<JdEmployeeMapper, JdEmployee> implements IJdEmployeeService {
+
+	@Override
+	public IPage<JdEmployeeVO> selectJdEmployeePage(IPage<JdEmployeeVO> page, JdEmployeeVO jdEmployee) {
+		return page.setRecords(baseMapper.selectJdEmployeePage(page, jdEmployee));
+	}
+
+}

+ 41 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/JdModuleServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.service.impl;
+
+import org.springblade.finance.entity.JdModule;
+import org.springblade.finance.vo.JdModuleVO;
+import org.springblade.finance.mapper.JdModuleMapper;
+import org.springblade.finance.service.IJdModuleService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 租户jd模块表 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Service
+public class JdModuleServiceImpl extends ServiceImpl<JdModuleMapper, JdModule> implements IJdModuleService {
+
+	@Override
+	public IPage<JdModuleVO> selectJdModulePage(IPage<JdModuleVO> page, JdModuleVO jdModule) {
+		return page.setRecords(baseMapper.selectJdModulePage(page, jdModule));
+	}
+
+}

+ 41 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/JdTenantServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.service.impl;
+
+import org.springblade.finance.entity.JdTenant;
+import org.springblade.finance.vo.JdTenantVO;
+import org.springblade.finance.mapper.JdTenantMapper;
+import org.springblade.finance.service.IJdTenantService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ * 租户jd配置信息表 服务实现类
+ *
+ * @author BladeX
+ * @since 2022-01-20
+ */
+@Service
+public class JdTenantServiceImpl extends ServiceImpl<JdTenantMapper, JdTenant> implements IJdTenantService {
+
+	@Override
+	public IPage<JdTenantVO> selectJdTenantPage(IPage<JdTenantVO> page, JdTenantVO jdTenant) {
+		return page.setRecords(baseMapper.selectJdTenantPage(page, jdTenant));
+	}
+
+}

+ 66 - 3
blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -18,9 +18,12 @@ package org.springblade.finance.service.impl;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.aliyun.tea.TeaConverter;
+import com.aliyun.tea.TeaPair;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jdy.v7sdk.models.AccountGroupRequest;
 import org.springblade.check.dto.AuditProecessDTO;
 import org.springblade.check.entity.AuditPathsActs;
 import org.springblade.check.entity.AuditPathsLevels;
@@ -32,8 +35,11 @@ import org.springblade.deliver.goods.entity.Delivery;
 import org.springblade.deliver.goods.entity.DeliveryFees;
 import org.springblade.deliver.goods.entity.DeliveryItems;
 import org.springblade.deliver.goods.feign.IDeliveryClient;
+import org.springblade.finance.TokenRequestQuery;
 import org.springblade.finance.dto.SettlementDTO;
+import org.springblade.finance.entity.JdTenant;
 import org.springblade.finance.enums.SettlementEnum;
+import org.springblade.finance.mapper.JdTenantMapper;
 import org.springblade.finance.vojo.*;
 import org.springblade.finance.mapper.AccMapper;
 import org.springblade.finance.mapper.ItemsMapper;
@@ -65,9 +71,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -99,6 +103,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 	private IDeliveryClient deliveryClient;
 
+	private JdTenantMapper jdTenantMapper;
+
 
 	@Override
 	public IPage<SettlementVO> selectSettlementPage(IPage<SettlementVO> page, SettlementVO settlement) {
@@ -1006,4 +1012,61 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		return businessOverpaymentClient.updateOverpayment(overpayment);
 	}
 
+
+	public void testSaveVoucher() throws Exception {
+
+		//非达沃特用户直接返回
+		if(!AuthUtil.getTenantId().equals("681169"))
+		{
+			return;
+		}
+		//1.获取AccountGroupRequest
+		AccountGroupRequest accountGroupRequest = this.getAccountGroupRequest();
+		if(accountGroupRequest==null)
+		{
+			throw new SecurityException("获取账套配置信息失败");
+		}
+		//2.获取账套
+		Map<String, String> group = this.getGroup(accountGroupRequest, "金蝶开发者测试账套");
+
+
+
+	}
+
+	//测试获取AccountGroupRequest
+	public AccountGroupRequest getAccountGroupRequest() throws Exception
+	{
+		//校验当前租户配置,如果存在配置,返回token
+		LambdaQueryWrapper<JdTenant> jdTenantLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		jdTenantLambdaQueryWrapper
+			.eq(JdTenant::getTenantId,AuthUtil.getTenantId())
+			.eq(JdTenant::getIsEnable,1);
+		JdTenant jdTenant = jdTenantMapper.selectOne(jdTenantLambdaQueryWrapper);
+		if(jdTenant==null)
+		{
+			throw new SecurityException("当前租户未配置凭证信息");
+		}
+		TokenRequestQuery tokenRequestQuery = TokenRequestQuery.build(TeaConverter.buildMap(
+			new TeaPair("clientId", jdTenant.getClientId()),
+			new TeaPair("clientSecret", jdTenant.getClientSecret()),
+			new TeaPair("username", jdTenant.getUsername()),
+			new TeaPair("password", jdTenant.getPassword())
+		));
+		//获取token
+		com.jdy.v7sdk.auth auth = new com.jdy.v7sdk.auth();
+		AccountGroupRequest accessTokenObject = auth.getToken(tokenRequestQuery);
+		return accessTokenObject;
+	}
+
+	//测试获取套账
+	public Map<String, String> getGroup (AccountGroupRequest accountGroupRequest,String accountName) throws Exception {
+		com.jdy.v7sdk.auth auth = new com.jdy.v7sdk.auth();
+		java.util.List<?> accountGroups = auth.getAccount(accountGroupRequest);
+		java.util.Map<String, Object> accountService = com.aliyun.teautil.Common.assertAsMap(accountGroups.get(0));
+		java.util.List<Object> groups = com.aliyun.teautil.Common.assertAsArray(accountService.get("accountGroups"));
+		java.util.Map<String, String> group = com.aliyun.teautil.Common.stringifyMapValue(com.aliyun.teautil.Common.assertAsMap(groups.get(1)));
+		return new HashMap();
+	}
+
+
 }

+ 1 - 0
blade-service/trade-finance/src/main/java/org/springblade/finance/tool/JdyTool.java

@@ -38,6 +38,7 @@ public class JdyTool
 		//获取账套
 		java.util.List<?> accountGroups = auth.getAccount(accessTokenObject);
 		//账套可能有多条,这里示例默认取第一条。
+
 		java.util.Map<String, Object> accountService = com.aliyun.teautil.Common.assertAsMap(accountGroups.get(0));
 		java.util.List<Object> groups = com.aliyun.teautil.Common.assertAsArray(accountService.get("accountGroups"));
 		java.util.Map<String, String> group = com.aliyun.teautil.Common.stringifyMapValue(com.aliyun.teautil.Common.assertAsMap(groups.get(1)));