Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-oauth

# Conflicts:
#	src/main/java/com/dk/oauth/entity/CompanyResponse.java
#	src/main/java/com/dk/oauth/feign/service/OrgFeign.java
#	src/main/resources/mapper/CompanyMapper.xml

src/main/java/com/dk/oauth/controller/CompanyController.java

@@ -48,6 +48,16 @@ public class CompanyController {
     }
 
     /**
+     * @desc   : 可以绑定微信的员工人数  人数上限
+     * @author : admin
+     * @date   : 2023/2/3 13:32
+     */
+    @PostMapping({"get_company_max_staff_num/{id}"})
+    public ResponseResultVO<?> getCompanyMaxStaffNum(@PathVariable Integer id) {
+        return companyService.getCompanyMaxStaffNum(id);
+    }
+
+    /**
      * @desc : 更新 被邀请人员的微信用户的cpid 加入公司
      * @author : 姜永辉
      * @date : 2023/1/9 10:49
@@ -59,6 +69,17 @@ public class CompanyController {
     }
 
     /**
+     * @desc : 更新 更新公司的当前人数
+     * @author : 姜永辉
+     * @date : 2023/1/9 10:49
+     */
+    @ApiOperation(value = "更新公司的当前人数", notes = "更新公司的当前人数")
+    @PostMapping(value = "/feign_update_company_cur_staff_num")
+    public ResponseResultVO<Boolean> updateCompanyCurStaffNum(@RequestBody Map<String,Object> map) {
+        return companyService.updateCompanyCurStaffNum(map);
+    }
+
+    /**
      * @desc : 选择公司更新微信用户的所在当前的公司
      * @author : 姜永辉
      * @date : 2023/1/9 10:49

src/main/java/com/dk/oauth/entity/CompanyResponse.java

@@ -3,6 +3,8 @@ package com.dk.oauth.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.dk.common.infrastructure.handler.TimestampTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDate;
@@ -29,11 +31,20 @@ public class CompanyResponse {
 
     private String gradeCode;
 
-    private Integer maxStaffNum;
-
-    private Integer curStaffNum;
-
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @TableField(typeHandler = TimestampTypeHandler.class)
     private LocalDate endDate;
+
+    /**
+     * 人数上限 (可以绑定微信的员工人数)
+     */
+    @ApiModelProperty(value = "人数上限 (可以绑定微信的员工人数)")
+    private Integer maxStaffNum;
+
+
+    /**
+     * 当前人数 (当前绑定微信的员工人数)
+     */
+    @ApiModelProperty(value = "当前人数 (当前绑定微信的员工人数)")
+    private Integer curStaffNum;
 }

src/main/java/com/dk/oauth/entity/MoneyAccount.java

@@ -0,0 +1,155 @@
+package com.dk.oauth.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.JsonTypeHandler;
+import com.dk.common.infrastructure.handler.TimestampTypeHandler;
+import com.dk.common.infrastructure.handler.UuidTypeHandler;
+import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ *  资金账户
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("资金账户")
+@TableName(value = "t_mst_money_account", autoResultMap = true, schema = "dkic_b")
+@ApiModel(value="实体类：资金账户", description="表名：t_mst_money_account")
+public class MoneyAccount extends PageInfo<MoneyAccount> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 资金账户ID
+     */
+//    @TableId(value = "mac_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "资金账户ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String macId;
+
+
+    /**
+     * 资金账户编码
+     */
+    @Excel(name = "资金账户编码")
+    @ApiModelProperty(value = "资金账户编码")
+    private String macCode;
+
+
+    /**
+     * 资金账户名称
+     */
+    @Excel(name = "资金账户名称")
+    @ApiModelProperty(value = "资金账户名称")
+    private String macName;
+
+
+    /**
+     * 账户类别 (【数据字典】)
+     */
+    @Excel(name = "账户类别 (【数据字典】)")
+    @ApiModelProperty(value = "账户类别 (【数据字典】)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String macType;
+
+    /**
+     * 账户余额
+     */
+    @Excel(name = "账户余额")
+    @ApiModelProperty(value = "账户余额")
+    private BigDecimal balance;
+
+
+    /**
+     * 显示顺序 (【1 ～ 46655】)
+     */
+    @Excel(name = "显示顺序 (【1 ～ 46655】)")
+    @ApiModelProperty(value = "显示顺序 (【1 ～ 46655】)")
+    private Integer displayNo;
+
+
+    /**
+     * 默认值
+     */
+    @Excel(name = "默认值")
+    @ApiModelProperty(value = "默认值")
+    private Boolean flgDefault;
+
+
+    /**
+     * 收款码 (图片路径)
+     */
+    @Excel(name = "收款码 (图片路径)")
+    @ApiModelProperty(value = "收款码 (图片路径)")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray macReceiptCode;
+
+
+
+    /**
+     * 开户日期 (开户日期)
+     */
+    @Excel(name = "开户日期 (开户日期)")
+    @ApiModelProperty(value = "开户日期 (开户日期)")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDate accDate;
+
+    
+    /**
+     * 允许账户余额为负数
+     */
+    @Excel(name = "允许账户余额为负数")
+    @ApiModelProperty(value = "允许账户余额为负数")
+    private Boolean flgNegative;
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+
+    /**
+     * 企业ID
+     */
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "企业ID")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer cpId;
+
+
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/dk/oauth/feign/service/OrgFeign.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @desc : MdmServerFeign
  * @date : 2024-038-10 10:56
  */
-@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-dkic-b1-zx" , path = Constant.MST_ORG, contextId = "org")
+@FeignClient(name = Constant.MDM_PREFIX + Constant.SERVER + "-dkic-b1" , path = Constant.MST_ORG, contextId = "org")
 public interface OrgFeign {
     /**
      * @desc : 注册商户时候插入部门--顶级

src/main/java/com/dk/oauth/mapper/CompanyMapper.java

@@ -27,6 +27,8 @@ public interface CompanyMapper extends BaseMapper<Company> {
 
     Long countByCond(Company t);
 
+    int updateCompanyCurStaffNum(@Param("cpId") Integer cpId,@Param("curStaffNum") Integer curStaffNum);
+
     /**
      * @desc : 通过ID查询
      * @author : 洪旭东

src/main/java/com/dk/oauth/mapper/MoneyAccountMapper.java

@@ -0,0 +1,26 @@
+package com.dk.oauth.mapper;
+
+import com.dk.common.mapper.BaseMapper;
+import com.dk.oauth.entity.MoneyAccount;
+import com.dk.oauth.query.MoneyAccountQuery;
+import com.dk.oauth.response.MoneyAccountResponse;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+*  资金账户 Mapper
+*/
+@Repository
+public interface MoneyAccountMapper extends BaseMapper<MoneyAccount>{
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    List<MoneyAccountResponse> selectByCond(MoneyAccountQuery UnitQuery);
+
+
+
+}
+

src/main/java/com/dk/oauth/query/MoneyAccountQuery.java

@@ -0,0 +1,173 @@
+package com.dk.oauth.query;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.JsonTypeHandler;
+import com.dk.common.infrastructure.handler.TimestampTypeHandler;
+import com.dk.common.infrastructure.handler.UuidTypeHandler;
+import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ *  资金账户
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("资金账户")
+@TableName(value = "t_mst_money_account", autoResultMap = true)
+@ApiModel(value="实体类：资金账户", description="表名：t_mst_money_account")
+public class MoneyAccountQuery extends PageInfo<MoneyAccountQuery> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 资金账户ID
+     */
+//    @TableId(value = "mac_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "资金账户ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String macId;
+
+    private String searchText;
+    /**
+     * 资金账户编码
+     */
+    @Excel(name = "资金账户编码")
+    @ApiModelProperty(value = "资金账户编码")
+    private String macCode;
+
+
+    /**
+     * 资金账户名称
+     */
+    @Excel(name = "资金账户名称")
+    @ApiModelProperty(value = "资金账户名称")
+    private String macName;
+
+
+    /**
+     * 账户类别 (【数据字典】)
+     */
+    @Excel(name = "账户类别 (【数据字典】)")
+    @ApiModelProperty(value = "账户类别 (【数据字典】)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String macType;
+
+
+    /**
+     * 账户余额
+     */
+    @Excel(name = "账户余额")
+    @ApiModelProperty(value = "账户余额")
+    private BigDecimal balance;
+
+
+    /**
+     * 显示顺序 (【1 ～ 46655】)
+     */
+    @Excel(name = "显示顺序 (【1 ～ 46655】)")
+    @ApiModelProperty(value = "显示顺序 (【1 ～ 46655】)")
+    private Integer displayNo;
+
+
+    /**
+     * 默认值
+     */
+    @Excel(name = "默认值")
+    @ApiModelProperty(value = "默认值")
+    private Boolean flgDefault;
+
+
+    /**
+     * 收款码 (图片路径)
+     */
+    @Excel(name = "收款码 (图片路径)")
+    @ApiModelProperty(value = "收款码 (图片路径)")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray macReceiptCode;
+
+
+    /**
+     * 开户日期 (开户日期)
+     */
+    @Excel(name = "开户日期 (开户日期)")
+    @ApiModelProperty(value = "开户日期 (开户日期)")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDate accDate;
+
+
+    /**
+     * 允许账户余额为负数
+     */
+    @Excel(name = "允许账户余额为负数")
+    @ApiModelProperty(value = "允许账户余额为负数")
+    private Boolean flgNegative;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "企业ID")
+    private Integer cpId;
+
+    /**
+     * @desc   : 有效标识List
+     * @author : 宋扬
+     * @date   : 2024/3/2 9:31
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private List<Boolean> flgValidList;
+
+
+    /**
+     * @desc   : 账户类别list
+     * @author : 宋扬
+     * @date   : 2024/3/2 9:27
+     */
+    @Excel(name = "账户类别 (【数据字典】)")
+    @ApiModelProperty(value = "账户类别 (【数据字典】)")
+    private List<String> macTypeList;
+
+
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/dk/oauth/response/MoneyAccountResponse.java

@@ -0,0 +1,160 @@
+package com.dk.oauth.response;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.JsonTypeHandler;
+import com.dk.common.infrastructure.handler.TimestampTypeHandler;
+import com.dk.common.infrastructure.handler.UuidTypeHandler;
+import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ *  资金账户
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("资金账户")
+@TableName(value = "t_mst_money_account", autoResultMap = true)
+@ApiModel(value="实体类：资金账户", description="表名：t_mst_money_account")
+public class MoneyAccountResponse extends PageInfo<MoneyAccountResponse> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 资金账户ID
+     */
+//    @TableId(value = "mac_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "资金账户ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String macId;
+
+
+    /**
+     * 资金账户编码
+     */
+    @Excel(name = "资金账户编码")
+    @ApiModelProperty(value = "资金账户编码")
+    private String macCode;
+
+
+    /**
+     * 资金账户名称
+     */
+    @Excel(name = "资金账户名称")
+    @ApiModelProperty(value = "资金账户名称")
+    private String macName;
+
+
+    /**
+     * 账户类别 (【数据字典】)
+     */
+    @Excel(name = "账户类别 (【数据字典】)")
+    @ApiModelProperty(value = "账户类别 (【数据字典】)")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String macType;
+
+
+    /**
+     * 账户余额
+     */
+    @Excel(name = "账户余额")
+    @ApiModelProperty(value = "账户余额")
+    private BigDecimal balance;
+
+
+    /**
+     * 显示顺序 (【1 ～ 46655】)
+     */
+    @Excel(name = "显示顺序 (【1 ～ 46655】)")
+    @ApiModelProperty(value = "显示顺序 (【1 ～ 46655】)")
+    private Integer displayNo;
+
+
+    /**
+     * 默认值
+     */
+    @Excel(name = "默认值")
+    @ApiModelProperty(value = "默认值")
+    private Boolean flgDefault;
+
+
+
+    /**
+     * 收款码 (图片路径)
+     */
+    @Excel(name = "收款码 (图片路径)")
+    @ApiModelProperty(value = "收款码 (图片路径)")
+    @TableField(typeHandler = JsonTypeHandler.class)
+    private JSONArray macReceiptCode;
+
+
+    /**
+     * 开户日期 (开户日期)
+     */
+    @Excel(name = "开户日期 (开户日期)")
+    @ApiModelProperty(value = "开户日期 (开户日期)")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @TableField(typeHandler = TimestampTypeHandler.class)
+    private LocalDate accDate;
+
+
+    /**
+     * 允许账户余额为负数
+     */
+    @Excel(name = "允许账户余额为负数")
+    @ApiModelProperty(value = "允许账户余额为负数")
+    private Boolean flgNegative;
+
+
+    /**
+     * 备注
+     */
+    @Excel(name = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+
+    /**
+     * 有效标识 (1：正常 0：停用)
+     */
+    @Excel(name = "有效标识 (1：正常 0：停用)")
+    @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
+    private Boolean flgValid;
+
+
+    /**
+     * 企业ID
+     */
+    @Excel(name = "企业ID")
+    @ApiModelProperty(value = "企业ID")
+    private Integer cpId;
+
+
+    @ApiModelProperty(value = "账户类别 (【数据字典】)")
+    private String macTypeName;
+
+    @ApiModelProperty(value = "期初余额")
+    private BigDecimal initBalance;
+
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/dk/oauth/service/ICompanyService.java

@@ -27,4 +27,8 @@ public interface ICompanyService  extends IService<Company> {
     ResponseResultVO selectByOpenId(String openid);
 
     ResponseResultVO saveMenuFrequency(MenuFrequency menuFrequency);
+
+    ResponseResultVO getCompanyMaxStaffNum(Integer id);
+
+    ResponseResultVO updateCompanyCurStaffNum(Map<String,Object> map);
 }

src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -10,9 +10,7 @@ import com.dk.common.model.vo.mst.StaffVO;
 import com.dk.common.response.ResponseCodeEnum;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
-import com.dk.oauth.entity.Company;
-import com.dk.oauth.entity.MenuFrequency;
-import com.dk.oauth.entity.UserLogin;
+import com.dk.oauth.entity.*;
 import com.dk.oauth.feign.service.OrgFeign;
 import com.dk.oauth.feign.service.StaffFeign;
 import com.dk.oauth.mapper.*;
@@ -59,6 +57,8 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     SaleChannelMapper saleChannelMapper;
     @Resource
     WarehouseMapper warehouseMapper;
+    @Resource
+    MoneyAccountMapper moneyAccountMapper;
 
 
     /**
@@ -71,6 +71,21 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         return ResponseResultUtil.success(companyMapper.selectById(id));
     }
 
+
+    /**
+     * @desc : 可以绑定微信的员工人数  人数上限
+     * @author : admin
+     * @date : 2023/2/3 13:32
+     */
+    @Override
+    public ResponseResultVO getCompanyMaxStaffNum(Integer id) {
+        Company company = companyMapper.selectById(id);
+        Map<String,Object> mp = new HashMap<>();
+        mp.put("maxStaffNum",company.getMaxStaffNum());
+        mp.put("curStaffNum",company.getCurStaffNum());
+        return ResponseResultUtil.success(mp);
+    }
+
     /**
      * @desc : 通过ID查询
      * @author : admin
@@ -98,6 +113,20 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     }
 
     /**
+     * @desc : 更新微信用的公司
+     * @author : admin
+     * @date : 2023/2/3 13:32
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResponseResultVO updateCompanyCurStaffNum(Map<String, Object> map) {
+        Integer curStaffNum = Integer.valueOf(map.get("curStaffNum") + "");
+        Integer cpId = Integer.valueOf(map.get("cpId") + "");
+         companyMapper.updateCompanyCurStaffNum(cpId, curStaffNum);
+        return ResponseResultUtil.success(true);
+    }
+
+    /**
      * @desc : 选择公司更新微信用户的所在当前的公司
      * @author : admin
      * @date : 2023/2/3 13:32
@@ -218,8 +247,6 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             m.put("roleCode",roleResponses.get(i).getRoleCode());
             m.put("roleName",roleResponses.get(i).getRoleName());
             m.put("displayNo",roleResponses.get(i).getDisplayNo());
-            m.put("cpId",cpId);
-            m.put("opCreateUserId",staffId);
             listRoles.add(m);
         }
         map.put("roles",listRoles);
@@ -232,8 +259,6 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             m.put("whName",warehouseResponses.get(i).getWhName());
             m.put("displayNo",warehouseResponses.get(i).getDisplayNo());
             m.put("flgDefault",warehouseResponses.get(i).getFlgDefault());
-            m.put("cpId",cpId);
-            m.put("opCreateUserId",staffId);
             listWarehouses.add(m);
         }
         map.put("warehouses",listWarehouses);
@@ -246,8 +271,6 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             m.put("channelName",saleChannelResponses.get(i).getChannelName());
             m.put("displayNo",saleChannelResponses.get(i).getDisplayNo());
             m.put("flgDefault",saleChannelResponses.get(i).getFlgDefault());
-            m.put("cpId",cpId);
-            m.put("opCreateUserId",staffId);
             listSaleChannels.add(m);
         }
         map.put("saleChannels",listSaleChannels);
@@ -261,11 +284,23 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             m.put("dataValue",dictionaryDataResponses.get(i).getDataValue());
             m.put("displayNo",dictionaryDataResponses.get(i).getDisplayNo());
             m.put("flgDefault",dictionaryDataResponses.get(i).getFlgDefault());
-            m.put("cpId",cpId);
-            m.put("opCreateUserId",staffId);
             listDictionaryDatas.add(m);
         }
         map.put("dictionaryDatas",listDictionaryDatas);
+        //  资金账户
+        List<MoneyAccountResponse> moneyAccountResponses = moneyAccountMapper.selectByCond(new MoneyAccountQuery());
+        List<Map<String, Object>> listMoneyAccounts = new ArrayList<>();
+        for (int i = 0; i < moneyAccountResponses.size(); i++) {
+            m = new HashMap<>();
+            m.put("macCode",moneyAccountResponses.get(i).getMacCode());
+            m.put("macName",moneyAccountResponses.get(i).getMacName());
+            m.put("macType",moneyAccountResponses.get(i).getMacType());
+            m.put("balance",moneyAccountResponses.get(i).getBalance());
+            m.put("displayNo",moneyAccountResponses.get(i).getDisplayNo());
+            m.put("flgDefault",moneyAccountResponses.get(i).getFlgDefault());
+            listMoneyAccounts.add(m);
+        }
+        map.put("moneyAccounts",listMoneyAccounts);
         //  计量单位
         List<UnitResponse> unitResponses = unitMapper.selectByCond(new UnitQuery());
         List<Map<String, Object>> listUnits = new ArrayList<>();
@@ -275,8 +310,6 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             m.put("unitName",unitResponses.get(i).getUnitName());
             m.put("decimalPlaces",unitResponses.get(i).getDecimalPlaces());
             m.put("displayNo",unitResponses.get(i).getDisplayNo());
-            m.put("cpId",cpId);
-            m.put("opCreateUserId",staffId);
             listUnits.add(m);
         }
         map.put("units",listUnits);
@@ -296,11 +329,27 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             m.put("levelCode",goodsCategoryResponses.get(i).getLevelCode());
             m.put("levelName",goodsCategoryResponses.get(i).getLevelName());
             m.put("displayNo",goodsCategoryResponses.get(i).getDisplayNo());
-            m.put("cpId",cpId);
-            m.put("opCreateUserId",staffId);
             listGoodsCategorys.add(m);
         }
         map.put("goodsCategorys",listGoodsCategorys);
+
+        //  打印票据
+        //List<PrintLayout> printLayoutResponses = printLayoutMapper.selectByCond(new PrintLayout());
+        //List<Map<String, Object>> listPrintLayout = new ArrayList<>();
+        //for (int i = 0; i < printLayoutResponses.size(); i++) {
+        //    m = new HashMap<>();
+        //    m.put("layoutName",printLayoutResponses.get(i).getLayoutName());
+        //    m.put("layoutData",printLayoutResponses.get(i).getLayoutData());
+        //    m.put("displayNo",printLayoutResponses.get(i).getDisplayNo());
+        //    m.put("docName",printLayoutResponses.get(i).getDocName());
+        //    m.put("cpId",cpId);
+        //    m.put("opCreateUserId",staffId);
+        //    listPrintLayout.add(m);
+        //}
+        //map.put("printLayout",listPrintLayout);
+
+
+
         ResponseResultVO  listResponseResultVO = staffFeign.insertFeignCompanyData(map);
 
         // 如果没有成功返回

src/main/resources/mapper/CompanyMapper.xml

@@ -18,6 +18,7 @@
         <result column="svc_ip" property="svcIp"/>
         <result column="svc_port" property="svcPort"/>
         <result column="end_date" property="endDate"/>
+        <result column="grade_code" property="gradeCode"/>
         <result column="max_staff_num" property="maxStaffNum"/>
         <result column="cur_staff_num" property="curStaffNum"/>
     </resultMap>
@@ -194,6 +195,11 @@
         </foreach>
     </sql>
 
+    <!--更新公司的当前人数-->
+    <update id="updateCompanyCurStaffNum">
+        update dkic_a.t_a_company t set cur_staff_num = cur_staff_num + #{curStaffNum} where t.cp_id = #{cpId}
+    </update>
+
     <!-- 获取商户的地址服务 -->
     <select id="selectServiceAllot" resultType="String">
         SELECT dkic_a.f_allot_service(#{gradeCode})

src/main/resources/mapper/MoneyAccountMapper.xml

@@ -0,0 +1,99 @@
+<?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.dk.oauth.mapper.MoneyAccountMapper">
+
+    <!-- 通用设置 -->
+    <!-- 通用查询列 -->
+    <sql id="Base_Column_List">
+        mac_id, mac_code, mac_name, mac_type, balance, display_no, flg_default, mac_receipt_code, acc_date, flg_negative, remarks, flg_valid, cp_id
+    </sql>
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dk.oauth.entity.MoneyAccount">
+        <id column="mac_id" property="macId"/>
+            <result column="mac_code" property="macCode"/>
+            <result column="mac_name" property="macName"/>
+            <result column="mac_type" property="macType" typeHandler="UuidTypeHandler"/>
+            <result column="balance" property="balance"/>
+            <result column="display_no" property="displayNo"/>
+            <result column="flg_default" property="flgDefault"/>
+            <result column="mac_receipt_code" property="macReceiptCode" typeHandler="JsonTypeHandler"/>
+            <result column="acc_date" property="accDate"/>
+            <result column="flg_negative" property="flgNegative"/>
+            <result column="remarks" property="remarks"/>
+            <result column="flg_valid" property="flgValid"/>
+            <result column="cp_id" property="cpId"/>
+    </resultMap>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMapResponse" type="com.dk.oauth.response.MoneyAccountResponse">
+        <id column="mac_id" property="macId"/>
+            <result column="mac_code" property="macCode"/>
+            <result column="mac_name" property="macName"/>
+            <result column="mac_type" property="macType" typeHandler="UuidTypeHandler"/>
+            <result column="balance" property="balance"/>
+            <result column="display_no" property="displayNo"/>
+            <result column="flg_default" property="flgDefault"/>
+            <result column="mac_receipt_code" property="macReceiptCode" typeHandler="JsonTypeHandler"/>
+            <result column="acc_date" property="accDate"/>
+            <result column="flg_negative" property="flgNegative"/>
+            <result column="remarks" property="remarks"/>
+            <result column="flg_valid" property="flgValid"/>
+            <result column="cp_id" property="cpId"/>
+    </resultMap>
+
+    <!-- 通用条件列 -->
+    <sql id="Condition">
+        <where>
+            <if test="macCode != null and macCode != ''">
+                AND t.mac_code LIKE concat('%',my_ex.likequery(#{macCode}),'%')
+            </if>
+            <if test="macName != null and macName != ''">
+                AND t.mac_name LIKE concat('%',my_ex.likequery(#{macName}),'%')
+            </if>
+            <if test="remarks != null and remarks != ''">
+                AND t.remarks = LIKE concat('%',my_ex.likequery(#{remarks}),'%')
+            </if>
+            <if test="cpId != null">
+                AND t.cp_id = #{cpId}
+            </if>
+            <if test="flgValidList != null and flgValidList.size>0">
+                AND t.flg_valid  =any(#{flgValidList, typeHandler=BooleanListTypeHandler})
+            </if>
+            <if test="flgValid != null ">
+                AND t.flg_valid  = #{flgValid}
+            </if>
+            <if test="macTypeList != null and macTypeList.size() > 0">
+                AND t.mac_Type  =any(#{macTypeList, typeHandler=UuidListTypeHandler})
+            </if>
+        </where>
+    </sql>
+
+    <!-- 查询表t_mst_money_account，（条件查询+分页）列表 -->
+    <select id="selectByCond" resultMap="BaseResultMapResponse">
+        SELECT t.mac_id,
+               t.mac_code,
+               t.mac_name,
+               t.mac_Type,
+               dd.data_value             AS "macTypeName",
+               t.balance,
+               t.display_no,
+               t.mac_receipt_code,
+               t.acc_date,
+               t.flg_negative,
+               t.remarks,
+               t.flg_valid,
+               t.cp_id,
+               coalesce(tmti.amt_trf, 0) as "initBalance"
+        FROM dkic_b.t_mst_money_account as t
+                 left join dkic_b.t_mst_dictionary_data as dd on t.mac_type = dd.data_id
+                 left join(select tmti.trf_in_mac, tmti.amt_trf
+                           from dkic_b.t_mac_transfer as tmt
+                                    inner join dkic_b.t_mac_transfer_item as tmti
+                                        on tmti.trf_id = tmt.trf_id and tmt.flg_valid
+                                               and tmti.flg_valid and tmt.trf_type = 0) tmti
+                          on tmti.trf_in_mac = t.mac_id
+        <include refid="Condition"/>
+        order by t.display_no
+    </select>
+
+</mapper>