Skip to content

A
amos-boot-biz
Commit 7b204e5a authored by 杨阳's avatar 杨阳
Browse files
Options

发货单

新增/编辑/详情接口 更新发货单状态接口
parent f721f5d2
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 24 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdWxController.java
View file @ 7b204e5a
......@@ -120,6 +120,9 @@ public class PeasantHouseholdWxController extends BaseController {
@RequestMapping (value = "/login", method = RequestMethod.POST)
@ApiOperation (httpMethod = "POST", value = "微信授权登陆", notes = "微信授权登陆")
public ResponseModel<PeasantHouseholdWxDto> wxUserLogin(@ApiParam @RequestBody MobileLoginParamDto mobileLoginParam) {
if (StringUtils.isBlank(mobileLoginParam.getUserId())) {
throw new BadRequest("二维码参数userId为空");
}
peasantHouseholdServiceImpl.setPlatFormAccess();
return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.wxUserLogin(mobileLoginParam));
}
......@@ -136,7 +139,6 @@ public class PeasantHouseholdWxController extends BaseController {
AgencyUserModel userInfo = getUserInfo();
model.setUserId(userInfo.getUserId());// 绑定平台userId
model.setPeasantHouseholdNo(peasantHouseholdServiceImpl.getPeasantHouseholdNo());
model.setIsCertified(0);// 未认证
model.setSurveyOrNot(0);
model.setReview(0);
JSONArray regionName = getRegionName();
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java
View file @ 7b204e5a
......@@ -255,23 +255,19 @@ 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";
if (phoneNo == null) {
throw new BadRequest("获取手机号失败!");
}
log.info("getPhoneNo:{}", phoneNo);
log.debug("getPhoneNo:{}", phoneNo);
wxDTO.setPhoneNo(phoneNo);
// 在平台里注册过但是没有农户信息
FeignClientResult<LoginInfoModel> loginInfo = Privilege.agencyUserClient.getLoginInfo(phoneNo);
if (200 == loginInfo.getStatus()) {
LoginInfoModel loginInfoModel = loginInfo.getResult();
if (loginInfoModel == null || !StringUtils.isNotBlank(loginInfoModel.getLoginId())) {
log.info("没有发现用户，开始注册:{}", phoneNo);
log.debug("没有发现用户，开始注册:{}", phoneNo);
doRegister(wxDTO);
}
}
......@@ -279,11 +275,18 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
List<PeasantHousehold> peasantHouseholds = this.query().eq("telephone", phoneNo).list();
PeasantHousehold peasantHousehold = peasantHouseholds.size() > 0 ? peasantHouseholds.get(0) : null;
// 没有注册过农户信息
boolean isNotFound = false;
if (null == peasantHousehold) {
peasantHousehold = new PeasantHousehold();
isNotFound = true;
}
PeasantHouseholdDto peasantHouseholdDto = buildDefaultPeasantHouseholdDto(wxDTO.getUserId(), wxDTO.getQrCodeType(), phoneNo);
BeanUtils.copyProperties(peasantHouseholdDto, peasantHousehold);
if (isNotFound) {
peasantHousehold.setIsCertified(0);
peasantHousehold.setSurveyOrNot(0);
peasantHousehold.setReview(0);
}
PeasantHouseholdWxDto loginResult = doLogin(wxDTO);
// 装载农户信息
loginResult.setPeasantHousehold(peasantHousehold);
......@@ -400,10 +403,24 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
return peasantHouseholdWxDto;
}
/**
* 通过区域/个人二维码扫描组装信息
*
* @param qrCodeType qrCodeType
* @param userInfo userInfo
* @return {@link PeasantHouseholdDto}
* @author Provence
* @throws
*/
public PeasantHouseholdDto buildDefaultPeasantHouseholdDto(String qrCodeType, AgencyUserModel userInfo) {
/*if (null == userInfo || null == userInfo.getCompanys()) {
throw new BadRequest("查询不到经销商信息");
if (null == userInfo) {
throw new BadRequest("查询不到平台用户信息");
}
if (CollectionUtils.isEmpty(userInfo.getCompanys())) {
throw new BadRequest("查询不到经销商单位信息");
}
log.info("buildDefaultPeasantHouseholdDto, user => {}", userInfo.getUserId());
log.info("buildDefaultPeasantHouseholdDto, user's companys => {}", JSONObject.toJSONString(userInfo.getCompanys()));
Long sequenceNbr = userInfo.getCompanys().get(0).getSequenceNbr();
Integer companyOrgCode = userInfo.getCompanys().get(0).getCompanyOrgCode();
String companyName = userInfo.getCompanys().get(0).getCompanyName();
......@@ -414,16 +431,17 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
log.warn("userId:{} 查询不到经销商信息", userInfo.getUserId());
throw new BadRequest("查询不到经销商信息");
}
unitInfo = unitInfos.get(0);
Long regionalCompaniesSeq = unitInfo.getRegionalCompaniesSeq();
String regionalCompaniesCode = unitInfo.getRegionalCompaniesCode();
String regionalCompaniesName = unitInfo.getRegionalCompaniesName();*/
String regionalCompaniesName = unitInfo.getRegionalCompaniesName();
// 先写假数据
Long sequenceNbr = Long.valueOf("1678209772383399937");
/*Long sequenceNbr = Long.valueOf("1678209772383399937");
Integer companyOrgCode = 86;
String companyName = "经销商测试单位01";
Long regionalCompaniesSeq = Long.valueOf("1678209772383399937");
String regionalCompaniesCode = "C2365";
String regionalCompaniesName = "经销商测试区域";
String regionalCompaniesName = "经销商测试区域";*/
PeasantHouseholdDto dto = new PeasantHouseholdDto();
/*dto.setPeasantHouseholdNo(this.getPeasantHouseholdNo());
dto.setIsCertified(0);// 未认证
......@@ -444,14 +462,11 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
private PeasantHouseholdDto buildDefaultPeasantHouseholdDto(String userId, String qrCodeType, String phoneNo) {
// 获取区域
/*FeignClientResult<AgencyUserModel> userInfoResult = Privilege.agencyUserClient.queryByUserId(userId);// 获取用户
if (userInfoResult.getStatus() != 200) {
throw new BadRequest("userId错误");
}*/
/* AgencyUserModel userInfo = userInfoResult.getResult();*/
AgencyUserModel userInfo = new AgencyUserModel();
userInfo.setUserId("5151508");
log.info("获取到的用户信息:{}", userInfo);
FeignClientResult<AgencyUserModel> userInfoResult = Privilege.agencyUserClient.queryByUserId(userId);// 获取用户
if (userInfoResult != null && userInfoResult.getStatus() != 200) {
throw new BadRequest("无效的userId");
}
AgencyUserModel userInfo = userInfoResult.getResult();
PeasantHouseholdDto dto = buildDefaultPeasantHouseholdDto(qrCodeType, userInfo);
dto.setTelephone(phoneNo);
return dto;
......@@ -506,13 +521,13 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
public void setPlatFormAccess() {
RequestContext.setProduct(product);
RequestContext.setAppKey(appKey);
IdPasswordAuthModel authModel = new IdPasswordAuthModel();
/*IdPasswordAuthModel authModel = new IdPasswordAuthModel();
authModel.setLoginId("admin_jxiop");
authModel.setPassword("AC286A35E74D2DD281EB979789DECF3A");
authModel.setPassword("AC286A35E74D2DD281EB979789DECF3A");*/
/* IdPasswordAuthModel authModel = new IdPasswordAuthModel();
IdPasswordAuthModel authModel = new IdPasswordAuthModel();
authModel.setLoginId(platfromAccessLoginId);
authModel.setPassword(platfromAccessPassword);*/
authModel.setPassword(platfromAccessPassword);
FeignClientResult<Map<String, String>> authResult = Privilege.authClient.idpassword(authModel);
String token = authResult.getResult().get("token");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment