Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java

@@ -221,7 +221,7 @@ public class HouseholdContractController extends BaseController {
         householdContract.setPermanentAddressName(peasantHousehold.getPermanentAddressName());
         householdContract.setProjectUserId(peasantHousehold.getProjectUserId());
         householdContract.setSurveyStatus(peasantHousehold.getSurveyStatus());
-        householdContractServiceImpl.addHouseholdContract(householdContract);
+        householdContractServiceImpl.reissueHouseholdContract(householdContract);
 
         householdContractServiceImpl.reissueinitiateHouseholdContract(peasantHousehold,householdContract.getSequenceNbr());
 
@@ -229,4 +229,11 @@ public class HouseholdContractController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getUrl/{contractLockId}")
+    @ApiOperation(httpMethod = "GET",value = "",  notes = "根据sequenceNbr查询单个")
+    public ResponseModel<String> getUrl(@PathVariable Long contractLockId) {
+        String url = qiyuesuoServiceImpl.getUrl(contractLockId);
+        return ResponseHelper.buildResponse(url);
+    }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HouseholdContractServiceImpl.java

@@ -98,7 +98,15 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_未发起.getCode());
         householdContractMapper.insert(householdContract);
     }
+    public void reissueHouseholdContract(HouseholdContract householdContract){
 
+        householdContract.setContractNumber(this.getnum());//合同编号
+        householdContract.setStatus(HouseholdContractEnum.合同状态_未签署.getCode());
+        householdContract.setSignStatus(HouseholdContractEnum.签字状态_未签字.getCode());
+        householdContract.setStampStatus(HouseholdContractEnum.盖章状态_未盖章.getCode());
+        householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_未发起.getCode());
+        householdContractMapper.insert(householdContract);
+    }
 
     public String getnum() {
         SimpleDateFormat format = new SimpleDateFormat("YYYYMMddHHmmssSSS");

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java

@@ -488,7 +488,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         }
         log.info("通过区域/个人二维码扫描组装信息, user => {}, user's companys => {}", userInfo.getUserId(), JSONObject.toJSONString(userInfo.getCompanys()));
         Long sequenceNbr = userInfo.getCompanys().get(0).getSequenceNbr();
-        Integer companyOrgCode = userInfo.getCompanys().get(0).getCompanyOrgCode();
+        String companyOrgCode = userInfo.getCompanys().get(0).getOrgCode();
         String companyName = userInfo.getCompanys().get(0).getCompanyName();
         // unitInfoServiceImpl.createCompanyAndUser 创建经销商的时候绑定的平台用户
         List<UnitInfo> unitInfos = unitInfoServiceImpl.list(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getAmosCompanySeq, sequenceNbr));
@@ -505,7 +505,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         // 先在后台创建一个角色和公司，微信农户新建的用户使用统一的
         // 用户光伏-微信农户
         // 非扫码进入注册页面，默认
-        dto.setDeveloperCode(companyOrgCode.toString());// 开发方code
+        dto.setDeveloperCode(companyOrgCode);// 开发方code
         dto.setDeveloperId(sequenceNbr);// 开发方id
         dto.setDeveloperName(companyName);// 开发方名称
         dto.setDeveloper(userInfo.getRealName());// 开发人

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/QiyuesuoServiceImpl.java

@@ -7,10 +7,7 @@ import com.qiyuesuo.sdk.v2.bean.vo.DocumentUrlVO;
 import com.qiyuesuo.sdk.v2.exception.BaseSdkException;
 import com.qiyuesuo.sdk.v2.json.JSONUtils;
 import com.qiyuesuo.sdk.v2.request.*;
-import com.qiyuesuo.sdk.v2.response.ContractDownloadUrlResult;
-import com.qiyuesuo.sdk.v2.response.DocumentAddResult;
-import com.qiyuesuo.sdk.v2.response.MiniappTicketResult;
-import com.qiyuesuo.sdk.v2.response.SdkResponse;
+import com.qiyuesuo.sdk.v2.response.*;
 import com.yeejoin.amos.boot.module.common.api.dto.ContractDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.ContractDataDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TemplateParamDto;
@@ -258,9 +255,19 @@ public class QiyuesuoServiceImpl {
     }
 
 
-
-
-
-
+    public  String getUrl(Long contractId ) {
+        String url=null;
+        SdkClient sdkClient = new SdkClient(serverUrl, accessKey, accessSecret);
+        ContractViewPageRequest request = new ContractViewPageRequest(contractId);
+        String response = sdkClient.service(request);
+        SdkResponse<ContractPageResult> responseObj = JSONUtils.toQysResponse(response, ContractPageResult.class);
+        if (responseObj.getCode() == 0) {
+            ContractPageResult result = responseObj.getResult();
+            url= result.getPageUrl();
+        } else {
+            logger.info("请求失败，错误码:{}，错误信息:{}", responseObj.getCode(), responseObj.getMessage());
+        }
+        return url;
+    }
 
 }