站点字段统一处理

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/dto/MemberAddDTO.java

@@ -33,6 +33,6 @@ public class MemberAddDTO implements Serializable {
     private Integer registerChannel;
 
     @ApiModelProperty("会员类型 1：海外门户 2:国内分销商门户")
-    private String memberType;
+    private String webSite;
 
 }

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/dto/MemberUpdateDTO.java

@@ -26,6 +26,6 @@ public class MemberUpdateDTO implements Serializable {
     private String memberTrueName;
 
     @ApiModelProperty("会员类型 1：海外门户 2:国内分销商门户")
-    private String memberType;
+    private String webSite;
 
 }

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/example/MemberExample.java

@@ -286,7 +286,7 @@ public class MemberExample implements Serializable {
     /**
      * 会员类型
      */
-    private String memberType;
+    private String webSite;
 
     /**
      * 会员公司

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/member/pojo/Member.java

@@ -146,7 +146,7 @@ public class Member implements Serializable {
     private String city;
 
     @ApiModelProperty("会员类型 1:海外门户 2:国内分销门户 ")
-    private String memberType;
+    private String webSite;
 
     /**
      * 获取账户余额

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/admin/MemberController.java

@@ -107,7 +107,7 @@ public class MemberController extends BaseController {
             @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query"),
-            @ApiImplicitParam(name = "memberType", value = "会员类型", defaultValue = "1", paramType = "query")
+            @ApiImplicitParam(name = "webSite", value = "会员类型", defaultValue = "1", paramType = "query")
     })
     @GetMapping("list")
     public JsonResult<PageVO<MemberVO>> getList(HttpServletRequest request,
@@ -116,7 +116,7 @@ public class MemberController extends BaseController {
                                                 @RequestParam(value = "state", required = false) Integer state,
                                                 @RequestParam(value = "startTime", required = false) Date startTime,
                                                 @RequestParam(value = "endTime", required = false) Date endTime,
-                                                @RequestParam(value = "memberType", required = false,defaultValue = "1") String memberType ) {
+                                                @RequestParam(value = "webSite", required = false,defaultValue = "1") String webSite ) {
         //分页设置
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
 
@@ -128,7 +128,7 @@ public class MemberController extends BaseController {
         example.setStateNotEquals(MemberConst.STATE_2);
         example.setRegisterTimeAfter(startTime);
         example.setRegisterTimeBefore(endTime);
-        example.setMemberType(memberType);
+        example.setWebSite(webSite);
         List<Member> list = memberModel.getMemberList(example, pager);
 
         //响应

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/front/advich/MemberEmailActiveController.java

@@ -160,30 +160,30 @@ public class MemberEmailActiveController extends BaseController {
      * @param email
      * @param source
      * @param type
-     * @param memberType
+     * @param webSite
      * @return
      */
     @PostMapping("/verification/code")
-    public JsonResult<Object> getMemberEmailVerificationCode(HttpServletRequest request, String email, Integer source, Integer type, @RequestParam(value = "memberType", required = false, defaultValue = "1") String memberType) {
-        log.info("getMemberEmailVerificationCode - email:{},source:{},type:{},memberType:{}", email, source, type, memberType);
+    public JsonResult<Object> getMemberEmailVerificationCode(HttpServletRequest request, String email, Integer source, Integer type, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
+        log.info("getMemberEmailVerificationCode - email:{},source:{},type:{},webSite:{}", email, source, type, webSite);
         if (StringUtil.isEmpty(email)) {
             return SldResponse.fail(Language.translate("邮件不能为空", Language.EN_LANGUAGE_TYPE));
         }
         AssertUtil.emailCheck(email);
 
         // 1. 判断是否在1分钟内已发送过验证码
-        String redisKey = RedisConst.SLD_PC_EMAIL_VERIFY_CODE_LIMIT + email + ":type::" + type + ":memberType::" + memberType;
+        String redisKey = RedisConst.SLD_PC_EMAIL_VERIFY_CODE_LIMIT + email + ":type::" + type + ":webSite::" + webSite;
         if (Boolean.TRUE.equals(stringRedisTemplate.hasKey(redisKey))) {
             return SldResponse.fail(Language.translate("请勿频繁操作，请1分钟后重试", Language.EN_LANGUAGE_TYPE));
         }
 
         int count;
         if (type == 1) {
-            count = memberRegisterActiveModel.sendRegisterUserEmailVerificationCode(email, source, memberType);
+            count = memberRegisterActiveModel.sendRegisterUserEmailVerificationCode(email, source, webSite);
             AssertUtil.isTrue((count == 0), Language.translate("验证码发送失败，请重试", Language.EN_LANGUAGE_TYPE));
             AssertUtil.isTrue((count == 2), Language.translate("该邮箱已注册，请登录", Language.EN_LANGUAGE_TYPE));
         } else {
-            count = memberRegisterActiveModel.checkMemberUserInfo(email, memberType);
+            count = memberRegisterActiveModel.checkMemberUserInfo(email, webSite);
             AssertUtil.isTrue((count == 0), Language.translate("验证码发送失败，请重试", Language.EN_LANGUAGE_TYPE));
             AssertUtil.isTrue((count == 2), Language.translate("该邮箱未激活，请先激活", Language.EN_LANGUAGE_TYPE));
             AssertUtil.isTrue((count == 3), Language.translate("该邮箱未注册，请先注册", Language.EN_LANGUAGE_TYPE));
@@ -202,12 +202,12 @@ public class MemberEmailActiveController extends BaseController {
      * @param email
      * @param type
      * @param verificationCode
-     * @param memberType
+     * @param webSite
      * @return
      */
     @PostMapping("/check/verification/code")
-    public JsonResult<Object> checkMemberEmailVerificationCode(HttpServletRequest request, String email, Integer type, String verificationCode, @RequestParam(value = "memberType", required = false, defaultValue = "1") String memberType) {
-        log.info("checkMemberEmailVerificationCode - email:{},type:{},verificationCode:{},memberType:{}", email, type, verificationCode, memberType);
+    public JsonResult<Object> checkMemberEmailVerificationCode(HttpServletRequest request, String email, Integer type, String verificationCode, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
+        log.info("checkMemberEmailVerificationCode - email:{},type:{},verificationCode:{},webSite:{}", email, type, verificationCode, webSite);
         if (StringUtil.isEmpty(email)) {
             return SldResponse.fail(Language.translate("邮件不能为空", Language.EN_LANGUAGE_TYPE));
         }
@@ -221,7 +221,7 @@ public class MemberEmailActiveController extends BaseController {
             return SldResponse.fail(Language.translate("验证码不能为空", Language.EN_LANGUAGE_TYPE));
         }
 
-        String redisKey = baseKey + email + ":memberType::" + memberType;
+        String redisKey = baseKey + email + ":webSite::" + webSite;
         if (!stringRedisTemplate.hasKey(redisKey)) {
             return SldResponse.fail(Language.translate("验证码已过期，请重新获取", Language.EN_LANGUAGE_TYPE));
         }
@@ -243,12 +243,12 @@ public class MemberEmailActiveController extends BaseController {
      * @param nickName
      * @param password
      * @param confirmPassword
-     * @param memberType
+     * @param webSite
      * @return
      */
     @PostMapping("/register")
-    public JsonResult<Object> activeMemberEmailInfo(HttpServletRequest request, String email, String nickName, String password, String confirmPassword, @RequestParam(value = "memberType", required = false, defaultValue = "1") String memberType) {
-        log.info("activeMemberEmailInfo - email:{},nickName:{},password:{},confirmPassword:{},memberType:{}", email, nickName, password, confirmPassword, memberType);
+    public JsonResult<Object> activeMemberEmailInfo(HttpServletRequest request, String email, String nickName, String password, String confirmPassword, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
+        log.info("activeMemberEmailInfo - email:{},nickName:{},password:{},confirmPassword:{},webSite:{}", email, nickName, password, confirmPassword, webSite);
         if (StringUtil.isEmpty(email)) {
             return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("邮件不能为空", Language.EN_LANGUAGE_TYPE));
         }
@@ -258,7 +258,7 @@ public class MemberEmailActiveController extends BaseController {
         AssertUtil.passwordCheck(password);
         MemberExample memberExample = new MemberExample();
         memberExample.setMemberEmail(email.toLowerCase());
-        memberExample.setMemberType(memberType);
+        memberExample.setWebSite(webSite);
         List<Member> memberList = memberReadMapper.listByExample(memberExample);
         if (CollectionUtils.isEmpty(memberList)) {
             return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("会员邮箱不存在，请重新注册", Language.EN_LANGUAGE_TYPE));
@@ -296,18 +296,18 @@ public class MemberEmailActiveController extends BaseController {
      * @param verificationCode
      * @param loginPwd
      * @param confirmPassWord
-     * @param memberType
+     * @param webSite
      * @return
      */
     @PostMapping("/email/reset/pwdNew")
-    public JsonResult<Object> emailResetPwdNew(HttpServletRequest request, String email, String verificationCode, String loginPwd, String confirmPassWord, @RequestParam(value = "memberType", required = false, defaultValue = "1") String memberType) {
-        log.info("emailResetPwd - email:{},verificationCode:{},loginPwd:{},confirmPassWord:{},memberType:{}", email, verificationCode, loginPwd, confirmPassWord, memberType);
+    public JsonResult<Object> emailResetPwdNew(HttpServletRequest request, String email, String verificationCode, String loginPwd, String confirmPassWord, @RequestParam(value = "webSite", required = false, defaultValue = "1") String webSite) {
+        log.info("emailResetPwd - email:{},verificationCode:{},loginPwd:{},confirmPassWord:{},webSite:{}", email, verificationCode, loginPwd, confirmPassWord, webSite);
         if (StringUtil.isEmpty(email)) {
             return SldResponse.fail(ResponseConst.STATE_FAIL, Language.translate("邮件不能为空", Language.EN_LANGUAGE_TYPE));
         }
         MemberExample memberExample = new MemberExample();
         memberExample.setMemberEmail(email.toLowerCase());
-        memberExample.setMemberType(memberType);
+        memberExample.setWebSite(webSite);
         List<Member> memberList = memberReadMapper.listByExample(memberExample);
 
         if (CollectionUtils.isEmpty(memberList)) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/seller/SellerApplyController.java

@@ -22,10 +22,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -62,7 +59,7 @@ public class SellerApplyController extends BaseController {
     @ApiOperation("保存入驻信息")
     @VendorLogger(option = "保存入驻信息")
     @PostMapping("saveApply")
-    public JsonResult<Object> saveApply(HttpServletRequest request, StoreApplyDTO storeApplyDTO) throws Exception {
+    public JsonResult<Object> saveApply(HttpServletRequest request, @RequestBody StoreApplyDTO storeApplyDTO) throws Exception {
         String logMsg = "店铺名称" + storeApplyDTO.getSiteInfoList().get(0).getStoreName();
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/sso/front/FrontAuthController.java

@@ -97,11 +97,11 @@ public class FrontAuthController {
             @ApiImplicitParam(name = "cartInfo", value = "离线购物车信息 如 [{\"productId\":1,\"buyNum\":1},{\"productId\":2,\"buyNum\":2}]", paramType = "query"),
             @ApiImplicitParam(name = "clientId", value = "客户端身份ID app传参", paramType = "query"),
             @ApiImplicitParam(name = "alias", value = "客户端身份别名 app传参", paramType = "query"),
-            @ApiImplicitParam(name = "memberType", value = "会员类型", paramType = "query")
+            @ApiImplicitParam(name = "webSite", value = "会员类型", paramType = "query")
     })
     @PostMapping("token")
     public JsonResult<Object> doLogin(HttpServletRequest request, @RequestParam(value = "loginType", required = false, defaultValue = "1") Integer loginType,
-                                      String username, String password, String cartInfo, String clientId, String alias, String refresh_token, Integer ssoType,@RequestParam(value = "memberType",required = false, defaultValue = "1") String memberType) {
+                                      String username, String password, String cartInfo, String clientId, String alias, String refresh_token, Integer ssoType,@RequestParam(value = "webSite",required = false, defaultValue = "1") String webSite) {
         Member member;
         if (!StringUtils.isEmpty(refresh_token)) {
             //校验token
@@ -113,12 +113,12 @@ public class FrontAuthController {
 //            memberExample.setMemberNameOrMemberMobile(username.replace(":", ""));
             // 改为邮箱账户验证登录
             memberExample.setMemberName(username);
-            memberExample.setMemberType(memberType);
+            memberExample.setWebSite(webSite);
             List<Member> memberList = memberModel.getMemberList(memberExample, null);
             if (loginType == 1) {
                 if (CollectionUtils.isEmpty(memberList)) {
                     // 检测gp系统用户是否存在
-                    GpUserInfoDto gpUserInfoDto = oneClickLoginModel.checkGpSystemUserIsExist(request, username, password, "PC",memberType);
+                    GpUserInfoDto gpUserInfoDto = oneClickLoginModel.checkGpSystemUserIsExist(request, username, password, "PC",webSite);
                     if (gpUserInfoDto == null) {
                         AssertUtil.notEmpty(memberList, Language.translate("用户不存在",Language.EN_LANGUAGE_TYPE));
                         AssertUtil.isTrue(!memberList.get(0).getLoginPwd().equals(Md5.getMd5String(password)), Language.translate("会员邮箱或密码错误",Language.EN_LANGUAGE_TYPE));
@@ -130,7 +130,7 @@ public class FrontAuthController {
                     if (ssoType != null && ssoType == 1) {
                         AssertUtil.isTrue(!memberList.get(0).getLoginPwd().equals(password), Language.translate("会员邮箱或密码错误",Language.EN_LANGUAGE_TYPE));
                     } else {
-                        oneClickLoginModel.checkGpSystemUserIsExist(request, username, password, "PC", memberType);
+                        oneClickLoginModel.checkGpSystemUserIsExist(request, username, password, "PC", webSite);
                         memberList = memberModel.getMemberList(memberExample, null);
                         AssertUtil.isTrue(!memberList.get(0).getLoginPwd().equals(Md5.getMd5String(password)), Language.translate("会员邮箱或密码错误",Language.EN_LANGUAGE_TYPE));
                     }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/system/seller/SellerTplPcController.java

@@ -79,7 +79,7 @@ public class SellerTplPcController extends BaseController {
     @ApiOperation("实例化模板列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tplId", value = "模板id", paramType = "query"),
-            @ApiImplicitParam(name = "webwebSite", value = "模板站点", paramType = "query"),
+            @ApiImplicitParam(name = "webSite", value = "模板站点", paramType = "query"),
             @ApiImplicitParam(name = "tplType", value = "模板类型,banner_except==除了主轮播之外的模板类型", paramType = "query"),
             @ApiImplicitParam(name = "name", value = "实例化模板名称", paramType = "query"),
             @ApiImplicitParam(name = "isEnable", value = "是否启用，0==不启用；1==启用", paramType = "query"),
@@ -88,14 +88,14 @@ public class SellerTplPcController extends BaseController {
             @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
     })
     @GetMapping("data/list")
-    public JsonResult<PageVO<TplPcMallDataVO>> getTplData(HttpServletRequest request, Integer tplId, String webwebSite, String tplType,
+    public JsonResult<PageVO<TplPcMallDataVO>> getTplData(HttpServletRequest request, Integer tplId, String webSite, String tplType,
                                                           String name, Integer isEnable, String tplName) {
         Vendor vendor = UserUtil.getUser(request, Vendor.class);
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         TplPcMallDataExample example = new TplPcMallDataExample();
         example.setStoreId(vendor.getStoreId());
         example.setTplPcId(tplId);
-        example.setWebSite(webwebSite);
+        example.setWebSite(webSite);
         if (!StringUtil.isEmpty(tplType)) {
             if ("banner_except".equals(tplType)) {
                 example.setTplPcTypeNotEquals("notNull");

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/dto/GpUserInfoDto.java

@@ -36,5 +36,5 @@ public class GpUserInfoDto {
 
     private String statusMsg;
 
-    private String memberType;
+    private String webSite;
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/member/MemberModel.java

@@ -87,7 +87,7 @@ public class MemberModel {
         //查重
         MemberExample example = new MemberExample();
         example.setMemberName(memberAddDTO.getMemberName());
-        example.setMemberType(memberAddDTO.getMemberType());
+        example.setWebSite(memberAddDTO.getWebSite());
         List<Member> list = memberReadMapper.listByExample(example);
         AssertUtil.isTrue(!CollectionUtils.isEmpty(list), "会员名称重复,请重新填写");
 
@@ -156,7 +156,7 @@ public class MemberModel {
         MemberExample example = new MemberExample();
         example.setMemberName(memberUpdateDTO.getMemberName());
         example.setMemberIdNotEquals(memberUpdateDTO.getMemberId());
-        example.setMemberType(memberUpdateDTO.getMemberType());
+        example.setWebSite(memberUpdateDTO.getWebSite());
         List<Member> list = memberReadMapper.listByExample(example);
         if (!CollectionUtils.isEmpty(list)) {
             throw new MallException("会员名称重复,请重新填写");

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/member/advich/MemberRegisterActiveModel.java

@@ -137,7 +137,7 @@ public class MemberRegisterActiveModel {
      * @param source
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveEmailUserInfo(String email, Integer source,String memberType) {
+    public void saveEmailUserInfo(String email, Integer source,String webSite) {
         Member member = new Member();
         member.setMemberName(email);
 //        member.setMemberName(GoodsIdGenerator.getMemberName());
@@ -150,7 +150,7 @@ public class MemberRegisterActiveModel {
         member.setRegisterChannel(source);
         member.setMemberEmail(email);
         member.setIsEmailActive(0);
-        member.setMemberType(memberType);
+        member.setWebSite(webSite);
         memberModel.saveMember(member);
     }
 
@@ -272,36 +272,36 @@ public class MemberRegisterActiveModel {
         msgSendModel.sendHtmlMail(email, subject, emailMsgTpl.toString());
     }
 
-    public Integer sendRegisterUserEmailVerificationCode(String email, Integer source,String memberType) {
+    public Integer sendRegisterUserEmailVerificationCode(String email, Integer source,String webSite) {
         int res = 0;
         MemberExample example = new MemberExample();
         example.setMemberEmail(email.toLowerCase());
-        example.setMemberType(memberType);
+        example.setwebSite(webSite);
         List<Member> memberList = memberReadMapper.listByExample(example);
         if (CollectionUtil.isNotEmpty(memberList)) {
             Member memberInfo = memberList.get(0);
             if (memberInfo.getIsEmailActive() == 0) {
-                sendEmailRegisterVerificationCode(email, memberType);
+                sendEmailRegisterVerificationCode(email, webSite);
                 res = 1;
             } else {
                 res = 2;
             }
         } else {
             res = 1;
-            sendEmailRegisterVerificationCode(email, memberType);
-            saveEmailUserInfo(email, source,memberType);
+            sendEmailRegisterVerificationCode(email, webSite);
+            saveEmailUserInfo(email, source,webSite);
         }
         return res;
     }
 
-    private void sendEmailRegisterVerificationCode(String email,String memberType) {
+    private void sendEmailRegisterVerificationCode(String email,String webSite) {
         String pcDomainUrl = DomainUrlUtil.SLD_PC_URL.replace("http://", "").replace("https://", "");
         String verifCode = "";
         //邮件验证码过期时间,单位秒
         long expireTime = RedisConst.REGISTER_USER_AND_FORGETPWD_USER_EMAIL_VERIFICATION_CODE_EXPIRE_TIME;
 
         //将随机数存在redis中
-        String activeEmailKey = RedisConst.SLD_PC_NEW_REGISTER_USER_EMAIL + email + ":memberType::" + memberType;
+        String activeEmailKey = RedisConst.SLD_PC_NEW_REGISTER_USER_EMAIL + email + ":webSite::" + webSite;
         verifCode = RandomUtil.randomNumber(4);
         stringRedisTemplate.opsForValue().set(activeEmailKey, verifCode, expireTime, TimeUnit.SECONDS);
 
@@ -314,16 +314,16 @@ public class MemberRegisterActiveModel {
         msgSendModel.sendHtmlMail(email, subject, emailMsgTpl.toString());
     }
 
-    public Integer checkMemberUserInfo(String email, String memberType) {
+    public Integer checkMemberUserInfo(String email, String webSite) {
         int res = 0;
         MemberExample memberExample = new MemberExample();
         memberExample.setMemberEmail(email);
-        memberExample.setMemberType(memberType);
+        memberExample.setwebSite(webSite);
         List<Member> memberList = memberReadMapper.listByExample(memberExample);
         if (CollectionUtil.isNotEmpty(memberList)) {
             Member memberInfo = memberList.get(0);
             if (memberInfo.getIsEmailActive() == 1) {
-                sendEmailForgetPasswordVerificationCode(email, memberInfo.getMemberNickName(),memberType);
+                sendEmailForgetPasswordVerificationCode(email, memberInfo.getMemberNickName(),webSite);
                 res = 1;
             } else {
                 res = 2;
@@ -334,14 +334,14 @@ public class MemberRegisterActiveModel {
         return res;
     }
 
-    private void sendEmailForgetPasswordVerificationCode(String email, String nickName,String memberType) {
+    private void sendEmailForgetPasswordVerificationCode(String email, String nickName,String webSite) {
         String pcDomainUrl = DomainUrlUtil.SLD_PC_URL.replace("http://", "").replace("https://", "");
         String verifCode = "";
         //重置密码验证码过期时间,单位秒
         long expireTime = RedisConst.REGISTER_USER_AND_FORGETPWD_USER_EMAIL_VERIFICATION_CODE_EXPIRE_TIME;
 
         //将随机数存在redis中
-        String forgetPwdEmailKey = RedisConst.SLD_PC_FORGET_PWD_USER_EMAIL + email + ":memberType::" + memberType;
+        String forgetPwdEmailKey = RedisConst.SLD_PC_FORGET_PWD_USER_EMAIL + email + ":webSite::" + webSite;
         verifCode = RandomUtil.randomNumber(4);
         stringRedisTemplate.opsForValue().set(forgetPwdEmailKey, verifCode, expireTime, TimeUnit.SECONDS);
 

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/member/advich/OneClickLoginModel.java

@@ -90,10 +90,10 @@ public class OneClickLoginModel {
      * @param username
      * @param password
      * @param source
-     * @param memberType
+     * @param webSite
      */
-    public GpUserInfoDto checkGpSystemUserIsExist(HttpServletRequest request, String username, String password, String source, String memberType) {
-        log.info("****** 开始链接绿道系统检测用户信息是否存在。username:{},password:{},source:{},memberType:{}, ******", username, password, source, memberType);
+    public GpUserInfoDto checkGpSystemUserIsExist(HttpServletRequest request, String username, String password, String source, String webSite) {
+        log.info("****** 开始链接绿道系统检测用户信息是否存在。username:{},password:{},source:{},webSite:{}, ******", username, password, source, webSite);
         GpUserInfoDto gpUserInfoDto = null;
         String gpUserUrl = DomainUrlUtil.GP_SYSTEM_USER_NAME_PASSWORD_CHECK_API_URL;
         if (!"200".equals(getApiUrlStatus(gpUserUrl))) {
@@ -105,7 +105,7 @@ public class OneClickLoginModel {
         modelMap.put("password", password);
         modelMap.put("source", source);
         if("PC".equals(source)){
-            modelMap.put("memberType", memberType);
+            modelMap.put("webSite", webSite);
         }
         String result = HttpUtil.post(gpUserUrl, modelMap);
         log.info("绿道系统返回信息：" + result);
@@ -115,7 +115,7 @@ public class OneClickLoginModel {
             gpUserInfoDto = JSONObject.parseObject(JSON.toJSONString(httpApiResult.getData()), GpUserInfoDto.class);
             gpUserInfoDto.setPassword(password);
             if("PC".equals(source)){
-                gpUserInfoDto.setMemberType(memberType);
+                gpUserInfoDto.setWebSite(webSite);
             }
             saveOrUpdatePcAndSellerUserInfo(request, source, gpUserInfoDto);
         }
@@ -136,7 +136,7 @@ public class OneClickLoginModel {
         member.setMemberMobile(gpUserInfoDto.getUserPhone());
         member.setMemberEmail(gpUserInfoDto.getUserEmail());
         member.setGpUid(gpUserInfoDto.getUserId());
-        member.setMemberType(gpUserInfoDto.getMemberType());
+        member.setWebSite(gpUserInfoDto.getWebSite());
 
         //查询会员信息
         MemberExample memberExample = new MemberExample();

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/member/MemberReadMapper.xml

@@ -46,7 +46,7 @@
         <result column="member_main_product" property="memberMainProduct" />
         <result column="country" property="country" />
         <result column="city" property="city" />
-        <result column="member_type" property="memberType" />
+        <result column="web_site" property="webSite" />
     </resultMap>
     <!--按照主键值进行操作-->
     <sql id="pkWhere">
@@ -206,8 +206,8 @@
                 <if test="example.gpToken != null">
                     AND `gp_token` = #{example.gpToken}
                 </if>
-                <if test="example.memberType != null">
-                    AND `member_type` = #{example.memberType}
+                <if test="example.webSite != null">
+                    AND `web_site` = #{example.webSite}
                 </if>
             </trim>
         </if>

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/member/MemberWriteMapper.xml

@@ -46,7 +46,7 @@
     <result column="member_main_product" property="memberMainProduct" />
     <result column="country" property="country" />
     <result column="city" property="city" />
-    <result column="member_type" property="memberType" />
+    <result column="web_site" property="webSite" />
   </resultMap>
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
@@ -180,8 +180,8 @@
       <if test="city != null">
         `city`,
       </if>
-      <if test="memberType != null">
-        `member_type`,
+      <if test="webSite != null">
+        `web_site`,
       </if>
     </trim>
   </sql>
@@ -349,8 +349,8 @@
         <if test="example.city != null">
             AND `city` = #{example.city}
         </if>
-        <if test="example.memberType != null">
-          AND `member_type` = #{example.memberType}
+        <if test="example.webSite != null">
+          AND `web_site` = #{example.webSite}
         </if>
       </trim>
     </if>
@@ -606,8 +606,8 @@
       <if test="city != null">
         #{city},
       </if>
-      <if test="memberType != null">
-        #{memberType},
+      <if test="webSite != null">
+        #{webSite},
       </if>
     </trim>
     )
@@ -745,8 +745,8 @@
       <if test="record.city != null">
           `city` = #{record.city},
       </if>
-      <if test="record.memberType != null">
-        member_type = #{record.memberType},
+      <if test="record.webSite != null">
+        web_site = #{record.webSite},
       </if>
     </trim>
     <include refid="whereCondition" />
@@ -884,8 +884,8 @@
       <if test="city != null">
         `city` = #{city},
       </if>
-      <if test="memberType != null">
-        `member_type` = #{memberType},
+      <if test="webSite != null">
+        `web_site` = #{webSite},
       </if>
     </trim>
     WHERE `member_id` = #{memberId}