企业认证bug修改

tianhu-system/src/main/java/com/tianhu/system/companyAuth/controller/OwnAuthController.java

@@ -195,7 +195,7 @@ public class OwnAuthController extends BaseController {
     @PostMapping("/add")
     @Log(title = "企业认证", businessType = BusinessType.INSERT)
     @Transactional(rollbackFor=Exception.class)
-    public R add(@RequestBody Map<String,Object> map) throws Exception {
+    public R add(@RequestBody Map<String,Object> map,HttpServletRequest request) throws Exception {
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser use = userInfo.getSysUser();
         //企业名称
@@ -350,6 +350,7 @@ public class OwnAuthController extends BaseController {
         sysCompany.setScyRegisteredCapital(scyRegisteredCapital);
         sysCompany.setScyStartTime(scyStartTime);
         sysCompany.setScyEndTime(scyEndTime);
+        sysCompany.setScyPhone(scyPhone);
         sysCompany.setScyAddress(scyAddress);
         sysCompany.setScyLegal(scyLegal);
         sysCompany.setScyLegalId(scyLegalId);
@@ -478,6 +479,7 @@ public class OwnAuthController extends BaseController {
         } else {
             String alternateNumber = IdUtils.fastSimpleUUID();
             dept.setAlternateNumber(alternateNumber);
+            dept.setDeptName(scyName);
             dept.setParentId(defaultId);
             dept.setAncestors(defaultAn);
             dept.setOrderNum(defaultOrder);
@@ -662,7 +664,13 @@ public class OwnAuthController extends BaseController {
                 sysUserCompanyRelService.createSysUserCompanyRel(sysUserCompanyRel);
             }
         }
-
+        // 刷新登录用户菜单和权限
+        SysUser sysUser = userInfo.getSysUser();
+        sysUser.setCompanyId(scyId);
+        sysUser.setCompanyStatus(sysCompany.getScyStatus());
+        userInfo.setSysUser(sysUser);
+        String token = SecurityUtils.getToken(request);
+        redisService.setCacheObject(CacheConstants.LOGIN_TOKEN_KEY + token, userInfo, Constants.TOKEN_EXPIRE * 60, TimeUnit.SECONDS);
         //返回企业信息
         SysCompany company = sysCompanyService.getById(scyId);
         // 审批增加分组
@@ -775,7 +783,7 @@ public class OwnAuthController extends BaseController {
      */
     @PostMapping("/account")
     @Log(title = "绑定对公户", businessType = BusinessType.INSERT)
-    public R account(@RequestBody Map<String,Object> map) throws Exception {
+    public R account(@RequestBody Map<String,Object> map,HttpServletRequest request) throws Exception {
         //获取登录用户
         LoginUser user = tokenService.getLoginUser();
         //企业id
@@ -886,6 +894,13 @@ public class OwnAuthController extends BaseController {
             sysCompany.setScyStatus("05");
             sysCompanyService.updateSysCompany(sysCompany);
         }
+        // 刷新登录用户菜单和权限
+        SysUser sysUser = user.getSysUser();
+        sysUser.setCompanyId(scyId);
+        sysUser.setCompanyStatus("05");
+        user.setSysUser(sysUser);
+        String token = SecurityUtils.getToken(request);
+        redisService.setCacheObject(CacheConstants.LOGIN_TOKEN_KEY + token, user, Constants.TOKEN_EXPIRE * 60, TimeUnit.SECONDS);
         return R.ok();
     }
 
@@ -897,7 +912,7 @@ public class OwnAuthController extends BaseController {
      */
     @PostMapping("/payment")
     @Log(title = "打款验证", businessType = BusinessType.UPDATE)
-    public R payment(@RequestBody Map<String,Object> map) throws Exception {
+    public R payment(@RequestBody Map<String,Object> map,HttpServletRequest request) throws Exception {
         //获取登录用户
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser users = userInfo.getSysUser();
@@ -919,6 +934,8 @@ public class OwnAuthController extends BaseController {
         if(bankAcc.size()==0){
             return  R.fail("所属账号不存在");
         }
+        //企业id
+        String scyId = CommonUtil.objToString(map.get("scyId"));
         //金额(元)
         String amount = CommonUtil.objToString(map.get("amount"));
         if(!RegularUtil.isPositive(amount)){
@@ -958,6 +975,13 @@ public class OwnAuthController extends BaseController {
         //待实名认证
         sysCompany.setScyStatus("04");
         sysCompanyService.updateSysCompany(sysCompany);
+        // 刷新登录用户菜单和权限
+        SysUser sysUser = userInfo.getSysUser();
+        sysUser.setCompanyId(scyId);
+        sysUser.setCompanyStatus(sysCompany.getScyStatus());
+        userInfo.setSysUser(sysUser);
+        String token = SecurityUtils.getToken(request);
+        redisService.setCacheObject(CacheConstants.LOGIN_TOKEN_KEY + token, userInfo, Constants.TOKEN_EXPIRE * 60, TimeUnit.SECONDS);
         return R.ok();
     }
     /**
@@ -1068,10 +1092,10 @@ public class OwnAuthController extends BaseController {
         if(CommonUtil.isNotEmpty(companyAccount.getJSONObject("enterprise").getString("userId"))){
             String userId = companyAccount.getJSONObject("enterprise").getString("userId");
             sysCompany.setScyCfcaUserId(userId);
-            sysCompanyService.updateSysCompany(sysCompany);
         }else{
             throw new Exception("开户失败!");
         }
+        sysCompanyService.updateSysCompany(sysCompany);
         //查询企业
         LambdaQueryWrapper<SysCompany> company = new LambdaQueryWrapper<>();
         //企业id

tianhu-system/src/main/java/com/tianhu/system/controller/OwnManagementInfController.java

@@ -69,6 +69,8 @@ public class OwnManagementInfController extends BaseController
     @Autowired
     private RemoteSystemService remoteSystemService;
     @Autowired
+    private IZcFinanceProductService zcFinanceProductService;
+    @Autowired
     private SysProductMenuMapper productMenuMapper;
     /**
      * 资方普通用户
@@ -174,11 +176,19 @@ public class OwnManagementInfController extends BaseController
     @PreAuthorize(hasPermi = "fundSide:fundSide:edit")
     @Log(title = "资方状态修改", businessType = BusinessType.UPDATE)
     @PutMapping("/fundSideStatus")
-    public R fundSideStatus(@RequestBody SysCompany company)
-    {
+    public R fundSideStatus(@RequestBody SysCompany company) throws Exception {
         //获取当前操作人员
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser use = userInfo.getSysUser();
+        if("01".equals(company.getScyStatus())){
+        LambdaQueryWrapper<ZcFinanceProduct> zcFinanceProductLambdaQueryWrapper = new LambdaQueryWrapper();
+        zcFinanceProductLambdaQueryWrapper.eq(ZcFinanceProduct::getZfpManagementId,company.getScyId());
+        List<ZcFinanceProduct> zcFinanceProduct = zcFinanceProductService.findZcFinanceProducts(zcFinanceProductLambdaQueryWrapper);
+        if(zcFinanceProduct.size()>0){
+            throw new Exception("渠道已存在无法停用");
+
+        }
+        }
         //修改人
         company.setUpdateBy(use.getUserId()+"");
         //获取当前时间

tianhu-system/src/main/java/com/tianhu/system/domain/ZcFinanceProduct.java

@@ -0,0 +1,251 @@
+package com.tianhu.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 融资产品信息表
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("zc_finance_product")
+public class ZcFinanceProduct implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId("zfp_id")
+    private String zfpId;
+
+    /**
+     * 融资产品编号
+     */
+    @TableField("zfp_number")
+    private String zfpNumber;
+
+    /**
+     * 融资产品名称
+     */
+    @TableField("zfp_name")
+    private String zfpName;
+
+    /**
+     * 0:正向,1反向
+     */
+    @TableField("zfp_type")
+    private String zfpType;
+
+    /**
+     * 资方(sys_company.scy_id)
+     */
+    @TableField("zfp_management_id")
+    private String zfpManagementId;
+
+    /**
+     * 是否拆分(0:不可拆分,1:可拆分)
+     */
+    @TableField("zfp_split")
+    private String zfpSplit;
+
+    /**
+     * 是否转让(0:不可转让,1:可转让)
+     */
+    @TableField("zfp_transfer")
+    private String zfpTransfer;
+
+    /**
+     * 是否有追索权(0:无追索权,1:有追索权)
+     */
+    @TableField("zfp_recourse")
+    private String zfpRecourse;
+
+    /**
+     * 电子凭证类型
+     */
+    @TableField("zfp_voucher_type")
+    private String zfpVoucherType;
+
+    /**
+     * 是否需核心企业开户(0:不需要,1:需要)
+     */
+    @TableField("zfp_core_account")
+    private String zfpCoreAccount;
+
+    /**
+     * 是否需融资企业开户(0:不需要,1:需要)
+     */
+    @TableField("zfp_supplier_account")
+    private String zfpSupplierAccount;
+
+    /**
+     * 服务费是否可退(0:不可退服务费,1:可退服务分)
+     */
+    @TableField("zfp_charge")
+    private String zfpCharge;
+
+    /**
+     * 产品状态
+     */
+    @TableField("zfp_status")
+    private String zfpStatus;
+
+    /**
+     * 最小融资金额
+     */
+    @TableField("zfp_minimum_amount")
+    private String zfpMinimumAmount;
+
+    /**
+     * 最短账期
+     */
+    @TableField("zfp_shortest_period")
+    private String zfpShortestPeriod;
+
+    /**
+     * 记账簿托管方式
+     */
+    @TableField("zfp_bookkeeping")
+    private String zfpBookkeeping;
+
+    /**
+     * 是否支持部分融资(0:不支持,1:支持)
+     */
+    @TableField("zfp_part")
+    private String zfpPart;
+
+    /**
+     * 融资到期方式
+     */
+    @TableField("zfp_expire")
+    private String zfpExpire;
+
+    /**
+     * 资方融资费率
+     */
+    @TableField("zfp_rate")
+    private String zfpRate;
+
+    /**
+     * 资方是否支持返佣(0:不支持,1:支持)
+     */
+    @TableField("zfp_profit")
+    private String zfpProfit;
+
+    /**
+     * 资方返佣方式
+     */
+    @TableField("zfp_profit_type")
+    private String zfpProfitType;
+
+    /**
+     * 资方返佣费率
+     */
+    @TableField("zfp_profit_rate")
+    private String zfpProfitRate;
+
+    /**
+     * 是否需平台审批(0:不需要,1:需要)
+     */
+    @TableField("zfp_platform")
+    private String zfpPlatform;
+
+    /**
+     * 签署意愿类型(00:全部, 01:人脸识别, 02:短信)
+     */
+    @TableField("zfp_auth_type")
+    private String zfpAuthType;
+
+    /**
+     * 备用字段1
+     */
+    @TableField("zfp_profit_spare1")
+    private String zfpProfitSpare1;
+
+    /**
+     * 备用字段2
+     */
+    @TableField("zfp_profit_spare2")
+    private String zfpProfitSpare2;
+
+    /**
+     * 备用字段3
+     */
+    @TableField("zfp_profit_spare3")
+    private String zfpProfitSpare3;
+
+    /**
+     * 备用字段4
+     */
+    @TableField("zfp_profit_spare4")
+    private String zfpProfitSpare4;
+
+    /**
+     * 备用字段5
+     */
+    @TableField("zfp_profit_spare5")
+    private String zfpProfitSpare5;
+
+    /**
+     * 备用字段6
+     */
+    @TableField("zfp_profit_spare6")
+    private String zfpProfitSpare6;
+
+    /**
+     * 备用字段7
+     */
+    @TableField("zfp_profit_spare7")
+    private String zfpProfitSpare7;
+
+    /**
+     * 备用字段8
+     */
+    @TableField("zfp_profit_spare8")
+    private String zfpProfitSpare8;
+
+    /**
+     * 备用字段9
+     */
+    @TableField("zfp_profit_spare9")
+    private String zfpProfitSpare9;
+
+    /**
+     * 创建者
+     */
+    @TableField("create_by")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField("update_by")
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

tianhu-system/src/main/java/com/tianhu/system/mapper/ZcFinanceProductMapper.java

@@ -0,0 +1,16 @@
+package com.tianhu.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.tianhu.system.domain.ZcFinanceProduct;
+
+/**
+ * <p>
+ * 融资产品信息表 Mapper 接口
+ * </p>
+ *
+ * @author cuixq
+ * @since 2021-09-14
+ */
+public interface ZcFinanceProductMapper extends BaseMapper<ZcFinanceProduct> {
+
+}

tianhu-system/src/main/java/com/tianhu/system/service/IZcFinanceProductService.java

@@ -0,0 +1,58 @@
+package com.tianhu.system.service;
+
+
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.tianhu.system.domain.ZcFinanceProduct;
+
+import java.util.List;
+
+/**
+ * ClassName: IZcFinanceProductService<br>
+ * Description: ZcFinanceProductService接口 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-09-14  cuixq    由Generator自动创建
+ */
+public interface IZcFinanceProductService extends IService<ZcFinanceProduct> {
+    /**
+     * 查询（分页）
+     *
+     * @param request QueryRequest
+     * @param wrapper LambdaQueryWrapper<ZcFinanceProduct>
+     * @return IPage<ZcFinanceProduct>
+     */
+    IPage<ZcFinanceProduct> findZcFinanceProducts(QueryRequest request, LambdaQueryWrapper<ZcFinanceProduct> wrapper);
+
+    /**
+     * 查询（所有）
+     *
+     * @param wrapper LambdaQueryWrapper<ZcFinanceProduct>
+     * @return List<ZcFinanceProduct>
+     */
+    List<ZcFinanceProduct> findZcFinanceProducts(LambdaQueryWrapper<ZcFinanceProduct> wrapper);
+
+    /**
+     * 新增
+     *
+     * @param zcFinanceProduct zcFinanceProduct
+     */
+    void createZcFinanceProduct(ZcFinanceProduct zcFinanceProduct);
+
+    /**
+     * 修改
+     *
+     * @param zcFinanceProduct zcFinanceProduct
+     */
+    void updateZcFinanceProduct(ZcFinanceProduct zcFinanceProduct);
+
+    /**
+     * 删除
+     *
+     * @param wrapper LambdaQueryWrapper<ZcFinanceProduct>
+     */
+    void deleteZcFinanceProduct(LambdaQueryWrapper<ZcFinanceProduct> wrapper);
+}

tianhu-system/src/main/java/com/tianhu/system/service/impl/ZcFinanceProductServiceImpl.java

@@ -0,0 +1,64 @@
+package com.tianhu.system.service.impl;
+
+import com.tianhu.system.domain.ZcFinanceProduct;
+import com.tianhu.system.mapper.ZcFinanceProductMapper;
+import com.tianhu.system.service.IZcFinanceProductService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+
+
+import java.util.List;
+
+/**
+ * ClassName: ZcFinanceProductServiceImpl<br>
+ * Description: IZcFinanceProductService实现 <br>
+ * Company: keao
+ *
+ * @author cuixq
+ * @version v1.0.0    2021-09-14  cuixq    由Generator自动创建
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class ZcFinanceProductServiceImpl extends ServiceImpl<ZcFinanceProductMapper, ZcFinanceProduct> implements IZcFinanceProductService {
+
+    @Autowired
+    private ZcFinanceProductMapper zcFinanceProductMapper;
+
+    @Override
+    public IPage<ZcFinanceProduct> findZcFinanceProducts(QueryRequest request, LambdaQueryWrapper<ZcFinanceProduct> wrapper) {
+        Page<ZcFinanceProduct> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return this.page(page, wrapper);
+    }
+
+    @Override
+    public List<ZcFinanceProduct> findZcFinanceProducts(LambdaQueryWrapper<ZcFinanceProduct> wrapper) {
+		return this.list(wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createZcFinanceProduct(ZcFinanceProduct zcFinanceProduct) {
+        this.save(zcFinanceProduct);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateZcFinanceProduct(ZcFinanceProduct zcFinanceProduct) {
+        this.saveOrUpdate(zcFinanceProduct);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteZcFinanceProduct(LambdaQueryWrapper<ZcFinanceProduct> wrapper) {
+	    this.remove(wrapper);
+	}
+}

tianhu-system/src/main/resources/mapper/system/ZcFinanceProductMapper.xml

@@ -0,0 +1,46 @@
+<?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.tianhu.system.mapper.ZcFinanceProductMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.tianhu.system.domain.ZcFinanceProduct">
+        <id column="zfp_id" property="zfpId" />
+        <result column="zfp_number" property="zfpNumber" />
+        <result column="zfp_name" property="zfpName" />
+        <result column="zfp_type" property="zfpType" />
+        <result column="zfp_management_id" property="zfpManagementId" />
+        <result column="zfp_split" property="zfpSplit" />
+        <result column="zfp_transfer" property="zfpTransfer" />
+        <result column="zfp_recourse" property="zfpRecourse" />
+        <result column="zfp_voucher_type" property="zfpVoucherType" />
+        <result column="zfp_core_account" property="zfpCoreAccount" />
+        <result column="zfp_supplier_account" property="zfpSupplierAccount" />
+        <result column="zfp_charge" property="zfpCharge" />
+        <result column="zfp_status" property="zfpStatus" />
+        <result column="zfp_minimum_amount" property="zfpMinimumAmount" />
+        <result column="zfp_shortest_period" property="zfpShortestPeriod" />
+        <result column="zfp_bookkeeping" property="zfpBookkeeping" />
+        <result column="zfp_part" property="zfpPart" />
+        <result column="zfp_expire" property="zfpExpire" />
+        <result column="zfp_rate" property="zfpRate" />
+        <result column="zfp_profit" property="zfpProfit" />
+        <result column="zfp_profit_type" property="zfpProfitType" />
+        <result column="zfp_profit_rate" property="zfpProfitRate" />
+        <result column="zfp_platform" property="zfpPlatform" />
+        <result column="zfp_auth_type" property="zfpAuthType" />
+        <result column="zfp_profit_spare1" property="zfpProfitSpare1" />
+        <result column="zfp_profit_spare2" property="zfpProfitSpare2" />
+        <result column="zfp_profit_spare3" property="zfpProfitSpare3" />
+        <result column="zfp_profit_spare4" property="zfpProfitSpare4" />
+        <result column="zfp_profit_spare5" property="zfpProfitSpare5" />
+        <result column="zfp_profit_spare6" property="zfpProfitSpare6" />
+        <result column="zfp_profit_spare7" property="zfpProfitSpare7" />
+        <result column="zfp_profit_spare8" property="zfpProfitSpare8" />
+        <result column="zfp_profit_spare9" property="zfpProfitSpare9" />
+        <result column="create_by" property="createBy" />
+        <result column="create_time" property="createTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>