Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -726,5 +726,5 @@ public interface CommonMapper {
 
     List<ContractTemplate> queryNeedContract(@Param("companyId") String companyWechatId,
                                        @Param("websitId") String websitId,
-                                       @Param("onDate") String onDate);
+                                       @Param("onDate") Date onDate);
 }

mall-server-api/src/main/java/com/gree/mall/manager/controller/fadada/ContractCommonController.java

@@ -11,17 +11,24 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @Api(value = "法大大通用API", tags ={"法大大通用API"} )
-@RequestMapping("fdd/common")
+@RequestMapping("/fdd/common")
 public class ContractCommonController {
 
-    @PostMapping("view/contract")
+    @PostMapping("/view/template")
+    @ApiOperation(value = "查看模板")
+    public ResponseHelper<String> viewTemplate(@RequestParam String templateId) {
+        String url = Auth4FDDUtil.queryContractTemplate(templateId);
+        return ResponseHelper.success(url);
+    }
+
+    @PostMapping("/view/contract")
     @ApiOperation(value = "查看合同")
     public ResponseHelper<String> viewContract(@RequestParam String contractId) {
         String url = Auth4FDDUtil.viewContract(contractId);
         return ResponseHelper.success(url);
     }
 
-    @PostMapping("download/contract")
+    @PostMapping("/download/contract")
     @ApiOperation(value = "下载合同")
     public ResponseHelper<String> downloadContract(@RequestParam String contractId) {
         String url = Auth4FDDUtil.downloadContract(contractId);

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -183,7 +183,7 @@ public class AdminUserLogic {
                             .isNull(WebsitContractSignRecord::getCancelTime)
                             .count();
                     if (existCount == 0) {
-                        List<ContractTemplate> contractList = commonMapper.queryNeedContract(adminUser.getCompanyWechatId(), websit.getWebsitId(), DateUtil.formatDate(DateUtil.date()));
+                        List<ContractTemplate> contractList = commonMapper.queryNeedContract(adminUser.getCompanyWechatId(), websit.getWebsitId(), DateUtil.date());
                         if (CollectionUtil.isEmpty(contractList)) {
                             adminUserCom.setContractSignInfo("未发现网点需要签约合同，请联系管理员处理");
                         } else if (CollectionUtil.isNotEmpty(contractList) && contractList.size() > 1) {
@@ -219,7 +219,8 @@ public class AdminUserLogic {
                                             .setParentName(parentWebsit.getName())
                                             .setContractTemplateId(template.getContractTemplateId())
                                             .setContractName(template.getContractTemplateName())
-                                            .setAuthStatus(StringUtils.isBlank(websit.getFadadaCustomerId()) ? IsYesNoEnum.NO.getKey() : IsYesNoEnum.YES.getKey());
+                                            .setAuthStatus(StringUtils.isBlank(websit.getFadadaCustomerId()) ? IsYesNoEnum.NO.getKey() : IsYesNoEnum.YES.getKey())
+                                            .insert();
 
                                     WebsitContractSignItem signItem = new WebsitContractSignItem();
                                     signItem.setId(IdWorker.getIdStr())

mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/ContractTemplateLogic.java

@@ -99,6 +99,7 @@ public class ContractTemplateLogic {
         }
     }
 
+    @Transactional
     public void update(ContractTemplateBean contractTemplate) {
         this.validRequireParams(contractTemplate);
         ContractTemplate byId = contractTemplateService.getById(contractTemplate.getContractTemplateId());
@@ -154,8 +155,8 @@ public class ContractTemplateLogic {
         if (StringUtils.isBlank(contractTemplate.getContractType())) {
             throw new RemoteServiceException("合同类型不能为空");
         }
-        if (contractTemplate.getContractType().equals(ContractTypeEnum.FOLLOW.getKey())) {
-            contractTemplate.setFollowContractTemplateId("");
+        if (contractTemplate.getContractType().equals(ContractTypeEnum.MAIN.getKey())) {
+            contractTemplate.setFollowContractTemplateId(null);
         }
         if (StringUtils.isBlank(contractTemplate.getContractTemplateId())
                 && ContractTypeEnum.MAIN.getKey().equals(contractTemplate.getContractType())

mall-server-api/src/main/java/com/gree/mall/manager/utils/fadada/Auth4FDDUtil.java

@@ -9,6 +9,7 @@ import com.fadada.sdk.extra.client.FddExtraClient;
 import com.fadada.sdk.extra.model.req.GotoBatchSemiAutoSignPageParams;
 import com.fadada.sdk.extra.model.req.QuerySignResultParams;
 import com.fadada.sdk.extra.model.req.QuerySignStatusParams;
+import com.fadada.sdk.extra.model.req.ViewTemplateParams;
 import com.fadada.sdk.utils.crypt.FddEncryptTool;
 import com.fadada.sdk.verify.client.FddVerifyClient;
 import com.fadada.sdk.verify.model.req.*;
@@ -582,6 +583,21 @@ public class Auth4FDDUtil {
     }
 
     /**
+     * 合同模板查看接口
+     * @param templateId 合同模板编号
+     * @return
+     */
+    public static String queryContractTemplate(String templateId) {
+        if (StringUtils.isBlank(templateId)) {
+            throw new RemoteServiceException("合同编号不能为空");
+        }
+        FddExtraClient client = new FddExtraClient(appId, secret, version, url);
+        ViewTemplateParams params = new ViewTemplateParams();
+        params.setTemplateId(templateId);
+        return client.invokeViewTemplate(params);
+    }
+
+    /**
      * 合同查看接口
      * @param contractId 合同编号
      * @return
@@ -741,4 +757,6 @@ public class Auth4FDDUtil {
 
         return new String(FddEncryptTool.Base64Encode(sha1.getBytes()));
     }
+
+
 }

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1395,7 +1395,7 @@
         b.contract_template_name AS followContractTemplateName
         FROM
         contract_template a
-        LEFT JOIN contract_template b ON a.contract_template_id = b.follow_contract_template_id
+        LEFT JOIN contract_template b ON a.follow_contract_template_id = b.contract_template_id
         ${ex.query}
         AND a.del = 0
         <if test="ex.orderBy == null or ex.orderBy ==''">
@@ -1471,7 +1471,7 @@
         websit_contract_sign_record a
         ${ex.query}
         <if test="websitId != null">
-            a.websit_id = #{websitId}
+            AND a.websit_id = #{websitId}
         </if>
         <if test="websitId == null and ex.adminWebsitIds != null and ex.adminWebsitIds.size > 0">
             AND a.parent_id IN
@@ -1495,8 +1495,7 @@
             AND a.contract_template_id = b.contract_template_id
             AND a.company_wechat_id = #{companyId}
             AND a.sub_websit_id = #{websitId}
-            AND b.valid_date <![CDATA[ >= ]]> #{onDate}
-            AND b.expire_date <![CDATA[ <= ]]> #{onDate}
+            AND #{onDate} BETWEEN b.valid_date AND b.expire_date
             AND b.contract_type = 'MAIN'
             AND b.status = 'ON'
         ORDER BY