打印日志

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

@@ -11,6 +11,8 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServi
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.SurveyInformationServiceImpl;
 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.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
@@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -41,6 +44,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * 农户信息
@@ -75,6 +79,9 @@ public class PeasantHouseholdWxController extends BaseController {
     @Value("${hygfProgram.loginPage:view/mine/minepage/LoginPhone}")
     private String miniprogramLoginPage;
 
+    @Autowired
+    private AmosRequestContext requestContext;
+
     private static final String regionRedis = "app_region_redis";
 
     /*@TycloudOperation (ApiLevel = UserType.AGENCY, needAuth = false)
@@ -110,20 +117,29 @@ public class PeasantHouseholdWxController extends BaseController {
             // 扫码的userId为空, 则取默认值
             mobileLoginParam.setAmosUserId(defaultUserId);
         }
-        //peasantHouseholdServiceImpl.setPlatFormAccess();
         return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.wxUserLogin(mobileLoginParam));
     }
 
     @TycloudOperation (ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping (value = "/register", method = RequestMethod.POST)
     @ApiOperation (httpMethod = "POST", value = "微信农户注册", notes = "微信农户注册")
-    public ResponseModel<PeasantHouseholdDto> wxUserRegister(@Validated @ApiParam @RequestBody MobileLoginParamDto mobileLoginParam) {
+    public ResponseModel<PeasantHouseholdDto> wxUserRegister(@ApiParam @RequestBody MobileLoginParamDto mobileLoginParam) {
         log.info("微信农户注册, 入参 => {}", mobileLoginParam);
-        if (null == mobileLoginParam.getPeasantHouseholdDto()) {
-            throw new BadRequest("农户信息不能为空");
-        }
         PeasantHouseholdDto model = mobileLoginParam.getPeasantHouseholdDto();
+        validatedPeasantHouseholdDto(model);
         AgencyUserModel userInfo = getUserInfo();
+
+        // 更新平台农户的真实姓名
+        CompletableFuture.supplyAsync(() -> {
+            // 机器人token
+            RequestContext.setAppKey("AMOS_STUDIO");
+            RequestContext.setProduct("AMOS_STUDIO_WEB");
+            RequestContext.setToken(requestContext.getToken());
+            userInfo.setRealName(model.getOwnersName());
+            Privilege.agencyUserClient.update(userInfo, userInfo.getUserId());
+            return null;
+        });
+
         model.setAmosUserId(userInfo.getUserId());// 绑定平台userId
         model.setPeasantHouseholdNo(peasantHouseholdServiceImpl.getPeasantHouseholdNo());
         model.setIsCertified(1);// 这里就实名认证
@@ -159,7 +175,8 @@ public class PeasantHouseholdWxController extends BaseController {
                 }
             }
         }
-        return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.savePeasantHousehold(model));
+        PeasantHouseholdDto result = peasantHouseholdServiceImpl.savePeasantHousehold(model);
+        return ResponseHelper.buildResponse(result);
     }
 
     public JSONArray getRegionName() {
@@ -220,17 +237,34 @@ public class PeasantHouseholdWxController extends BaseController {
 
     }
 
-    @GetMapping("/getPersonalQrCode")
-    @ApiOperation (httpMethod = "GET", value = " 获取个人经销商二维码", notes = " 获取个人经销商二维码")
-    public void getPersonalQrCode(
-            @RequestParam (value = "fileType", required = false, defaultValue = "png") String fileType,
-            @RequestParam (value = "width", required = false, defaultValue = "350") String width,
-            HttpServletResponse response) {
-        AgencyUserModel userInfo = getUserInfo();
-        String accessToken = wxService.getAccessToken();
-        String page = "view/mine/minepage/Login" + "?amosUserId=" + userInfo.getUserId() + "&qrCodeType=personal";
-        wxService.getSmallProQrCodeResponse(accessToken, null, page, Long.valueOf(width), null, null, null, response,
-                page, fileType);
+    private void validatedPeasantHouseholdDto(PeasantHouseholdDto model) {
+        if (null == model) {
+            throw new BadRequest("农户信息不能为空");
+        }
+        if (StringUtils.isBlank(model.getOwnersName())) {
+            throw new BadRequest("姓名不能为空");
+        }
+        if (StringUtils.isBlank(model.getDeveloper())) {
+            throw new BadRequest("开发人不能为空");
+        }
+        if (StringUtils.isBlank(model.getDeveloperCode())) {
+            throw new BadRequest("开发方code不能为空");
+        }
+        if (StringUtils.isBlank(model.getDeveloperName())) {
+            throw new BadRequest("开发方名称不能为空");
+        }
+        if (null == model.getDeveloperId()) {
+            throw new BadRequest("开发方平台id不能为空");
+        }
+        if (null == model.getRegionalCompaniesSeq()) {
+            throw new BadRequest("区域公司id不能为空");
+        }
+        if (StringUtils.isBlank(model.getRegionalCompaniesCode())) {
+            throw new BadRequest("区域公司code不能为空");
+        }
+        if (StringUtils.isBlank(model.getRegionalCompaniesName())) {
+            throw new BadRequest("区域公司名称不能为空");
+        }
     }
 
 }

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

@@ -164,8 +164,17 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         model.setPeasantHouseholdNo(this.getPeasantHouseholdNo());
         model.setIsCertified(model.getIsCertified() == null ? 0 : model.getIsCertified());// 未认证
 
+        if (model.getSequenceNbr() == null) {
+            List<PeasantHousehold> peasantHouseholds = this.query().eq("telephone", model.getTelephone()).orderByDesc("rec_date").list();
+            PeasantHousehold phd = peasantHouseholds.size() > 0 ? peasantHouseholds.get(0) : null;
+            if (phd != null) {
+                model.setSequenceNbr(phd.getSequenceNbr());
+            }
+        }
 
-        PeasantHouseholdDto peasantHousehold= this.createWithModel(model);
+        PeasantHousehold peasantHousehold = new PeasantHousehold();
+        BeanUtils.copyProperties(model, peasantHousehold);
+        this.saveOrUpdate(peasantHousehold);
         //生成合同
         HouseholdContract householdContract=new HouseholdContract();
         householdContract.setPartyA(peasantHousehold.getOwnersName());
@@ -186,7 +195,8 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         householdContract.setProjectUserId(peasantHousehold.getAmosUserId());
         householdContractServiceImpl.addHouseholdContract(householdContract);
 
-        return peasantHousehold;
+
+        return model;
     }
 
     public boolean deletePeasantHouseholdBySequenceNbr(Long sequenceNbr){
@@ -264,9 +274,11 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         return this.updateById(peasantHousehold);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public PeasantHouseholdWxDto wxUserLogin(MobileLoginParamDto wxDTO) {
         // 通过手机号和验证码调用平台接口进行验证
         String phoneNo = this.parsePhoneNo(wxDTO);
+        // String phoneNo = "13641746112";
         if (phoneNo == null) {
             throw new BadRequest("获取手机号失败!");
         }
@@ -312,7 +324,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
             peasantHousehold.setRegionalCompaniesSeq(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getRegionalCompaniesSeq).orElse(null));
             peasantHousehold.setRegionalCompaniesCode(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getRegionalCompaniesCode).orElse(""));
             peasantHousehold.setRegionalCompaniesName(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getRegionalCompaniesName).orElse(""));
+            peasantHousehold.setIsCertified(0);
             // 过滤传给前端的数据
+            this.save(peasantHousehold);
         }
         log.debug("返回给前端数据, 手机号码 => {}, 农户信息 => {}", phoneNo, peasantHousehold);
         // 装载农户信息
@@ -419,41 +433,12 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         peasantHouseholdWxDto.setExpire(Long.valueOf((String) resultMap.get("expire")));
         peasantHouseholdWxDto.setUserId(userId);
         // 判断用户是否刚刚注册过
-        AgencyUserModel userModel;
-        /*if (registerUserModel != null) {
-            // 使用注册接口返回的用户信息
-            userModel = registerUserModel;
-        } else {
-            // 查询用户信息
-            FeignClientResult<AgencyUserModel> getme = Privilege.agencyUserClient.queryByUserId(userId);
-            *//*FeignClientResult<AgencyUserModel> getme = Privilege.agencyUserClient.getme();*//*
-            if (null == getme || getme.getStatus() != 200) {
-                throw new BadRequest("获取用户信息失败");
-            }
-            userModel = (AgencyUserModel) getme.getResult();
-        }*/
-        FeignClientResult<AgencyUserModel> getme = Privilege.agencyUserClient.queryByUserId(userId);
-        if (null == getme || getme.getStatus() != 200) {
-            throw new BadRequest("获取用户信息失败");
-        }
-        userModel = (AgencyUserModel) getme.getResult();
-        // 组装userInfo数据
-        Map<String, Object> userInfo = new HashMap<>();
-        userInfo.put("realName", userModel.getRealName());
-        userInfo.put("mobile", userModel.getMobile());
-        userInfo.put("orgNames", userModel.getOrgNames());
-        userInfo.put("orgNamesWithoutRole", userModel.getOrgNamesWithoutRole());
-        // userInfo.put("phoneNo", phoneNo);
-        // userInfo.put("companyId", userModel.getCompanys().get(0).getCompanyOrgCode());
-        //
-        // userInfo.put("userModel", userModel);
-        peasantHouseholdWxDto.setUserInfo(userInfo);
         // 组装authInfo数据
         Map<String, Object> authInfo = new HashMap<>();
         authInfo.put("token", resultMap.get("token"));
         authInfo.put("personId", resultMap.get("userId"));
-        authInfo.put("appKey", "STUDIO_APP_MOBILE");
-        authInfo.put("product", "studio_normalapp_5133538");
+        /*authInfo.put("appKey", "STUDIO_APP_MOBILE");
+        authInfo.put("product", "studio_normalapp_5133538");*/
         peasantHouseholdWxDto.setAuthInfo(authInfo);
 
         return peasantHouseholdWxDto;