Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-issuer

# Conflicts:
#	gly-base-core/src/main/java/cn/com/taiji/core/entity/user/AccountInfo.java

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/basic/AccountType.java

@@ -1,36 +0,0 @@
-package cn.com.taiji.core.entity.dict.basic;
-
-/**
- * @Author weicailin
- * @Date 2023/3/22 17:39
- * @Email 13079168756@163.com
- */
-public enum AccountType {
-    ENTERPRISE("企业会员", 2),
-    PERSONAL("个人会员", 1),
-    UNDEFINED("未知", 3),
-    ;
-    private final String value;
-    private final Integer code;
-
-    AccountType(String value, Integer code) {
-        this.value = value;
-        this.code = code;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public static AccountType fromCode(Integer code) {
-        AccountType[] values = AccountType.values();
-        for (AccountType value : values) {
-            if (value.code == code) return value;
-        }
-        return null;
-    }
-}

gly-base-core/src/main/java/cn/com/taiji/core/entity/invw/InvwRebackApply.java

@@ -71,8 +71,8 @@ public class InvwRebackApply extends StringPropertyUUIDEntity {
 	private InvApplyStatus applyStatus;//申请状态,新申请、确认回收、回收失败（取消入库）
 	@NotBlank
 	@Size(max = 32)
-	@Column(name = "REBACK__AGENCY_ID")
-	private String rebackagencyId;//发货渠道编号
+	@Column(name = "REBACK_AGENCY_ID")
+	private String rebackAgencyId;//发货渠道编号
 	@NotBlank
 	@Size(max = 32)
 	@Column(name = "RECEIVE_AGENCY_ID")

gly-base-core/src/main/java/cn/com/taiji/core/entity/user/AccountInfo.java

@@ -18,140 +18,58 @@ import java.time.LocalDateTime;
  * @Version
  * @Description
  */
-@Setter
 @Getter
+@Setter
 @Entity
 @Table(name = "USER_ACCOUNT_INFO")
 public class AccountInfo extends AbstractStringPropertyUUIDEntity {
-    /**
-     * 账号
-     */
-    @Column(name = "ACCOUNT")
-    private String account;
 
-    /**
-     * 登录密码
-     */
+    @Column(name = "ACCOUNT")
+    private String account;//账号
     @Column(name = "LOGIN_PASS")
-    private String loginPass;
-
-    /**
-     * 手机号
-     */
+    private String loginPass;// 登录密码
     @Column(name = "MOBILE")
-    private String mobile;
-    /**
-     * 应用id
-     */
+    private String mobile;// 手机号
     @Column(name = "APP_ID")
-    private String appId;
-    /**
-     * openId
-     */
+    private String appId;// 应用id
     @Column(name = "OPEN_ID")
-    private String openId;
-    /**
-     * 创建时间
-     */
+    private String openId;// openId
     @Column(name = "CREATE_TIME")
-    private LocalDateTime createTime;
-    /**
-     * 更新时间时间
-     */
+    private LocalDateTime createTime;// 创建时间
     @Column(name = "UPDATE_TIME")
-    private LocalDateTime updateTime;
-
-    /**
-     * 用户-证件号码
-     */
+    private LocalDateTime updateTime;// 更新时间
     @Column(name = "ID_NUM")
-    private String idNum;
-
-    /**
-     * 用户-证件类型
-     */
+    private String idNum;// 用户-证件号码
     @Enumerated(EnumType.STRING)
     @Column(name = "ID_TYPE")
-    private IdType idType;
-
-    /**
-     * 会员类型：原来是USER_TYPE
-     * 1、个人会员
-     * 2、企业会员
-     */
+    private IdType idType;// 用户-证件类型
     @Enumerated(EnumType.STRING)
-    @Column(name = "ACCOUNT_TYPE")
-    private AccountType accountType;
-
-    /**
-     * 登录方来源
-     */
+    @Column(name = "USER_TYPE")
+    private UserType accountType;// 会员类型：原来是USER_TYPE 1、个人会员 2、企业会员
     @Enumerated(EnumType.STRING)
     @Column(name = "LOGIN_SOURCE")
-    private SourceType loginSource;
-
-    /**
-     * 用户姓名/企业名称
-     */
+    private SourceType loginSource;// 登录方来源
     @Column(name = "USER_NAME")
-    private String userName;
-
-    /**
-     * 性别
-     */
+    private String userName;// 用户姓名/企业名称
     @Enumerated(EnumType.STRING)
     @Column(name = "GENDER")
-    private Gender gender;
-
-    /**
-     * 昵称
-     */
+    private Gender gender;// 性别
     @Column(name = "NICK_NAME")
-    private String nickName;
-
-    /***
-     * 用户注册在极光推送上的id
-     */
+    private String nickName;// 昵称
     @Column(name = "REGISTRATION_ID")
-    private String registrationId;
-
-    /***
-     * 用户在微信小程序的唯一身份标识openid
-     */
+    private String registrationId;// 用户注册在极光推送上的id
     @Column(name = "WX_OPENID")
-    private String wxOpenid;
-
-    /***
-     * 用户在微信公众号的唯一身份标识openid
-     */
+    private String wxOpenid;// 用户在微信小程序的唯一身份标识openid
     @Column(name = "MP_OPENID")
-    private String mpOpenid;
-
-    /***
-     * 用户在同一微信开发方平台的唯一身份标识unionId
-     */
+    private String mpOpenid;// 用户在微信公众号的唯一身份标识openid
     @Column(name = "WX_UNIONID")
-    private String wxUnionid;
-
-    /***
-     * 判断该用户是否需要立刻修改密码
-     * 0-不需要
-     * 1-需要
-     */
+    private String wxUnionid;// 用户在同一微信开发方平台的唯一身份标识unionId
     @Column(name = "NEED_CHANGE_PASSWORD_NOW")
-    private String needChangePasswordNow;
-    /**
-     * 支付宝openid
-     */
+    private String needChangePasswordNow;// 判断该用户是否需要立刻修改密码   0-不需要 1-需要
     @Column(name = "ZFB_OPEN_ID")
-    private String zfbOpenId;
-    /**
-     * 支付宝userid
-     */
+    private String zfbOpenId;// 支付宝openid
     @Column(name = "ZFB_USER_ID")
-    private String zfbUserId;
-
-
+    private String zfbUserId;// 支付宝userid
 
     public AccountInfo() {
     }

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/user/AccountInfoRepo.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.core.repo.jpa.user;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
-import cn.com.taiji.core.entity.dict.basic.AccountType;
+import cn.com.taiji.core.entity.dict.basic.UserType;
 import cn.com.taiji.core.entity.user.AccountInfo;
 import org.springframework.data.jpa.repository.Query;
 
@@ -9,11 +9,13 @@ import java.util.List;
 
 public interface AccountInfoRepo extends AbstractJpaRepo<AccountInfo, String> {
 
+    @Query("FROM AccountInfo WHERE account=?1")
+    AccountInfo findByAccount(String account);
 
     @Query("FROM AccountInfo WHERE openId=?1")
     AccountInfo findByOpenId(String openId);
 
-    AccountInfo findByIdNumAndAccountType(String idNum, AccountType accountType);
+    AccountInfo findByIdNumAndUserType(String idNum, UserType userType);
 
     @Query("FROM AccountInfo WHERE mobile=?1 ")
     List<AccountInfo> findAllByMobile(String mobile);