1. 登录方式更换成 平台的微信登录

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/MobileLoginParamDto.java

@@ -13,7 +13,7 @@ import lombok.Data;
 public class MobileLoginParamDto {
 
     @ApiModelProperty("用户userid")
-    private String userId;
+    private String amosUserId;
 
     @ApiModelProperty("二维码类型：region, personal")
     private String qrCodeType;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PeasantHouseholdDto.java

@@ -131,5 +131,5 @@ public class PeasantHouseholdDto  extends BaseDto {
     private Integer isCertified;
 
     @ApiModelProperty(value = "平台userId")
-    private String userId;
+    private String amosUserId;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PeasantHousehold.java

@@ -177,6 +177,6 @@ public class PeasantHousehold extends BaseEntity {
     /*
      * 平台userId
      * */
-    @TableField("user_id")
-    private String userId;
+    @TableField("amos_user_id")
+    private String amosUserId;
 }

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

@@ -106,12 +106,12 @@ public class PeasantHouseholdWxController extends BaseController {
     @ApiOperation (httpMethod = "POST", value = "微信授权登陆", notes = "微信授权登陆")
     public ResponseModel<PeasantHouseholdWxDto> wxUserLogin(@ApiParam @RequestBody MobileLoginParamDto mobileLoginParam) {
         if (StringUtils.isBlank(defaultUserId)) {
-            if (StringUtils.isBlank(mobileLoginParam.getUserId())) {
+            if (StringUtils.isBlank(mobileLoginParam.getAmosUserId())) {
                 throw new BadRequest("二维码参数userId为空");
             }
         } else {
             // 配置了测试用的userId 则覆盖扫码的userId
-            mobileLoginParam.setUserId(defaultUserId);
+            mobileLoginParam.setAmosUserId(defaultUserId);
         }
         //peasantHouseholdServiceImpl.setPlatFormAccess();
         return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.wxUserLogin(mobileLoginParam));
@@ -127,7 +127,7 @@ public class PeasantHouseholdWxController extends BaseController {
         }
         PeasantHouseholdDto model = mobileLoginParam.getPeasantHouseholdDto();
         AgencyUserModel userInfo = getUserInfo();
-        model.setUserId(userInfo.getUserId());// 绑定平台userId
+        model.setAmosUserId(userInfo.getUserId());// 绑定平台userId
         model.setPeasantHouseholdNo(peasantHouseholdServiceImpl.getPeasantHouseholdNo());
         model.setIsCertified(1);// 这里就实名认证
         model.setSurveyOrNot(0);

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

@@ -182,7 +182,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         householdContract.setProjectAddressName(peasantHousehold.getProjectAddressName());
         householdContract.setPermanentAddressDetail(peasantHousehold.getPermanentAddressDetail());
         householdContract.setPermanentAddressName(peasantHousehold.getPermanentAddressName());
-        householdContract.setUserId(peasantHousehold.getUserId());
+        householdContract.setUserId(peasantHousehold.getAmosUserId());
         householdContractServiceImpl.addHouseholdContract(householdContract);
 
         return peasantHousehold;
@@ -304,7 +304,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
             peasantHousehold.setSurveyOrNot(0);
             peasantHousehold.setReview(0);
             peasantHousehold.setTelephone(phoneNo);
-            PeasantHouseholdDto peasantHouseholdDto = buildDefaultPeasantHouseholdDto(wxDTO.getUserId(), wxDTO.getQrCodeType(), phoneNo);
+            PeasantHouseholdDto peasantHouseholdDto = buildDefaultPeasantHouseholdDto(wxDTO.getAmosUserId(), wxDTO.getQrCodeType(), phoneNo);
             peasantHousehold.setDeveloperCode(peasantHouseholdDto.getDeveloperCode());// 开发方code
             peasantHousehold.setDeveloperId(peasantHouseholdDto.getDeveloperId());// 开发方id
             peasantHousehold.setDeveloperName(peasantHouseholdDto.getDeveloperName());// 开发方名称