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

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

@@ -818,6 +818,10 @@ public class AdminWebsitLogic {
             String address = row.get(10).toString().trim();
             String lnglat = lbsAmapLogic.getLocationByAddress(address);
 
+            if (org.apache.commons.lang3.StringUtils.isBlank(lnglat)) {
+                throw new RemoteServiceException("第" + rowIndex + "行, 请填写正确地址");
+            }
+
             String payName = row.get(11).toString().trim();
             final AdminCompanyWechatPayConfig wechatPayConfig = adminCompanyWechatPayConfigService.lambdaQuery()
                     .eq(AdminCompanyWechatPayConfig::getPayMerchantName, payName)

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

@@ -12,6 +12,7 @@ import com.gree.mall.manager.bean.contract.ContractWebsitBean;
 import com.gree.mall.manager.commonmapper.CommonMapper;
 import com.gree.mall.manager.commonmapper.WebsitMapper;
 import com.gree.mall.manager.enums.ContractTypeEnum;
+import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.enums.base.BaseEnum;
 import com.gree.mall.manager.enums.contract.FieldTypeEnum;
 import com.gree.mall.manager.enums.contract.SignContractStatusEnum;
@@ -121,6 +122,7 @@ public class ContractTemplateLogic {
 
         contractTemplate.setFadadaTemplateId(templateId)
                 .setContractTemplateName(contractTemplate.getContractTemplateName().trim())
+                .setNeedPartyASign(StringUtils.isBlank(contractTemplate.getCompanySignFiled()) ? IsYesNoEnum.NO.getKey() : IsYesNoEnum.YES.getKey())
                 .setStatus(StateEnum.ON.getKey())
                 .insert();
 
@@ -162,6 +164,7 @@ public class ContractTemplateLogic {
                 .setExpireDate(contractTemplate.getExpireDate())
                 .setContractTemplatePdf(contractTemplate.getContractTemplatePdf())
                 .setFollowContractTemplateId(contractTemplate.getFollowContractTemplateId())
+                .setNeedPartyASign(StringUtils.isBlank(contractTemplate.getCompanySignFiled()) ? IsYesNoEnum.NO.getKey() : IsYesNoEnum.YES.getKey())
                 .updateById();
 
         if (contractTemplate.getContractType().equals(ContractTypeEnum.MAIN.getKey())) {

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

@@ -682,15 +682,22 @@ public class WebsitContractSignLogic {
             if (status.getKey().equals(SignContractStatusEnum.OK.getKey())) {
                 if (signItem.getNeedPartyASign().equals(IsYesNoEnum.YES.getKey())) {
                     //甲方签署
-                    JSONObject object = Auth4FDDUtil.extSignAuto(IdWorker.getIdStr(), signItem.getFadadaContractId(),
-                            signItem.getCaCustomerId(), "甲方签章", "0",
-                            signItem.getPartyASignFiled(), "", "", "");
-                    log.info(signItem.getFadadaContractId() + " 甲方签章结果：{}", object);
-
-                    // 法大大合同归档
-                    JSONObject object1 = Auth4FDDUtil.contractFiling(signItem.getFadadaContractId());
-                    log.info(signItem.getFadadaContractId() + " 合同归档结果：{}", object1);
+                    try {
+                        JSONObject object = Auth4FDDUtil.extSignAuto(IdWorker.getIdStr(), signItem.getFadadaContractId(),
+                                signItem.getCaCustomerId(), "甲方签章", "0",
+                                signItem.getPartyASignFiled(), "", "", "");
+                        log.info(signItem.getFadadaContractId() + " 甲方签章结果：{}", object);
+                    } catch (Exception e) {
+                        if (!e.getMessage().contains("合同已归档")) {
+                            throw new RemoteServiceException(e.getMessage());
+                        }
+                    }
                 }
+
+                // 法大大合同归档
+                JSONObject object1 = Auth4FDDUtil.contractFiling(signItem.getFadadaContractId());
+                log.info(signItem.getFadadaContractId() + " 合同归档结果：{}", object1);
+
                 websitContractSignItemService.lambdaUpdate()
                         .set(WebsitContractSignItem::getContractStatus, SignContractStatusEnum.OK.getKey())
                         .set(WebsitContractSignItem::getConfirmBy, adminUser.getNickName())