小程序登录

coolstore-partner-model/src/main/java/com/cool/store/dto/wx/MiniProgramLoginDTO.java

@@ -13,12 +13,12 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class MiniProgramLoginDTO {
 
-    @NotBlank(message = "appid不能为空")
-    private String appid;
-
     @NotBlank(message = "jsCode不能为空")
     private String jsCode;
 
+    @NotBlank(message = "手机号code不能为空")
+    private String mobileCode;
+
     @NotBlank(message = "用户encryptedData不能为空")
     private String encryptedData;
 

coolstore-partner-model/src/main/java/com/cool/store/dto/wx/PhoneInfoDTO.java

@@ -0,0 +1,36 @@
+package com.cool.store.dto.wx;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+/**
+ * @author wxp
+ * @FileName: PhoneInfoDTO
+ * @Description:
+ * @date 2023-06-14 14:28
+ */
+@Data
+public class PhoneInfoDTO extends WXBaseResultDTO{
+
+    @JSONField(name = "phone_info")
+    private PhoneInfo phoneInfo;
+
+    @Data
+    public static class PhoneInfo{
+        /**
+         * 用户绑定的手机号（国外手机号会有区号）
+         */
+        private String phoneNumber;
+
+        /**
+         * 没有区号的手机号
+         */
+        private String purePhoneNumber;
+
+        /**
+         * 区号
+         */
+        private String countryCode;
+
+    }
+}

coolstore-partner-model/src/main/java/com/cool/store/request/MobileUpdateRequest.java

@@ -0,0 +1,23 @@
+package com.cool.store.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author wxp
+ * @Date 2023/5/31 11:01
+ * @Version 1.0
+ */
+@Data
+@ApiModel
+public class MobileUpdateRequest {
+
+
+    @NotBlank(message = "手机号code不能为空")
+    @ApiModelProperty("手机号code")
+    private String mobileCode;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java

@@ -3,6 +3,9 @@ package com.cool.store.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Objects;
 
 /**
  * @Author suzhuhong
@@ -16,6 +19,9 @@ public class PartnerUserInfoVO {
     @ApiModelProperty("ID")
     private Long id;
 
+    @ApiModelProperty("hy_partner_user_info.partner_id")
+    private String partnerId;
+
     @ApiModelProperty("手机号")
     private String mobile;
 
@@ -37,4 +43,22 @@ public class PartnerUserInfoVO {
     @ApiModelProperty("邀请码")
     private String inviteCode;
 
+    @ApiModelProperty("openid")
+    private String openid;
+
+    @ApiModelProperty("unionid")
+    private String unionId;
+
+    @ApiModelProperty("是否需要提交意向信息")
+    private Boolean isNeedSubmitWantInfo;
+
+    public Boolean getNeedSubmitWantInfo() {
+        if(StringUtils.isBlank(username)
+                || StringUtils.isBlank(mobile)
+                || StringUtils.isBlank(liveArea)
+                || StringUtils.isBlank(wantShopArea)){
+            return true;
+        }
+        return false;
+    }
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/wx/CodeSessionVO.java

@@ -1,5 +1,6 @@
 package com.cool.store.vo.wx;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -15,4 +16,8 @@ public class CodeSessionVO {
     private String openid;
 
     private String unionId;
+
+    private String partnerId;
+
+    private String mobile;
 }