Merge remote-tracking branch 'origin/master'

hx-account/src/main/java/com/fjhx/account/controller/account/AccountManagementController.java

@@ -71,12 +71,12 @@ public class AccountManagementController {
         accountManagementService.delete(dto.getId());
     }
 
-    /**
-     * 导入账户表的数据
-     */
-    @PostMapping("/importsAmount")
-    public void importsAmount(@RequestBody AccountManagementDto dto) {
-        accountManagementService.importsAmount(dto);
-    }
+//    /**
+//     * 导入账户表的数据
+//     */
+//    @PostMapping("/importsAmount")
+//    public void importsAmount(@RequestBody AccountManagementDto dto) {
+//        accountManagementService.importsAmount(dto);
+//    }
 
 }

hx-account/src/main/java/com/fjhx/account/mapper/account/AccountManagementMapper.java

@@ -2,7 +2,6 @@ package com.fjhx.account.mapper.account;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fjhx.account.entity.account.dto.AccountManagementDto;
-import com.fjhx.account.entity.account.dto.FundAccount;
 import com.fjhx.account.entity.account.po.AccountManagement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -33,6 +32,6 @@ public interface AccountManagementMapper extends BaseMapper<AccountManagement> {
     /**
      * 查询云帆资金账户表的信息
      */
-    @TenantIgnore
-    List<FundAccount> importsAmount(AccountManagementDto dto);
+//    @TenantIgnore
+//    List<FundAccount> importsAmount(AccountManagementDto dto);
 }

hx-account/src/main/java/com/fjhx/account/service/account/AccountManagementService.java

@@ -44,8 +44,8 @@ public interface AccountManagementService extends BaseService<AccountManagement>
      */
     void delete(Long id);
 
-    /**
-     * 导入账户表的数据
-     */
-    void importsAmount(AccountManagementDto dto);
+//    /**
+//     * 导入账户表的数据
+//     */
+//    void importsAmount(AccountManagementDto dto);
 }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountManagementServiceImpl.java

@@ -158,101 +158,101 @@ public class AccountManagementServiceImpl extends ServiceImpl<AccountManagementM
                 .eq(AccountRemainder::getAccountManagementId,id));
     }
 
-    /**
-     * 导入账户表的数据
-     */
-    @Override
-    @Transactional(rollbackFor = {Exception.class})
-    @TenantIgnore
-    public void importsAmount(AccountManagementDto dto) {
-        //查询云帆账户表的数据
-//        List<FundAccount> fundAccounts = baseMapper.importsAmount(dto);
-//        for (FundAccount fundAccount : fundAccounts) {
-//            //添加资金账户表的数据
-//            AccountManagement accountManagement = new AccountManagement();
-//            //查询多公司表
-//            if (ObjectUtil.isNotEmpty(fundAccount.getCompanyId())){
-//                DynamicDataSourceContextHolder.push(SourceConstant.COMMON);
-//
-//                Corporation corporation = corporationService.getOne(Wrappers.<Corporation>lambdaQuery().eq(Corporation::getYfId,fundAccount.getCompanyId()));
-//                if(ObjectUtil.isNotEmpty(corporation)){
-//                    accountManagement.setCorporationId(corporation.getId());
-//                }
-//
-//                DynamicDataSourceContextHolder.poll();
-//            }
-//            accountManagement.setTenantId(fundAccount.getTenantId());
-//            accountManagement.setYfId(fundAccount.getId());
-//            accountManagement.setAlias(fundAccount.getName());
-//            accountManagement.setAccountOpening(fundAccount.getAccountNumber());
-//            accountManagement.setCreateTime(fundAccount.getCreateTime());
-//            accountManagement.setUpdateTime(fundAccount.getUpdateTime());
-//            accountManagement.setAccountOpening(fundAccount.getAccountNumber());
-//            //查询用户
-//            if (ObjectUtil.isNotEmpty(fundAccount.getCreateUser())){
-//                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-//                SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getYfUserId, fundAccount.getCreateUser()));
-//                accountManagement.setCreateUser(sysUser.getUserId());
-//                DynamicDataSourceContextHolder.poll();
-//            }
+//    /**
+//     * 导入账户表的数据
+//     */
+//    @Override
+//    @Transactional(rollbackFor = {Exception.class})
+//    @TenantIgnore
+//    public void importsAmount(AccountManagementDto dto) {
+//        //查询云帆账户表的数据
+////        List<FundAccount> fundAccounts = baseMapper.importsAmount(dto);
+////        for (FundAccount fundAccount : fundAccounts) {
+////            //添加资金账户表的数据
+////            AccountManagement accountManagement = new AccountManagement();
+////            //查询多公司表
+////            if (ObjectUtil.isNotEmpty(fundAccount.getCompanyId())){
+////                DynamicDataSourceContextHolder.push(SourceConstant.COMMON);
+////
+////                Corporation corporation = corporationService.getOne(Wrappers.<Corporation>lambdaQuery().eq(Corporation::getYfId,fundAccount.getCompanyId()));
+////                if(ObjectUtil.isNotEmpty(corporation)){
+////                    accountManagement.setCorporationId(corporation.getId());
+////                }
+////
+////                DynamicDataSourceContextHolder.poll();
+////            }
+////            accountManagement.setTenantId(fundAccount.getTenantId());
+////            accountManagement.setYfId(fundAccount.getId());
+////            accountManagement.setAlias(fundAccount.getName());
+////            accountManagement.setAccountOpening(fundAccount.getAccountNumber());
+////            accountManagement.setCreateTime(fundAccount.getCreateTime());
+////            accountManagement.setUpdateTime(fundAccount.getUpdateTime());
+////            accountManagement.setAccountOpening(fundAccount.getAccountNumber());
+////            //查询用户
+////            if (ObjectUtil.isNotEmpty(fundAccount.getCreateUser())){
+////                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+////                SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getYfUserId, fundAccount.getCreateUser()));
+////                accountManagement.setCreateUser(sysUser.getUserId());
+////                DynamicDataSourceContextHolder.poll();
+////            }
+////
+////            if (ObjectUtil.isNotEmpty(fundAccount.getUpdateUser())){
+////                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+////                SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getYfUserId, fundAccount.getUpdateUser()));
+////                accountManagement.setCreateUser(sysUser.getUserId());
+////                DynamicDataSourceContextHolder.poll();
+////            }
+////            accountManagement.setCreateTime(fundAccount.getCreateTime());
+////            accountManagement.setUpdateTime(fundAccount.getUpdateTime());
+////            baseMapper.insert(accountManagement);
+////
+////            //添加资金账户余额表的信息
+////            AccountRemainder accountRemainder = new AccountRemainder();
+////            accountRemainder.setTenantId(fundAccount.getTenantId());
+////            accountRemainder.setAccountManagementId(accountManagement.getId());
+////            //查询用户
+////            if (ObjectUtil.isNotEmpty(fundAccount.getCreateUser())){
+////                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+////                SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getYfUserId, fundAccount.getCreateUser()));
+////                accountRemainder.setCreateUser(sysUser.getUserId());
+////                DynamicDataSourceContextHolder.poll();
+////            }
+////
+////            if (ObjectUtil.isNotEmpty(fundAccount.getUpdateUser())){
+////
+////                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+////                SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getYfUserId, fundAccount.getUpdateUser()));
+////                accountRemainder.setCreateUser(sysUser.getUserId());
+////                DynamicDataSourceContextHolder.poll();
+////            }
+////            if (ObjectUtil.isNotEmpty(fundAccount.getRmbAmount())){
+////                accountRemainder.setId(IdWorker.getId());
+////                accountRemainder.setRemainder(fundAccount.getRmbAmount());
+////                accountRemainder.setCurrency("RMB");
+////                accountRemainderService.save(accountRemainder);
+////            }
+////            if (ObjectUtil.isNotEmpty(fundAccount.getDollarAmount())){
+////                accountRemainder.setId(IdWorker.getId());
+////                accountRemainder.setRemainder(fundAccount.getDollarAmount());
+////                accountRemainder.setCurrency("USD");
+////                accountRemainderService.save(accountRemainder);
+////            }
+////            if (ObjectUtil.isNotEmpty(fundAccount.getEuroAmount())){
+////                accountRemainder.setId(IdWorker.getId());
+////                accountRemainder.setRemainder(fundAccount.getEuroAmount());
+////                accountRemainder.setCurrency("EUR");
+////                accountRemainderService.save(accountRemainder);
+////            }
+////
+////            if (ObjectUtil.isNotEmpty(fundAccount.getSterlingAmount())){
+////                accountRemainder.setId(IdWorker.getId());
+////                accountRemainder.setRemainder(fundAccount.getSterlingAmount());
+////                accountRemainder.setCurrency("GBP");
+////                accountRemainderService.save(accountRemainder);
+////            }
+////        }
 //
-//            if (ObjectUtil.isNotEmpty(fundAccount.getUpdateUser())){
-//                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-//                SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getYfUserId, fundAccount.getUpdateUser()));
-//                accountManagement.setCreateUser(sysUser.getUserId());
-//                DynamicDataSourceContextHolder.poll();
-//            }
-//            accountManagement.setCreateTime(fundAccount.getCreateTime());
-//            accountManagement.setUpdateTime(fundAccount.getUpdateTime());
-//            baseMapper.insert(accountManagement);
-//
-//            //添加资金账户余额表的信息
-//            AccountRemainder accountRemainder = new AccountRemainder();
-//            accountRemainder.setTenantId(fundAccount.getTenantId());
-//            accountRemainder.setAccountManagementId(accountManagement.getId());
-//            //查询用户
-//            if (ObjectUtil.isNotEmpty(fundAccount.getCreateUser())){
-//                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-//                SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getYfUserId, fundAccount.getCreateUser()));
-//                accountRemainder.setCreateUser(sysUser.getUserId());
-//                DynamicDataSourceContextHolder.poll();
-//            }
-//
-//            if (ObjectUtil.isNotEmpty(fundAccount.getUpdateUser())){
-//
-//                DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-//                SysUser sysUser = sysUserService.getOne(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getYfUserId, fundAccount.getUpdateUser()));
-//                accountRemainder.setCreateUser(sysUser.getUserId());
-//                DynamicDataSourceContextHolder.poll();
-//            }
-//            if (ObjectUtil.isNotEmpty(fundAccount.getRmbAmount())){
-//                accountRemainder.setId(IdWorker.getId());
-//                accountRemainder.setRemainder(fundAccount.getRmbAmount());
-//                accountRemainder.setCurrency("RMB");
-//                accountRemainderService.save(accountRemainder);
-//            }
-//            if (ObjectUtil.isNotEmpty(fundAccount.getDollarAmount())){
-//                accountRemainder.setId(IdWorker.getId());
-//                accountRemainder.setRemainder(fundAccount.getDollarAmount());
-//                accountRemainder.setCurrency("USD");
-//                accountRemainderService.save(accountRemainder);
-//            }
-//            if (ObjectUtil.isNotEmpty(fundAccount.getEuroAmount())){
-//                accountRemainder.setId(IdWorker.getId());
-//                accountRemainder.setRemainder(fundAccount.getEuroAmount());
-//                accountRemainder.setCurrency("EUR");
-//                accountRemainderService.save(accountRemainder);
-//            }
-//
-//            if (ObjectUtil.isNotEmpty(fundAccount.getSterlingAmount())){
-//                accountRemainder.setId(IdWorker.getId());
-//                accountRemainder.setRemainder(fundAccount.getSterlingAmount());
-//                accountRemainder.setCurrency("GBP");
-//                accountRemainderService.save(accountRemainder);
-//            }
-//        }
-
-    }
+//    }
 
 
     /**

hx-account/src/main/resources/mapper/account/AccountManagementMapper.xml

@@ -7,8 +7,8 @@
         from account_management am
             ${ew.customSqlSegment}
     </select>
-    <select id="importsAmount" resultType="com.fjhx.account.entity.account.dto.FundAccount">
-        select * from t_erp_fund_account where tenant_id = #{tenantId}
-    </select>
+<!--    <select id="importsAmount" resultType="com.fjhx.account.entity.account.dto.FundAccount">-->
+<!--        select * from t_erp_fund_account where tenant_id = #{tenantId}-->
+<!--    </select>-->
 
 </mapper>

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -104,4 +104,12 @@ public class ContractController {
     public  List<Map<String, Object>> saleTrend(@RequestBody ProductInfoSelectDto productInfoDto) {
         return contractService.saleTrend(productInfoDto);
     }
+
+//    /**
+//     * 销售统计
+//     */
+//    @PostMapping("/saleTrend")
+//    public  List<Map<String, Object>> saleTrend(@RequestBody ProductInfoSelectDto productInfoDto) {
+//        return contractService.saleTrend(productInfoDto);
+//    }
 }