新需求

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.eContract.controller;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.Query;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,7 +18,9 @@ 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.entity.TaMiniapp;
 import com.huiju.estateagents.sample.entity.TaH5Demand;
+import com.huiju.estateagents.service.impl.TaMiniappServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -69,6 +72,9 @@ public class TaCompanyController extends BaseController {
 
     public ITaContractUserService iTaContractUserService;
 
+    @Autowired
+    private TaMiniappServiceImpl taMiniappService;
+
 
     /**
      * 条件查询企业列表
@@ -489,8 +495,11 @@ public class TaCompanyController extends BaseController {
      */
     @RequestMapping(value = "/channel/company/autoAuthCompany/{id}", method = RequestMethod.PUT)
     public ResponseBean autoAuthCompanySeal(@PathVariable Integer id, HttpServletRequest request) throws Exception {
-        StringBuffer url = request.getRequestURL();
         ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+        taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
+
         String res = iTaCompanyService.autoAuthCompanySeal(id, getOrgId(request));
         TaCompany taCompany = new TaCompany();
         taCompany.setCompanyId(id);
@@ -528,9 +537,13 @@ public class TaCompanyController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/channel/company/getAuthStatus/{id}", method = RequestMethod.GET)
-    public ResponseBean getAuthStatus(@PathVariable Integer id){
+    public ResponseBean getAuthStatus(@PathVariable Integer id, HttpServletRequest request){
+        QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+        taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
+
         ResponseBean responseBean = new ResponseBean();
-        String res = iTaCompanyService.getAuthStatus(id);
+        String res = iTaCompanyService.getAuthStatus(id, taMiniapp.getMiniappId());
         JSONObject result = JSONObject.parseObject(res);
 
         if ((Integer) result.get("code") != 1){

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

@@ -13,11 +13,14 @@ import com.huiju.estateagents.eContract.entity.TaCompanySeal;
 import com.huiju.estateagents.eContract.service.ITaCompanySealService;
 import com.huiju.estateagents.eContract.service.ITaCompanyService;
 import com.huiju.estateagents.eContract.service.impl.TaCompanySealUtil;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.service.impl.TaMiniappServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 
 /**
@@ -43,6 +46,9 @@ public class TaCompanySealController extends BaseController {
     @Autowired
     private TaCompanySealUtil taCompanySealUtil;
 
+    @Autowired
+    private TaMiniappServiceImpl taMiniappService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -110,11 +116,14 @@ public class TaCompanySealController extends BaseController {
      * @return
      */
     @RequestMapping(value="/channel/taCompanySeal",method= RequestMethod.POST)
-    public ResponseBean taCompanySealAdd(@RequestBody TaCompanySeal taCompanySeal){
+    public ResponseBean taCompanySealAdd(@RequestBody TaCompanySeal taCompanySeal, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
-            String result = taCompanySealUtil.addSignaTure(taCompany.getFadadaCode(), taCompanySeal.getSealImg());
+            String result = taCompanySealUtil.addSignaTure(taCompany.getFadadaCode(), taCompanySeal.getSealImg(), taMiniapp.getMiniappId());
             JSONObject params = JSONObject.parseObject(result);
             if ((Integer) params.get("code") != 1){
                 responseBean.addError(params.get("msg").toString());
@@ -144,13 +153,17 @@ public class TaCompanySealController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value="/channel/delCompanySeal/{id}", method= RequestMethod.PUT)
-    public ResponseBean taCompanySealDelete(@PathVariable Integer id){
+    public ResponseBean taCompanySealDelete(@PathVariable Integer id, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
+
             TaCompanySeal taCompanySeal = iTaCompanySealService.getById(id);
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
             iTaCompanyService.getById(taCompanySeal.getCompanyId());
-            String res = taCompanySealUtil.delSignature(taCompany.getFadadaCode(), taCompanySeal.getSignatureId());
+            String res = taCompanySealUtil.delSignature(taCompany.getFadadaCode(), taCompanySeal.getSignatureId(), taMiniapp.getMiniappId());
             JSONObject params = JSONObject.parseObject(res);
             Integer code = (Integer) params.get("code");
             if (code != 1){
@@ -182,12 +195,16 @@ public class TaCompanySealController extends BaseController {
      */
     @RequestMapping(value="/channel/taCompanySeal/{id}",method= RequestMethod.PUT)
     public ResponseBean taCompanySealUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCompanySeal taCompanySeal){
+                                        @RequestBody TaCompanySeal taCompanySeal, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQueryWrapper);
+
             TaCompany taCompany = iTaCompanyService.getById(taCompanySeal.getCompanyId());
             TaCompanySeal sealInfo = iTaCompanySealService.getById(id);
-            String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), sealInfo.getSignatureId(), taCompanySeal.getSealImg());
+            String res = taCompanySealUtil.replaceSignature(taCompany.getFadadaCode(), sealInfo.getSignatureId(), taCompanySeal.getSealImg(), taMiniapp.getMiniappId());
             JSONObject params = JSONObject.parseObject(res);
             Integer code = (Integer) params.get("code");
             if (code != 1){

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

@@ -38,5 +38,5 @@ public interface ITaCompanyService extends IService<TaCompany> {
 
     TaCompany getCompanyAndContractInfo(Integer companyId);
 
-    String getAuthStatus(Integer companyId);
+    String getAuthStatus(Integer companyId, String miniAppId);
 }

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

@@ -25,13 +25,13 @@ public class TaCompanySealUtil {
     @Autowired
     private TaMiniappMapper taMiniappMapper;
 
-    public String addSignaTure(String customerId, String imgUrl) throws Exception {
+    public String addSignaTure(String customerId, String imgUrl, String miniappId) throws Exception {
         FddClientBase base = new FddClientBase(fadadaProperties.getAppId(), fadadaProperties.getAppSecret(), fadadaProperties.getVersion(), getFddServerHost(miniappId,fadadaProperties.getServeHost()));
         String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
         return base.invokeaddSignature(customerId, base64Url);
     }
 
-    public String replaceSignature(String customerId, String signatureId, String imgUrl){
+    public String replaceSignature(String customerId, String signatureId, String imgUrl, String miniappId){
         String base64Url = FddEncryptTool.ImageToBase64ByOnline(imgUrl);
         ArrayList params = new ArrayList();
 
@@ -54,7 +54,7 @@ public class TaCompanySealUtil {
         return HttpsUtil.doPost(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "replace_signature.api", params);
     }
 
-    public String delSignature(String customerId, String signatureId){
+    public String delSignature(String customerId, String signatureId, String miniappId){
         ArrayList params = new ArrayList();
 
         try {
@@ -75,7 +75,7 @@ public class TaCompanySealUtil {
         return HttpsUtil.doPost(getFddServerHost(miniappId,fadadaProperties.getServeHost()) + "remove_signature.api", params);
     }
 
-    public String autoAuthCompanySeal(String transactionId, Integer authType, String contractId, String customerId, String companyId) throws Exception {
+    public String autoAuthCompanySeal(String transactionId, Integer authType, String contractId, String customerId, String companyId, String miniappId) throws Exception {
         String timeStamp = HttpsUtil.getTimeStamp();
         String sha1 = FddEncryptTool.sha1(fadadaProperties.getAppId() + FddEncryptTool.md5Digest(transactionId + timeStamp) + FddEncryptTool.sha1(fadadaProperties.getAppSecret() + customerId));
         String msgDigest = new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
@@ -94,7 +94,7 @@ public class TaCompanySealUtil {
         return stringBuilder.toString();
     }
 
-    public String getAuthStatus(String customerId){
+    public String getAuthStatus(String customerId, String miniappId){
         ArrayList params = new ArrayList();
 
         try {

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

@@ -223,9 +223,9 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
     }
 
     @Override
-    public String getAuthStatus(Integer companyId) {
+    public String getAuthStatus(Integer companyId, String miniAppId) {
         TaCompany taCompany = taCompanyMapper.selectById(companyId);
-        return taCompanySealUtil.getAuthStatus(taCompany.getFadadaCode());
+        return taCompanySealUtil.getAuthStatus(taCompany.getFadadaCode(), miniAppId);
     }
 
     /**