bug fix

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java

@@ -18,6 +18,7 @@ import com.huiju.estateagents.eContract.entity.TaContractUser;
 import com.huiju.estateagents.eContract.service.ITaCompanySealService;
 import com.huiju.estateagents.config.FadadaProperties;
 import com.huiju.estateagents.eContract.service.ITaContractUserService;
+import com.huiju.estateagents.eContract.service.impl.TaCompanySealUtil;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.sample.entity.TaH5Demand;
 import com.huiju.estateagents.service.impl.TaMiniappServiceImpl;
@@ -76,6 +77,9 @@ public class TaCompanyController extends BaseController {
     @Autowired
     private TaMiniappServiceImpl taMiniappService;
 
+    @Autowired
+    private TaCompanySealUtil taCompanySealUtil;
+
 
     /**
      * 条件查询企业列表
@@ -122,18 +126,12 @@ public class TaCompanyController extends BaseController {
     @RequestMapping(value = "/admin/taCompanyList", method = RequestMethod.GET)
     public ResponseBean companyList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                   String companyName, String companyCode) {
+                                   String companyName, String companyCode, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             IPage<TaCompany> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaCompany> queryWrapper = new QueryWrapper<>();
-            queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
-            queryWrapper.like(StringUtils.isNotBlank(companyCode), "company_code", companyCode);
-            queryWrapper.eq("status", CommConstant.REAL_NAME_STATUS);
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);
+            IPage<TaCompany> result = iTaCompanyService.selectListByOrgId(pg, companyCode, companyName, getOrgId(request));
             List<TaCompany> taCompanyList = result.getRecords();
             for (TaCompany taCompany : taCompanyList){
                 QueryWrapper<TaCompanySeal> sealQueryWrapper = new QueryWrapper<>();
@@ -506,6 +504,37 @@ public class TaCompanyController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 设置默认章
+     */
+    @RequestMapping(value = "/channel/company/setDefaultSeal/{id}", method = RequestMethod.POST)
+    public ResponseBean setDefaultSeal(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        TaCompanySeal taCompanySeal = iTaCompanySealService.getById(id);
+        TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
+        String res = taCompanySealUtil.setDefaultSeal(taCompanySeal.getSignatureId(), taCompany.getFadadaCode());
+        JSONObject result = JSONObject.parseObject(res);
+        if ((Integer) result.get("code") != 1){
+            responseBean.addError(result.getString("msg"));
+            return responseBean;
+        }
+        //更新旧的印章为否
+        QueryWrapper<TaCompanySeal> taCompanySealQueryWrapper = new QueryWrapper<>();
+        taCompanySealQueryWrapper.eq("company_id", taCompany.getCompanyId());
+        taCompanySealQueryWrapper.eq("default_seal", CommConstant.STATUS_NORMAL);
+        TaCompanySeal oldDefaultSeal = iTaCompanySealService.getOne(taCompanySealQueryWrapper);
+        oldDefaultSeal.setDefaultSeal(CommConstant.STATUS_UNACCALIMED);
+        iTaCompanySealService.updateById(oldDefaultSeal);
+
+        //更新默认章
+        taCompanySeal.setDefaultSeal(CommConstant.STATUS_NORMAL);
+        iTaCompanySealService.updateById(taCompanySeal);
+
+
+        responseBean.addSuccess(result.getString("msg"));
+        return responseBean;
+    }
+
 
     /**
      * 手动签署回调函数

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanySealController.java

@@ -58,7 +58,8 @@ public class TaCompanySealController extends BaseController {
     @RequestMapping(value="/admin/taCompanySeal",method= RequestMethod.GET)
     public ResponseBean taCompanySealList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                          @RequestParam(value ="sealName", required = false) String sealName){
+                                          @RequestParam(value ="sealName", required = false) String sealName,
+                                          @RequestParam(value ="companyId", required = false) String companyId){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -66,6 +67,7 @@ public class TaCompanySealController extends BaseController {
             QueryWrapper<TaCompanySeal> queryWrapper = new QueryWrapper<>();
             queryWrapper.like(!StringUtils.isEmpty(sealName), "seal_name", sealName);
             queryWrapper.ne("status", CommConstant.STATUS_DELETE);
+            queryWrapper.eq(!StringUtils.isEmpty(companyId), "company_id", companyId);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompanySeal> result = iTaCompanySealService.page(pg, queryWrapper);

src/main/java/com/huiju/estateagents/eContract/controller/TaContractBusinessController.java

@@ -23,6 +23,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import sun.util.locale.LocaleObjectCache;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
@@ -110,7 +111,7 @@ public class TaContractBusinessController extends BaseController {
             taContractBusinessQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             taContractBusinessQueryWrapper.eq("target_id", targetId);
             Integer contractBusinessNum = iTaContractBusinessService.count(taContractBusinessQueryWrapper);
-            if (contractBusinessNum > 0){
+            if (contractBusinessNum > 0 && CommConstant.STATUS_NORMAL.equals(taContractBusiness.getStatus())){
                 responseBean.addError("所选业务已有发布的业务配置，无法再新增已发布的业务配置");
                 return responseBean;
             }
@@ -198,7 +199,7 @@ public class TaContractBusinessController extends BaseController {
 
 
             Integer contractBusinessNum = iTaContractBusinessService.count(taContractBusinessQueryWrapper);
-            if (contractBusinessNum > 0){
+            if (contractBusinessNum > 0 && CommConstant.STATUS_NORMAL.equals(taContractBusiness.getStatus())){
                 responseBean.addError("所选业务已有发布的业务配置，无法再新增已发布的业务配置");
                 return responseBean;
             }
@@ -207,6 +208,7 @@ public class TaContractBusinessController extends BaseController {
             taContractBusiness.setContractTemplateName(taContractTemplate.getContractTemplateName());
             taContractBusiness.setTargetName(taRaise.getSalesBatchName());
             taContractBusiness.setCompanyName(taCompany.getCompanyName());
+            taContractBusiness.setUpdateDate(LocalDateTime.now());
             if (iTaContractBusinessService.updateById(taContractBusiness)){
                 responseBean.addSuccess(taContractBusiness);
             }else {

src/main/java/com/huiju/estateagents/eContract/entity/TaCompanySeal.java

@@ -59,4 +59,9 @@ public class TaCompanySeal implements Serializable {
      * 签章id
      */
     private String signatureId;
+
+    /**
+     * 默认章
+     */
+    private Integer defaultSeal;
 }

src/main/java/com/huiju/estateagents/eContract/mapper/TaCompanyMapper.java

@@ -19,4 +19,6 @@ import org.springframework.stereotype.Component;
 @Component
 public interface TaCompanyMapper extends BaseMapper<TaCompany> {
     TaCompany getCompanyAndContractInfo(@Param("companyId") Integer companyId);
+
+    IPage<TaCompany> selectListByOrgId(IPage<TaCompany> iPage, @Param("companyName") String companyName, @Param("companyCode")String companyCode, @Param("orgId")Integer orgId);
 }

src/main/java/com/huiju/estateagents/eContract/service/ITaCompanyService.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.eContract.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.eContract.entity.TaCompany;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.apache.poi.ss.formula.functions.T;
@@ -39,4 +40,6 @@ public interface ITaCompanyService extends IService<TaCompany> {
     TaCompany getCompanyAndContractInfo(Integer companyId);
 
     String getAuthStatus(Integer companyId);
+
+    IPage<TaCompany> selectListByOrgId(IPage<TaCompany> iPage, String companyName, String companyCode, Integer orgId);
 }

src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanySealUtil.java

@@ -114,4 +114,24 @@ public class TaCompanySealUtil {
         return HttpsUtil.doPost(fadadaProperties.getAuthServeHost() + "get_auth_status.api", params);
     }
 
+    public String setDefaultSeal(String signatureId, String customerId){
+        ArrayList params = new ArrayList();
+
+        try {
+            String timeStamp = HttpsUtil.getTimeStamp();
+            String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId + signatureId));
+            String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
+            params.add(new BasicNameValuePair("customer_id", customerId));
+            params.add(new BasicNameValuePair("app_id", fadadaProperties.getAppId()));
+            params.add(new BasicNameValuePair("timestamp", timeStamp));
+            params.add(new BasicNameValuePair("v", fadadaProperties.getVersion()));
+            params.add(new BasicNameValuePair("msg_digest", msgDigest));
+            params.add(new BasicNameValuePair("signature_id", signatureId));
+        } catch (Exception var7) {
+            var7.printStackTrace();
+            throw new RuntimeException(var7);
+        }
+
+        return HttpsUtil.doPost(fadadaProperties.getAuthServeHost() + "default_signature.api", params);
+    }
 }

src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanyServiceImpl.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.eContract.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fadada.sdk.client.FddClientBase;
 import com.fadada.sdk.client.authForfadada.FindCertInfo;
 import com.fadada.sdk.client.authForfadada.GetCompanyVerifyUrl;
@@ -255,6 +256,11 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         return taCompanySealUtil.getAuthStatus(taCompany.getFadadaCode());
     }
 
+    @Override
+    public IPage<TaCompany> selectListByOrgId(IPage<TaCompany> iPage, String companyName, String companyCode, Integer orgId) {
+        return taCompanyMapper.selectListByOrgId(iPage, companyName, companyCode, orgId);
+    }
+
     /**
      * url解码
      * @param bizContent

src/main/resources/application-blue.yml

@@ -86,7 +86,7 @@ fadada:
   authServeHost: "http://test.api.fabigbig.com:8888/api/"
   serveHost: "https://testapi08.fadada.com/api/"
   companyNotify: "https://dev.pawoma.cn/api/fadd/company"
-  authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
+  authReturnUrl: "https://dev.pawoma.cn/channel/#/eContract/seal/detail?id="
   authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
   signNotify: "https://dev.pawoma.cn/api/fadd/sign"
   redirectUrl: "https://dev.pawoma.cn/other/redirect.html"

src/main/resources/application-green.yml

@@ -86,7 +86,7 @@ fadada:
   authServeHost: "http://test.api.fabigbig.com:8888/api/"
   serveHost: "https://testapi08.fadada.com/api/"
   companyNotify: "https://dev.pawoma.cn/api/fadd/company"
-  authReturnUrl: "http://localhost:8000/#/eContract/seal/detail?id="
+  authReturnUrl: "https://dev.pawoma.cn/channel/#/eContract/seal/detail?id="
   authNotifyUrl: "https://dev.pawoma.cn/api/fadd/autoAuthCompanySeal"
   signNotify: "https://dev.pawoma.cn/api/fadd/sign"
   redirectUrl: "https://dev.pawoma.cn/other/redirect.html"

src/main/resources/mapper/eContract/TaCompanyMapper.xml

@@ -8,4 +8,18 @@
         where t.company_id = #{companyId}
     </select>
 
+    <select id="selectListByOrgId" resultType="com.huiju.estateagents.eContract.entity.TaCompany">
+        select t.* From ta_company t
+        left join ta_company_org a on t.company_id = a.company_id
+        where a.org_id = #{orgId}
+        <if test="companyCode != null and companyCode!=''">
+            and t.company_code = #{companyCode}
+        </if>
+        <if test="companyName != null and companyName!=''">
+            and t.company_name = #{companyName}
+        </if>
+        and t.status = 4
+        order by t.create_date desc
+    </select>
+
 </mapper>