修改bug

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -102,7 +102,7 @@ public class ControllerAop {
         urls.add("/hygf/unit-info/hasExistPhone/.*");
         urls.add("/hygf/unit-info/sendTelCode/.*");
         urls.add("/hygf/unit-info/verifyTelCode/.*/.*");
-
+        urls.add("/hygf/peasant-household/mobile/login");
 
 		// 获取请求路径
 		for (String uri : urls) {

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

@@ -219,8 +219,9 @@ public class HouseholdContractController extends BaseController {
         householdContract.setProjectAddressName(peasantHousehold.getProjectAddressName());
         householdContract.setPermanentAddressDetail(peasantHousehold.getPermanentAddressDetail());
         householdContract.setPermanentAddressName(peasantHousehold.getPermanentAddressName());
-        householdContract.setContractTemplateId(peasantHousehold.getContractTemplateId());
-        householdContractServiceImpl.reissueHouseholdContract(householdContract);
+        householdContractServiceImpl.addHouseholdContract(householdContract);
+
+        householdContractServiceImpl.reissueinitiateHouseholdContract(householdContract,householdContract.getSequenceNbr());
 
         return ResponseHelper.buildResponse(householdContract);
     }

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

@@ -131,7 +131,7 @@ public class PeasantHouseholdWxController extends BaseController {
             // 配置了测试用的userId 则覆盖扫码的userId
             mobileLoginParam.setUserId(defaultUserId);
         }
-        peasantHouseholdServiceImpl.setPlatFormAccess();
+        //peasantHouseholdServiceImpl.setPlatFormAccess();
         return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.wxUserLogin(mobileLoginParam));
     }
 

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

@@ -104,16 +104,16 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         householdContractMapper.insert(householdContract);
     }
 
-    public void reissueHouseholdContract(HouseholdContract householdContract){
-
-        householdContract.setContractNumber(this.getnum());//合同编号
-        householdContract.setSurveyStatus(HouseholdContractEnum.勘察状态_未勘察.getCode());
-        householdContract.setStatus(HouseholdContractEnum.合同状态_未签署.getCode());
-        householdContract.setSignStatus(HouseholdContractEnum.签字状态_未签字.getCode());
-        householdContract.setStampStatus(HouseholdContractEnum.盖章状态_未盖章.getCode());
-        householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());
-        householdContractMapper.insert(householdContract);
-    }
+//    public void reissueHouseholdContract(HouseholdContract householdContract){
+//
+//        householdContract.setContractNumber(this.getnum());//合同编号
+//        householdContract.setSurveyStatus(HouseholdContractEnum.勘察状态_未勘察.getCode());
+//        householdContract.setStatus(HouseholdContractEnum.合同状态_未签署.getCode());
+//        householdContract.setSignStatus(HouseholdContractEnum.签字状态_未签字.getCode());
+//        householdContract.setStampStatus(HouseholdContractEnum.盖章状态_未盖章.getCode());
+//        householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());
+//        householdContractMapper.insert(householdContract);
+//    }
 
 
     public String getnum() {
@@ -205,4 +205,82 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
 
 
 
+    public HouseholdContract reissueinitiateHouseholdContract(HouseholdContract model,Long sequenceNbr){
+
+
+
+        HouseholdContract householdContract=  householdContractMapper.selectById(sequenceNbr);
+        householdContract.setPartyA(model.getPartyA());
+        householdContract.setPartyB(model.getPartyB());
+        householdContract.setContractTemplateId(model.getContractTemplateId());
+        householdContract.setRentFree(model.getRentFree());
+        householdContract.setRentCalculationDate(model.getRentCalculationDate());
+        householdContract.setLeaseEndDate(model.getLeaseEndDate());
+        householdContract.setConstructionScale(model.getConstructionScale());
+        householdContract.setComponentQuantityBlock(model.getComponentQuantityBlock());
+        householdContract.setTotalInvestment(model.getTotalInvestment());
+        householdContract.setComponentPower(model.getComponentPower());
+        householdContract.setStationPower(model.getStationPower());
+        householdContract.setName(model.getName());
+        //调用第三方
+//      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
+        //签署结束时间默认一个月后
+//      LocalDateTime now = LocalDateTime.now();
+//      LocalDateTime afterOneMonth = now.plus(Period.ofMonths(1));
+        ContractDataDto contractDataDto =new ContractDataDto();
+        contractDataDto.setUsername(model.getPartyA());
+        contractDataDto.setContact(model.getPeasantHouseholdPhone());
+        contractDataDto.setIDCard(model.getPeasantHouseholdCard());
+        contractDataDto.setSubject(model.getName());
+//      contractDataDto.setEndTime(sdf.format(afterOneMonth));
+////    contractDataDto.setExpireTime(sdf.format(model.getLeaseEndDate()));
+
+        contractDataDto.setCategory(category);
+        contractDataDto.setCompanyTenantName(companyTenantName);
+        contractDataDto.setCompanyUsername(companyUsername);
+        contractDataDto.setCompanyContact(companyContact);
+        contractDataDto.setEmplateId(model.getContractTemplateId());
+
+
+        QueryWrapper<ContractTemplate> qu=new QueryWrapper();
+        qu.eq("template_id",model.getContractTemplateId());
+        ContractTemplate contractTemplate=contractTemplateMapper.selectOne(qu);
+
+
+        contractDataDto.setCompanykeyword(contractTemplate.getCompanyKeyword());
+        contractDataDto.setCompanyPage(contractTemplate.getCompanyPage());
+        contractDataDto.setCompanyOffsetX(contractTemplate.getCompanyOffsetx());
+        contractDataDto.setCompanyOffsetY(contractTemplate.getCompanyOffsety());
+        contractDataDto.setCompanyKeywordIndex(contractTemplate.getCompanyKeywordIndex());
+        contractDataDto.setPersonalkeyword(contractTemplate.getPersonalKeyword());
+        contractDataDto.setPersonalPage(contractTemplate.getPersonalPage());
+        contractDataDto.setPersonalOffsetX(contractTemplate.getPersonalOffsetx());
+        contractDataDto.setPersonalOffsetY(contractTemplate.getPersonalOffsety());
+        contractDataDto.setPersonalKeywordIndex(contractTemplate.getPersonalKeywordIndex());
+
+
+
+        List<TemplateParamDto> templateParam=new ArrayList<>();
+        SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
+        templateParam.add(new TemplateParamDto("partyA",householdContract.getPartyA()!=null?householdContract.getPartyA():null));
+        templateParam.add(new TemplateParamDto("peasantHouseholdPhone",householdContract.getPeasantHouseholdPhone()!=null?householdContract.getPeasantHouseholdPhone():null));
+        templateParam.add(new TemplateParamDto("rentFree",householdContract.getRentFree()!=null?sdfdate.format(householdContract.getRentFree()):null));
+        templateParam.add(new TemplateParamDto("rentCalculationDate",householdContract.getRentCalculationDate()!=null?sdfdate.format(householdContract.getRentCalculationDate()):null));
+        templateParam.add(new TemplateParamDto("leaseEndDate",householdContract.getLeaseEndDate()!=null?sdfdate.format(householdContract.getLeaseEndDate()):null));
+        templateParam.add(new TemplateParamDto("constructionScale",householdContract.getConstructionScale()!=null?String.valueOf(householdContract.getConstructionScale()):null));
+        templateParam.add(new TemplateParamDto("componentQuantityBlock",householdContract.getComponentQuantityBlock()!=null?String.valueOf(householdContract.getComponentQuantityBlock()):null));
+        templateParam.add(new TemplateParamDto("totalInvestment",householdContract.getTotalInvestment()!=null?String.valueOf(householdContract.getTotalInvestment()):null));
+        templateParam.add(new TemplateParamDto("peasantHouseholdCard",householdContract.getPeasantHouseholdCard()!=null?householdContract.getPeasantHouseholdCard():null));
+        templateParam.add(new TemplateParamDto("permanentAddressDetail",householdContract.getPermanentAddressName()!=null?householdContract.getPermanentAddressName()+householdContract.getPermanentAddressDetail():null));
+        templateParam.add(new TemplateParamDto("projectAddressDetail",householdContract.getProjectAddressName()!=null?householdContract.getProjectAddressName()+householdContract.getProjectAddressDetail():null));
+        templateParam.add(new TemplateParamDto("componentPower",householdContract.getComponentPower()!=null?String.valueOf(householdContract.getComponentPower()):null));
+        templateParam.add(new TemplateParamDto("stationPower",householdContract.getStationPower()!=null?String.valueOf(householdContract.getStationPower()):null));
+        Long  contractLockId=qiyuesuoServiceImpl.addContract(contractDataDto , templateParam);
+        householdContract.setContractLockId(contractLockId);
+        householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());
+        householdContractMapper.updateById(householdContract);
+        return householdContract;
+
+    }
+
 }
\ No newline at end of file

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

@@ -22,6 +22,7 @@ import com.yeejoin.amos.boot.module.hygf.api.service.IUnitInfoService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IWxService;
 import com.yeejoin.amos.boot.module.jxiop.api.util.HttpUtil;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.IdPasswordAuthModel;
@@ -140,6 +141,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
     @Autowired
     UnitInfoServiceImpl unitInfoServiceImpl;
+    @Autowired
+    AmosRequestContext requestContext;
+    public static final String SECRETKEY = "tzs";
 
     @Transactional (rollbackFor = Exception.class)
     public PeasantHouseholdDto savePeasantHousehold(PeasantHouseholdDto model) {
@@ -262,8 +266,13 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         }
         log.debug("getPhoneNo:{}", phoneNo);
         wxDTO.setPhoneNo(phoneNo);
+
+        RequestContext.setAppKey("AMOS_STUDIO");
+        RequestContext.setProduct("AMOS_STUDIO_WEB");
+        RequestContext.setToken(requestContext.getToken());
         // 在平台里注册过但是没有农户信息
         FeignClientResult<LoginInfoModel> loginInfo = Privilege.agencyUserClient.getLoginInfo(phoneNo);
+
         if (200 == loginInfo.getStatus()) {
             LoginInfoModel loginInfoModel = loginInfo.getResult();
             if (loginInfoModel == null || !StringUtils.isNotBlank(loginInfoModel.getLoginId())) {
@@ -316,7 +325,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         roleSeqMap.put(orgSequenceNbr, roleIds);
         orgRoles.put(orgSequenceNbr, userRoleList);
         //
-        String custPassword = com.yeejoin.precontrol.common.utils.DesUtil.encode(mobileLoginParamDto.getPhoneNo(), mobileLoginParamDto.getPhoneNo());
+        String custPassword = com.yeejoin.precontrol.common.utils.DesUtil.encode("ns"+mobileLoginParamDto.getPhoneNo(), SECRETKEY);
         AgencyUserModel agencyUserModel = new AgencyUserModel();
         agencyUserModel.setUserName(mobileLoginParamDto.getPhoneNo());
         agencyUserModel.setRealName(mobileLoginParamDto.getPhoneNo());