Skip to content

GitLab

  • Menu
    • Projects Groups Snippets
      Help
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • X x3js
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • CI/CD
    • Repository
    • Value stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • BackEnd
  • x3js
  • Merge requests
  • !9

Merged
Created 2 years ago by 姜峻华@jiangjunhuaMaintainer

Test

  • Overview 0
  • Commits 6
  • Pipelines 6
  • Changes 20
  • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
Please register or sign in to reply
Compare
  • master (base)

and
  • latest version
    02da516e
    6 commits, 2 years ago

20 files
+ 1351
- 3

    Preferences

    File browser
    Compare changes
Busi‎ness‎
PersonCompan‎yBusiness.cs‎ +63 -0
UserBus‎iness.cs‎ +11 -0
DBCo‎ntext‎
SDCont‎ext.cs‎ +2 -0
Enti‎ties‎
BaseCo‎nfig.cs‎ +20 -0
TB_FDD‎Sign.cs‎ +56 -0
JS‎Api‎
Conte‎nt/img‎
fdd‎.jpg‎ +0 -0
Contr‎ollers‎
PersonCompany‎Controller.cs‎ +73 -0
UserCont‎roller.cs‎ +11 -0
JSAp‎i.xml‎ +33 -0
Mode‎l.xml‎ +195 -0
Progr‎am.cs‎ +4 -0
appsettings.De‎velopment.json‎ +8 -1
appsettings.P‎roduction.json‎ +8 -0
Mo‎del‎
Dt‎os‎
PersonCom‎panyDTO.cs‎ +119 -0
TB_FddSi‎gnDTO.cs‎ +41 -0
Par‎ams‎
PersonComp‎anyParam.cs‎ +54 -0
Ser‎vice‎
PersonCompa‎nyService.cs‎ +244 -0
Tools/‎Method‎
CoreHttpC‎ontext.cs‎ +36 -0
FddUt‎ils.cs‎ +371 -0
Util‎s.cs‎ +2 -2
Business/PersonCompanyBusiness.cs
+ 63
- 0
  • View file @ 02da516e

  • Edit in single-file editor

  • Edit in Web IDE

using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Model.Dtos;
using Model.Params;
using Service;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Business
{
/*工作室相关*/
public class PersonCompanyBusiness : IBusiness
{
private readonly IConfiguration _config;
private readonly ILogger<WorkFileBusiness> _logger;
private readonly PersonCompanyService _personCompanyService;
private readonly SmsService _smsService;
public PersonCompanyBusiness(IConfiguration config, ILogger<WorkFileBusiness> logger, PersonCompanyService personCompanyService, SmsService smsService)
{
_config = config;
_logger = logger;
_personCompanyService = personCompanyService;
_smsService = smsService;
}
/// <summary>
/// 合伙人管理(获取智客工作室信息)
/// <returns></returns>
public async Task<List<PersonCompanyDetailsDTO>> GetPersonCompanyDetails(PersonCompanyDetailsParam personCompanyDetailsParam)
{
return await _personCompanyService.GetPersonCompanyDetails(personCompanyDetailsParam.SDUserID, personCompanyDetailsParam.CompanyId, personCompanyDetailsParam.Type);
}
/// <summary>
/// 工作室匹配
/// <returns></returns>
public async Task<List<PersonCompanyMatchingDTO>> PersonsCompanymatching(PersonCompanyMatchingParam personCompanyMatchingParam)
{
List<PersonCompanyMatchingDTO> personCompanyMatchings = new List<PersonCompanyMatchingDTO>(); //容器
foreach (var item in personCompanyMatchingParam.PersonCompanyMatchingParamlist)
{
personCompanyMatchings.Add(await _personCompanyService.PersonCompanyMatching(item.PersonName, item.Mobile, item.PersonCompanyName));
}
return personCompanyMatchings;
}
/// <summary>
/// 获取法大大账号
/// </summary>
/// <param name="personCompanyMatchingParam"></param>
/// <returns></returns>
public async Task<List<PersonCompanyFDDSignDTO>> PersonCompanyFDDAccount(PersonCompanyFDDAccountParam personCompanyFDDAccountParam)
{
List<PersonCompanyFDDSignDTO> personCompanyFDDSign = new List<PersonCompanyFDDSignDTO>(); //容器
foreach (var item in personCompanyFDDAccountParam.PersonCompanyFDDAccountlist)
{
personCompanyFDDSign.Add(await _personCompanyService.GetPersonCompanyFDDCustomerId(item.UserID, item.PCID));
}
return personCompanyFDDSign;
}
}
}
Business/UserBusiness.cs
+ 11
- 0
  • View file @ 02da516e

  • Edit in single-file editor

  • Edit in Web IDE


Show all unchanged lines Show 20 lines
return ResultHelper.Success(personCompanyList.Select(p => new { p.CompanyName, CompanyArea = ((CompanyArea)p.CompanyArea).ToDescription() }));
}
public async Task<Result> GetValidPersonCompanyPageList(BaseUserPagedQueryParam person)
{
var personCompanyList = await _userService.GetValidPersonCompanyList(person.SDUserID).Select(p => new
{
p.CompanyName,
CompanyArea = ((CompanyArea)p.CompanyArea).ToDescription()
}).ToSDPagerAsync(person.PageIndex, person.PageSize);
return ResultHelper.Success(personCompanyList);
}
}
}
DBContext/SDContext.cs
+ 2
- 0
  • View file @ 02da516e

  • Edit in single-file editor

  • Edit in Web IDE


Show all unchanged lines Show 20 lines
public DbSet<TB_SignUp_WorkFile_Notify> TB_SignUp_WorkFile { get; set; }
public DbSet<TFR_StudioSetMenu> TFR_StudioSetMenu { get; set; }
public DbSet<Msg_SyncPrm> Msg_SyncPrm { get; set; }
public DbSet<AreaConfig> AreaConfig { get; set; }
public DbSet<TB_FDDSign> TB_FDDSign { get; set; }
#endregion
public SDContext(DbContextOptions<SDContext> opetions) : base(opetions)
Show 20 lines Show all unchanged lines
Entities/BaseConfig.cs
+ 20
- 0
  • View file @ 02da516e

  • Edit in single-file editor

  • Edit in Web IDE


Show all unchanged lines Show 20 lines
}
/// <summary>
/// 开户地配置信息
/// </summary>
[Table("areaconfig")]
public class AreaConfig
{
/// <summary>
/// 开户地代码
/// </summary>
[Key]
public int ID { get; set; }
/// <summary>
/// 开户地
/// </summary>
public string AreaName { get; set; }
/// <summary>
/// 开户地所在省
/// </summary>
public string AreaProvince { get; set; }
}
}
Entities/TB_FDDSign.cs
+ 56
- 0
  • View file @ 02da516e

  • Edit in single-file editor

  • Edit in Web IDE

using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Entity
{
[Table("tb_fddsign")]
public class TB_FDDSign
{
/// <summary>
/// 主键
/// </summary>
[Key]
public string ID { get; set; }
/// <summary>
/// 用户编号
/// </summary>
public string UserID { get; set; }
/// <summary>
/// 法大大用户账户
/// </summary>
public string CustomerId { get; set; }
/// <summary>
/// 法大大实名存证编号
/// </summary>
public string RealnameId { get; set; }
/// <summary>
/// 统一社会信用代码
/// </summary>
public string CreditCode { get; set; }
/// <summary>
/// 注册工作室所在地.1义乌,2青岛,3张家港
/// </summary>
public int CompanyArea { get; set; }
/// <summary>
/// 智客工作室编号
/// </summary>
public string PCID { get; set; }
/// <summary>
/// 已经生成签章
/// </summary>
public bool HasSign { get; set; }
/// <summary>
/// 添加时间
/// </summary>
public DateTime CreatedTime { get; set; }
/// <summary>
/// 0:企业/工作室 1:个人(用于签名)
/// </summary>
public int AccountType { get; set; }
}
}
JSApi/Content/img/fdd.jpg
+ 0
- 0
  • View file @ 02da516e

92.79 KiB

JSApi/Controllers/PersonCompanyController.cs
+ 73
- 0
  • View file @ 02da516e

  • Edit in single-file editor

  • Edit in Web IDE

using Business;
using JSApi.Helpers;
using Microsoft.AspNetCore.Mvc;
using Model.Params;
using System.Drawing.Printing;
using Tools.RequestHelpers;
namespace JSApi.Controllers
{
/// <summary>
/// 工作室Api
/// </summary>
[Route("api/[controller]/[action]")]
[TypeFilter(typeof(VerifyActionFilterAttribute))]
[ApiController]
public class PersonCompanyController : ControllerBase
{
#region 属性
private PersonCompanyBusiness _personCompanyBusiness;
#endregion
#region 构造函数
public PersonCompanyController(PersonCompanyBusiness personCompanyBusiness)
{
_personCompanyBusiness = personCompanyBusiness;
}
#endregion
/// <summary>
/// 查询个人用户工作室信息
/// </summary>
/// <param name="queryinfo"></param>
/// <returns></returns>
[HttpPost]
public async Task<JsonResult> GetPersonCompanyDetail([FromBody] PersonCompanyDetailsParam queryinfo)
{
var date = await _personCompanyBusiness.GetPersonCompanyDetails(queryinfo);
var totalMoney = date.Sum(s => s.PreTaxMoney);
var personCompanyCount = date.Count();
var result = new
{
PersonCompanyCount = personCompanyCount,
TotalMoney = totalMoney,
Data = date
};
return new JsonResult(ResultHelper.Success(result));
}
/// <summary>
/// 工作室匹配
/// </summary>
/// <param name="queryinfo"></param>
/// <returns></returns>
[HttpPost]
public async Task<JsonResult> PersonsCompanymatching([FromBody] PersonCompanyMatchingParam queryinfo)
{
var data = await _personCompanyBusiness.PersonsCompanymatching(queryinfo);
return new JsonResult(ResultHelper.Success(data));
}
/// <summary>
/// 获取FDD账号
/// </summary>
/// <param name="queryinfo"></param>
/// <returns></returns>
[HttpPost]
public async Task<JsonResult> PersonsCompanyGetCustomerId([FromBody] PersonCompanyFDDAccountParam queryinfo)
{
var data = await _personCompanyBusiness.PersonCompanyFDDAccount(queryinfo);
return new JsonResult(ResultHelper.Success(data));
}
}
}
JSApi/Controllers/UserController.cs
+ 11
- 0
  • View file @ 02da516e

  • Edit in single-file editor

  • Edit in Web IDE


Show all unchanged lines Show 20 lines
{
return await _userBusiness.GetValidPersonCompanyList(person);
}
/// <summary>
/// prm获取个人工作室列表
/// </summary>
/// <param name="person">智客 sd userid</param>
/// <returns></returns>
[HttpPost]
public async Task<Result> GetValidPersonCompanyPageList([FromBody] BaseUserPagedQueryParam person)
{
return await _userBusiness.GetValidPersonCompanyPageList(person);
}
}
}
JSApi/JSApi.xml
+ 33
- 0
  • View file @ 02da516e

  • Edit in single-file editor

  • Edit in Web IDE


Show all unchanged lines Show 20 lines
<param name="content">原串</param>
<returns></returns>
</member>
<member name="T:JSApi.Controllers.PersonCompanyController">
<summary>
工作室Api
</summary>
</member>
<member name="M:JSApi.Controllers.PersonCompanyController.GetPersonCompanyDetail(Model.Params.PersonCompanyDetailsParam)">
<summary>
查询个人用户工作室信息
</summary>
<param name="queryinfo"></param>
<returns></returns>
</member>
<member name="M:JSApi.Controllers.PersonCompanyController.PersonsCompanymatching(Model.Params.PersonCompanyMatchingParam)">
<summary>
工作室匹配
</summary>
<param name="queryinfo"></param>
<returns></returns>
</member>
<member name="M:JSApi.Controllers.PersonCompanyController.PersonsCompanyGetCustomerId(Model.Params.PersonCompanyFDDAccountParam)">
<summary>
获取FDD账号
</summary>
<param name="queryinfo"></param>
<returns></returns>
</member>
<member name="T:JSApi.Controllers.QianBaoController">
<summary>
钱包Api
Show 20 lines Show all unchanged lines Show 20 lines
<param name="person">智客 sd userid</param>
<returns></returns>
</member>
<member name="M:JSApi.Controllers.UserController.GetValidPersonCompanyPageList(Model.Params.BaseUserPagedQueryParam)">
<summary>
prm获取个人工作室列表
</summary>
<param name="person">智客 sd userid</param>
<returns></returns>
</member>
<member name="T:JSApi.Controllers.WorkFileController">
<summary>
需求Api
Show 20 lines Show all unchanged lines
JSApi/Model.xml
+ 195
- 0
  • View file @ 02da516e

  • Edit in single-file editor

  • Edit in Web IDE


Show all unchanged lines Show 20 lines
法人身份证
</summary>
</member>
<member name="T:Model.Dtos.PersonCompanyDetailsDTO">
<summary>
工作室详情
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyDetailsDTO.ID">
<summary>
工作室ID
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyDetailsDTO.CompanyName">
<summary>
工作室名称
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyDetailsDTO.AreaName">
<summary>
工作室注册地
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyDetailsDTO.Validate">
<summary>
工作室注册完成时间
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyDetailsDTO.CInviteName">
<summary>
归属企业
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyDetailsDTO.PreTaxMoney">
<summary>
成交金额
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyDetailsDTO.Scope">
<summary>
经营范围
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyDetailsDTO.BillDetail">
<summary>
开票科目
</summary>
</member>
<member name="T:Model.Dtos.GroupCompanyRelationDTO">
<summary>
集团公司关系
</summary>
</member>
<member name="P:Model.Dtos.GroupCompanyRelationDTO.ID">
<summary>
集团编号
</summary>
</member>
<member name="P:Model.Dtos.GroupCompanyRelationDTO.GroupName">
<summary>
集团名称
</summary>
</member>
<member name="P:Model.Dtos.GroupCompanyRelationDTO.CompanyId">
<summary>
公司Id
</summary>
</member>
<member name="P:Model.Dtos.GroupCompanyRelationDTO.CompanyName">
<summary>
公司名称
</summary>
</member>
<member name="T:Model.Dtos.PersonCompanyMatchingDTO">
<summary>
工作室匹配
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyMatchingDTO.UserID">
<summary>
用户编号
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyMatchingDTO.PCID">
<summary>
工作室编号
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyMatchingDTO.PersonName">
<summary>
合伙人名称
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyMatchingDTO.Mobile">
<summary>
合伙人电话
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyMatchingDTO.PersonCompanyName">
<summary>
工作室名称
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyMatchingDTO.IsMath">
<summary>
是否匹配
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyMatchingDTO.FailtReson">
<summary>
失败原因
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyFDDSignDTO.UserID">
<summary>
用户编号
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyFDDSignDTO.PCID">
<summary>
工作室编号
</summary>
</member>
<member name="P:Model.Dtos.PersonCompanyFDDSignDTO.CustomerId">
<summary>
法大大用户账户
</summary>
</member>
<member name="T:Model.Dtos.TB_PayListDTO">
<summary>
钱包交易明细
Show 20 lines Show all unchanged lines Show 20 lines
个数
</summary>
</member>
<member name="P:Model.Dtos.TB_FddSignDTO.UserID">
<summary>
用户编号
</summary>
</member>
<member name="P:Model.Dtos.TB_FddSignDTO.CustomerId">
<summary>
法大大用户账户
</summary>
</member>
<member name="P:Model.Dtos.TB_FddSignDTO.RealnameId">
<summary>
法大大实名存证编号
</summary>
</member>
<member name="P:Model.Dtos.TB_FddSignDTO.CreditCode">
<summary>
统一社会信用代码
</summary>
</member>
<member name="P:Model.Dtos.TB_FddSignDTO.CompanyArea">
<summary>
注册工作室所在地.1义乌,2青岛
</summary>
</member>
<member name="P:Model.Dtos.TB_FddSignDTO.PCID">
<summary>
智客工作室编号
</summary>
</member>
<member name="P:Model.Dtos.TB_FddSignDTO.key">
<summary>
签章关键字
</summary>
</member>
<member name="T:Model.Dtos.UserBankCardDTO">
<summary>
银行卡信息
Show 20 lines Show all unchanged lines Show 20 lines
订单ID
</summary>
</member>
<member name="P:Model.Params.PersonCompanyDetailsParam.CompanyId">
<summary>
公司Id
</summary>
</member>
<member name="P:Model.Params.PersonCompanyDetailsParam.Type">
<summary>
类型
</summary>
</member>
<member name="P:Model.Params.PersonCompanyMatchingOneParam.PersonName">
<summary>
合伙人名称
</summary>
</member>
<member name="P:Model.Params.PersonCompanyMatchingOneParam.Mobile">
<summary>
合伙人电话
</summary>
</member>
<member name="P:Model.Params.PersonCompanyMatchingOneParam.PersonCompanyName">
<summary>
工作室名称
</summary>
</member>
<member name="P:Model.Params.PersonCompanyFDDAccountOneParam.UserID">
<summary>
用户编号
</summary>
</member>
<member name="P:Model.Params.PersonCompanyFDDAccountOneParam.PCID">
<summary>
工作室编号
</summary>
</member>
<member name="T:Model.Params.QianBaoListParam">
<summary>
钱包明细查询
Show 20 lines Show all unchanged lines
JSApi/Program.cs
+ 4
- 0
  • View file @ 02da516e

  • Edit in single-file editor

  • Edit in Web IDE


Show all unchanged lines Show 20 lines
app.MapControllers();
app.UseStaticHostEnviroment();
//开启多次读取body流
app.Use(async (context, next) =>
{
Show 20 lines Show all unchanged lines Show 20 lines
app.UseSenparcGlobal(app.Environment, senparcSetting, globalRegister => { })
.UseSenparcWeixin(senparcWeixinSetting, weixinRegister => weixinRegister.RegisterWorkAccount(senparcWeixinSetting)); //注册企业微信
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
app.Run();
JSApi/appsettings.Development.json
+ 8
- 1
  • View file @ 02da516e

  • Edit in single-file editor

  • Edit in Web IDE


Show all unchanged lines Show 20 lines
"Desc": "订单:{0}\n工作室:{1}\n需求:{2}\n<div class=\"highlight\">成果文件已超过48小时未处理,请进行验收处理。</div>"
}
},
"FDD": {
//项目ID
"FddAppId": "401661",
//项目SECRET
"FddSecret":"LIrNb9UQM4bj1m3wCbeiPVAX",
//开放平台地址
"FddUrl": "https://testapi.fadada.com:8443/api/"
},
"Prm": {
"ClientID": "8f2fbc91-e259-11ec-9602-b8599f2fe2f0",
"Url": "http://222.186.3.34:2080"
Show 20 lines Show all unchanged lines
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Milestone
No milestone
None
None
Time tracking
No estimate or time spent
0
Labels
None
Assign labels
  • No matching results
  • Manage project labels
Lock merge request
Unlocked
1
1 participant
user avatar
Reference: backend/x3js!9
Source branch: test

    0 pending comments

Menu

Projects Groups Snippets
Help