解决冲突

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

@@ -87,6 +87,9 @@ public class PeasantHouseholdWxController extends BaseController {
     @Autowired
     private IWxService wxService;
 
+    @Value("${dealer.userId}")
+    private String defaultUserId;
+
     @Value("${hygfProgram.loginPage:view/mine/minepage/LoginPhone}")
     private String miniprogramLoginPage;
 
@@ -120,8 +123,13 @@ 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为空");
+        if (StringUtils.isBlank(defaultUserId)) {
+            if (StringUtils.isBlank(mobileLoginParam.getUserId())) {
+                throw new BadRequest("二维码参数userId为空");
+            }
+        } else {
+            // 配置了测试用的userId 则覆盖扫码的userId
+            mobileLoginParam.setUserId(defaultUserId);
         }
         peasantHouseholdServiceImpl.setPlatFormAccess();
         return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.wxUserLogin(mobileLoginParam));
@@ -139,6 +147,7 @@ public class PeasantHouseholdWxController extends BaseController {
         AgencyUserModel userInfo = getUserInfo();
         model.setUserId(userInfo.getUserId());// 绑定平台userId
         model.setPeasantHouseholdNo(peasantHouseholdServiceImpl.getPeasantHouseholdNo());
+        model.setIsCertified(1);// 这里就实名认证
         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

@@ -272,7 +272,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
             }
         }
         // 判断是否注册过
-        List<PeasantHousehold> peasantHouseholds = this.query().eq("telephone", phoneNo).list();
+        List<PeasantHousehold> peasantHouseholds = this.query().eq("telephone", phoneNo).orderByDesc("rec_date").list();
         PeasantHousehold peasantHousehold = peasantHouseholds.size() > 0 ? peasantHouseholds.get(0) : null;
         // 没有注册过农户信息
         boolean isNotFound = false;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -141,4 +141,6 @@ farmer.orgNamesWithoutRole=
 farmer.roleId=1678211468450885633
 # 配置接口授权用户
 platform.access.loginId=hygf_platform
-platform.access.password=23F8A9AE5E9CF343B0AFD49A9C44947
+platform.access.password=AC286A35E74D2DD281EB979789DECF3A
\ No newline at end of file
+# 测试用的经销商userid
+dealer.userId=
\ No newline at end of file