发货单

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

@@ -38,6 +38,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -254,6 +255,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     }
 
     public PeasantHouseholdWxDto wxUserLogin(MobileLoginParamDto wxDTO) {
+        /*if(StringUtils.isBlank(wxDTO.getUserId())) {
+            throw new BadRequest("");
+        }*/
         // 通过手机号和验证码调用平台接口进行验证
         String phoneNo = this.parsePhoneNo(wxDTO);
         //String phoneNo = "13022982292";
@@ -397,15 +401,29 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     }
 
     public PeasantHouseholdDto buildDefaultPeasantHouseholdDto(String qrCodeType, AgencyUserModel userInfo) {
+        /*if (null == userInfo || null == userInfo.getCompanys()) {
+            throw new BadRequest("查询不到经销商信息");
+        }
         Long sequenceNbr = userInfo.getCompanys().get(0).getSequenceNbr();
         Integer companyOrgCode = userInfo.getCompanys().get(0).getCompanyOrgCode();
         String companyName = userInfo.getCompanys().get(0).getCompanyName();
         // unitInfoServiceImpl.createCompanyAndUser 创建经销商的时候绑定的平台用户
         List<UnitInfo> unitInfos = unitInfoServiceImpl.list(new LambdaQueryWrapper<UnitInfo>().eq(UnitInfo::getAmosCompanySeq, sequenceNbr));
-        Long regionalCompaniesSeq = unitInfos.get(0).getRegionalCompaniesSeq();
-        String regionalCompaniesCode = unitInfos.get(0).getRegionalCompaniesCode();
-        String regionalCompaniesName = unitInfos.get(0).getRegionalCompaniesName();
-
+        UnitInfo unitInfo = null;
+        if (CollectionUtils.isEmpty(unitInfos)) {
+            log.warn("userId:{} 查询不到经销商信息", userInfo.getUserId());
+            throw new BadRequest("查询不到经销商信息");
+        }
+        Long regionalCompaniesSeq = unitInfo.getRegionalCompaniesSeq();
+        String regionalCompaniesCode = unitInfo.getRegionalCompaniesCode();
+        String regionalCompaniesName = unitInfo.getRegionalCompaniesName();*/
+        // 先写假数据
+        Long sequenceNbr = Long.valueOf("1678209772383399937");
+        Integer companyOrgCode = 86;
+        String companyName = "经销商测试单位01";
+        Long regionalCompaniesSeq = Long.valueOf("1678209772383399937");
+        String regionalCompaniesCode = "C2365";
+        String regionalCompaniesName = "经销商测试区域";
         PeasantHouseholdDto dto = new PeasantHouseholdDto();
         /*dto.setPeasantHouseholdNo(this.getPeasantHouseholdNo());
         dto.setIsCertified(0);// 未认证
@@ -426,11 +444,14 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
 
     private PeasantHouseholdDto buildDefaultPeasantHouseholdDto(String userId, String qrCodeType, String phoneNo) {
         // 获取区域
-        FeignClientResult<AgencyUserModel> userInfoResult = Privilege.agencyUserClient.queryByUserId(userId);// 获取用户
+        /*FeignClientResult<AgencyUserModel> userInfoResult = Privilege.agencyUserClient.queryByUserId(userId);// 获取用户
         if (userInfoResult.getStatus() != 200) {
             throw new BadRequest("userId错误");
-        }
-        AgencyUserModel userInfo = userInfoResult.getResult();
+        }*/
+       /* AgencyUserModel userInfo = userInfoResult.getResult();*/
+        AgencyUserModel userInfo = new AgencyUserModel();
+        userInfo.setUserId("5151508");
+        log.info("获取到的用户信息:{}", userInfo);
         PeasantHouseholdDto dto = buildDefaultPeasantHouseholdDto(qrCodeType, userInfo);
         dto.setTelephone(phoneNo);
         return dto;