From 7ad3d376d3ccb029bb8077725aa70747b0ebb2ad Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 14 三月 2024 16:15:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java |  156 +++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 143 insertions(+), 13 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index 3d842ad..6bf7765 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -1,5 +1,6 @@
 package com.doumee.service.business.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
@@ -31,9 +32,12 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Array;
 import java.net.URI;
+import java.net.URLEncoder;
 import java.util.*;
 
 /**
@@ -84,6 +88,7 @@
         company.setStatus(Constants.ZERO);
         company.setType(Constants.ZERO);
         company.setSignStatus(Constants.ZERO);
+        company.setType(Constants.ZERO);
         company.setSignIdStatus(Constants.ZERO);
         companyMapper.insert(company);
         company.setEditDate(company.getCreateDate());
@@ -94,6 +99,36 @@
         dealFileData(company);
         //澶勭悊鍏宠仈鏂规
         dealSolutionsData(company);
+        return company;
+    }
+    @Override
+    @Transactional
+    public Company createShop(Company company) {
+        isValidCreateParam(company);
+        if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
+                .eq(Company::getCode,company.getCode())
+               .or().eq(Company::getPhone,company.getPhone())
+               .or().eq(Company::getEmail,company.getEmail())
+               .or().eq(Company::getUsername,company.getUsername())
+                .or().eq(Company::getName,company.getName()))>0){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇$敤浠g爜銆戙�愰偖绠便�戞垨鑰呫�愭墜鏈哄彿銆戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
+        }
+        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+        company.setCreator(user.getId());
+        company.setCreateDate(new Date());
+        company.setType(Constants.ONE);
+        company.setIsdeleted(Constants.ZERO);
+        company.setStatus(Constants.ZERO);
+        company.setType(Constants.ZERO);
+        company.setSignStatus(Constants.ZERO);
+        company.setSignIdStatus(Constants.ZERO);
+        companyMapper.insert(company);
+        company.setEditDate(company.getCreateDate());
+        company.setEditor(user.getId());
+        //澶勭悊鐧婚檰璐﹀彿淇℃伅
+        dealSystemUserData(company);
+        //澶勭悊闄勪欢淇℃伅
+        dealFileData(company);
         return company;
     }
     @Override
@@ -111,6 +146,48 @@
         companySolutionJoinMapper.delete(new UpdateWrapper<CompanySolution>().lambda().eq(CompanySolution::getCompanyId,company.getId()));
         //澶勭悊鍏宠仈鏂规
         dealSolutionsData(company);
+    }
+
+    @Override
+    @Transactional
+    public void exportFiles(Integer id, HttpServletResponse response){
+        try {
+            Company model = companyMapper.selectById(id);
+            if(model == null){
+                throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+            }
+            List<File> fileList = new ArrayList<>();
+            List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+                    .eq(Multifile::getObjId,id)
+                    .isNotNull(Multifile::getFileurl)
+                    .in(Multifile::getObjType, Arrays.asList(new Integer[]{
+                            Constants.MultiFile.COM_BUSINESS_LICENSE.getKey(),
+                            Constants.MultiFile.COM_IDCARD_IMG.getKey(),
+                    }))
+            );
+            if(multifileList== null || multifileList.size() == 0){
+                throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+            }
+            String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.OSS,Constants.COMPANY_FILE).getCode();
+            for(Multifile l : multifileList){
+                File f = Constants.getFileByNetFile(path + l.getFileurl(),StringUtils.defaultString(l.getName(),"鏈懡鍚�"));
+                if(f !=null && f.isFile()){
+                    fileList.add(f);
+                }
+            }
+            if(fileList == null || fileList.size() == 0){
+                throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+            }
+            String fileName =  model.getName() +"_浼佷笟璇佷欢_"+System.currentTimeMillis()+".zip" ;
+            String encodeFileName = URLEncoder.encode(fileName);
+            response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
+            response.setContentType("application/octet-stream");
+            response.setHeader("eva-opera-type", "download");
+            response.setHeader("eva-download-filename", encodeFileName);
+            Constants.packFilesToZip(fileList,response.getOutputStream());
+        } catch (IOException e) {
+            throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+        }
     }
 
     private void dealSystemUserData(Company company) {
@@ -181,10 +258,18 @@
         List<CompanySolution> list = new ArrayList<>();
         int num =0;
         for(CompanySolution s :company.getSolutionList()){
-            if(s.getSolutionBaseId() == null){
+            if(Objects.isNull(s.getSolution())){
                 continue;
             }
-            sIds.add(s.getSolutionBaseId());
+            if(s.getSolution().getBaseId() == null){
+                continue;
+            }
+            Solutions newVersion = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,s.getSolution().getBaseId())
+                    .eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
+            if(Objects.isNull(newVersion)){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅锛�");
+            }
+            sIds.add(s.getSolution().getBaseId());
             s.setCompanyId(company.getId());
             s.setIsdeleted(Constants.ZERO);
             s.setCanAdd(Constants.formatIntegerNum(s.getCanAdd()));
@@ -192,6 +277,8 @@
             s.setCreateDate(company.getCreateDate());
             s.setCreator(company.getCreator());
             s.setSortnum(num++);
+            s.setSolutionBaseId( s.getSolution().getBaseId() );
+            s.setSolutionId( newVersion.getId() );
             s.setStatus(Constants.ZERO);
             list.add(s);
         }
@@ -212,6 +299,45 @@
         companySolutionJoinMapper.insertBatchSomeColumn(list);
     }
 
+
+
+   /* private void dealSolutionsData(Company company) {
+        List<Integer> sIds = new ArrayList<>();
+        List<CompanySolution> list = new ArrayList<>();
+        int num =0;
+        for(CompanySolution s :company.getSolutionList()){
+            if(s.getSolution() == null || s.getSolution().getBaseId() == null ||s.getSolution().getId()==null){
+                continue;
+            }
+            sIds.add(s.getSolution().getId() );
+            s.setCompanyId(company.getId());
+            s.setIsdeleted(Constants.ZERO);
+            s.setCanAdd(Constants.formatIntegerNum(s.getCanAdd()));
+            s.setCanReduce(Constants.formatIntegerNum(s.getCanReduce()));
+            s.setCreateDate(company.getCreateDate());
+            s.setCreator(company.getCreator());
+            s.setSortnum(num++);
+            s.setSolutionBaseId( s.getSolution().getId() );
+            s.setSolutionId( s.getSolution().getBaseId() );
+            s.setStatus(Constants.ZERO);
+            list.add(s);
+        }
+        if(list.size() ==0){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅锛�");
+        }
+        List<Solutions> solutionsList = solutionsMapper.selectList(new QueryWrapper<Solutions>().lambda()
+                .in(Solutions::getId,sIds)
+                .eq(Solutions::getIsdeleted,Constants.ZERO));
+        if(solutionsList.size()!= list.size()){
+            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅鍝�");
+        }
+        for(Solutions s:solutionsList){
+            if(Constants.equalsInteger(s.getStatus(),Constants.ONE)){
+                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇濋櫓鏂规銆�"+s.getName()+"銆戝凡琚鐢紝涓嶈兘杩涜璇ユ搷浣�");
+            }
+        }
+        companySolutionJoinMapper.insertBatchSomeColumn(list);
+    }*/
     private void isValidCreateParam(Company company) {
         if(StringUtils.isBlank(company.getPhone())
             ||StringUtils.isBlank(company.getName())
@@ -244,7 +370,7 @@
         if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
             multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
         }else {
-            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犵數瀛愮绔狅紒");
+         //   throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇蜂笂浼犵數瀛愮绔狅紒");
         }
         if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null&& company.getIdcardImgList().size()>0){
             for(Multifile f : company.getIdcardImgList()){
@@ -274,13 +400,16 @@
             company.setSignId("");
         }
         if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null){
+            boolean isNew = false;
             for(Multifile f : company.getIdcardImgList()){
                 if(f.getId() !=null){
                     continue;
                 }
+                isNew = true;
                 multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
             }
-            objList.add(Constants.MultiFile.COM_IDCARD_IMG.getKey());
+            if(isNew)
+              objList.add(Constants.MultiFile.COM_IDCARD_IMG.getKey());
         }
         if(objList.size()>0){
             multifileMapper.update(null,new UpdateWrapper<Multifile>().lambda()
@@ -382,9 +511,8 @@
     }
     private void isValidUpdateParam(Company company) {
         if( StringUtils.isBlank(company.getName())
-                ||StringUtils.isBlank(company.getUsername())
+//                ||StringUtils.isBlank(company.getUsername())
                 ||StringUtils.isBlank(company.getCode())
-                ||StringUtils.isBlank(company.getCaptche())
                 ||StringUtils.isBlank(company.getLegalName())
                 ||StringUtils.isBlank(company.getEmail()) ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
@@ -421,7 +549,6 @@
         dealFileDataForUpdate(company);
 
         Company update = new Company();
-        update.setIsdeleted(company.getId());
         update.setName(company.getName());
         update.setCode(company.getCode());
         update.setEditDate(new Date());
@@ -432,6 +559,8 @@
         update.setTaxCode(company.getTaxCode());
         update.setTaxBank(company.getTaxBank());
         update.setEmail(company.getEmail());
+        update.setId(model.getId());
+        update.setLegalName(company.getLegalName());
         update.setInvoiceAddr(company.getInvoiceAddr());
         update.setSignIdStatus(company.getSignIdStatus());
         update.setInvoiceEmail(company.getInvoiceEmail());
@@ -442,7 +571,7 @@
             //濡傛灉閭鍙戠敓鏀瑰彉
             update.setSignStatus(Constants.ZERO);
         }
-        companyMapper.updateById(company);
+        companyMapper.updateById(update);
         company.setCreator(update.getEditor());
         company.setCreateDate(update.getEditDate());
         if(StringUtils.isNotBlank(company.getUsername())){
@@ -520,6 +649,7 @@
      *   public boolean organizationCreate (String fullname,String creditCode,String legalName,String email,File  businessimg,String notifyUrl){
      */
     @Override
+    @Async
     public   void startSignAuth(Integer id){
         Company company = companyMapper.selectById(id);
         Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
@@ -578,8 +708,11 @@
                 .eq(Company::getSignStatus,Constants.ONE));
         if(companyList!=null && companyList.size()>0){
             for(Company company :companyList){
-                //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝e湪鐢宠1閫氳繃2椹冲洖
+                //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃牳鐘舵��,0姝e湪鐢宠1閫氳繃2椹冲洖
                 int status = signService.organizationAuditStatus(company.getEmail());
+                if(status == 0){
+                    continue;
+                }
                 if(status == 1){
                     Company update = new Company();
                     update.setId(company.getId());
@@ -612,7 +745,7 @@
                 .eq(Company::getSignIdStatus,Constants.ZERO));
         if(companyList!=null && companyList.size()>0){
             for(Company company :companyList){
-                //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝e湪鐢宠1閫氳繃2椹冲洖
+                //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃牳鐘舵��,0姝e湪鐢宠1閫氳繃2椹冲洖
                 Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
                         .eq(Multifile::getIsdeleted,Constants.ZERO)
                         .eq(Multifile::getObjType,Constants.MultiFile.COM_SING_IMG.getKey())
@@ -633,12 +766,9 @@
                         //鏇存柊璁よ瘉鐘舵��
                         companyMapper.updateById(update);
                     }
-
                 }
-
             }
         }
-
     }
 
 //    @Override

--
Gitblit v1.9.3