Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2

src/main/java/cn/quantgroup/xyqb/controller/external/user/AppController.java

@@ -13,6 +13,7 @@ import cn.quantgroup.xyqb.service.auth.IIdCardService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.service.user.ILkbUserService;
+import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.util.IPUtil;
 import cn.quantgroup.xyqb.util.PasswordUtil;
@@ -52,8 +53,11 @@ public class AppController implements IBaseController {
     private IUserRepository userRepository;
     @Autowired
     private ISmsService smsService;
+
     @Autowired
-    private IUserDetailRepository userDetailRepository;
+    private IUserDetailService userDetailService;
+    /*@Autowired
+    private IUserDetailRepository userDetailRepository;*/
     @Autowired
     private IIdCardService idCardService;
 
@@ -140,7 +144,7 @@ public class AppController implements IBaseController {
                 userDetail.setUpdatedAt(currentTime);
                 userDetail.setUserId(user.getId());
                 userDetail.setGender(cardInfo.getGender());
-                userDetailRepository.saveAndFlush(userDetail);
+                userDetailService.saveUserDetail(userDetail);
 
                 lkbUserService.userUpdate(user.getUuid(), name, idNo);
             } catch (Exception e) {

src/main/java/cn/quantgroup/xyqb/controller/external/user/SyncUserController.java

@@ -5,6 +5,7 @@ import cn.quantgroup.xyqb.entity.UserDetail;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.UserModel;
 import cn.quantgroup.xyqb.repository.IUserDetailRepository;
+import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +25,9 @@ public class SyncUserController {
     @Autowired
     private IUserService userService;
     @Autowired
-    private IUserDetailRepository userDetailRepository;
+    private IUserDetailService userDetailService;
+    /*@Autowired
+    private IUserDetailRepository userDetailRepository;*/
 
 
     @Autowired
@@ -43,7 +46,7 @@ public class SyncUserController {
         if (null == user) {
             return JsonResult.buildErrorStateResult(null, null);
         }
-        UserDetail detail = userDetailRepository.findByUserId(user.getId());
+        UserDetail detail = userDetailService.findByUserId(user.getId());
         if (null == detail) {
             // FIXME: 16/4/15 前期不对身份证强制要求.后期对修改
 //            return JsonResult.buildErrorStateResult(null, null);
@@ -64,7 +67,7 @@ public class SyncUserController {
         }
         userDetail.setId(null);
         userDetail.setUserId(user.getId());
-        userDetailRepository.saveAndFlush(userDetail);
+        userDetailService.saveUserDetail(userDetail);
         return JsonResult.buildSuccessResult(null, null);
     }
 
@@ -80,7 +83,7 @@ public class SyncUserController {
         if (null == user) {
             return JsonResult.buildErrorStateResult(null, null);
         }
-        UserDetail detail = userDetailRepository.findByUserId(user.getId());
+        UserDetail detail = userDetailService.findByUserId(user.getId());
         if (null == detail) {
             // FIXME: 16/4/15 前期不对身份证强制要求.后期对修改
 //            return JsonResult.buildErrorStateResult(null, null);

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -9,9 +9,9 @@ import cn.quantgroup.xyqb.model.AuthBean;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.UserModel;
 import cn.quantgroup.xyqb.model.session.SessionStruct;
-import cn.quantgroup.xyqb.repository.IUserDetailRepository;
 import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
+import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.util.PasswordUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
@@ -56,7 +56,10 @@ public class UserController implements IBaseController {
     private ISessionService sessionService;
 
     @Autowired
-    private IUserDetailRepository userDetailRepository;
+    private IUserDetailService userDetailService;
+
+    /*@Autowired
+    private IUserDetailRepository userDetailRepository;*/
 
     private static final char[] PWD_BASE = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
             'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
@@ -363,7 +366,8 @@ public class UserController implements IBaseController {
        if (null == user) {
            return JsonResult.buildErrorStateResult(null, null);
        }
-       UserDetail detail = userDetailRepository.findByUserId(user.getId());
+       UserDetail detail = userDetailService.findByUserId(user.getId());
+       //UserDetail detail = userDetailRepository.findByUserId(user.getId());
        UserModel userModel = new UserModel(user, detail);
        return JsonResult.buildSuccessResult("token校验成功", userModel);
     }

src/main/java/cn/quantgroup/xyqb/entity/Address.java

+package cn.quantgroup.xyqb.entity;
+
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+@Data
+@Entity
+@Table(name = "address", uniqueConstraints = @UniqueConstraint(columnNames = "user_id"))
+public class Address implements Serializable{
+
+    private static final long serialVersionUID = -1L;
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    @Column(name = "user_id")
+    private Long userId;
+    @Column(name = "province_code")
+    private Long provinceCode;
+    @Column(name = "province")
+    private String province;
+    @Column(name = "city_code")
+    private Long cityCode;
+    @Column(name = "city")
+    private String city;
+    @Column(name = "districtCode")
+    private Long district_code;
+    @Column(name = "district")
+    private String district;
+    @Column(name = "address")
+    private String address;
+    @Column(name = "created_at")
+    private Timestamp createdAt;
+    @Column(name = "update_at")
+    private Timestamp updateAt;
+}

src/main/java/cn/quantgroup/xyqb/entity/Contact.java

+package cn.quantgroup.xyqb.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+@Data
+@Entity
+@Table(name = "contact")
+public class Contact implements Serializable {
+    private static final long serialVersionUID = -1L;
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    @Column(name = "user_id")
+    private Long userId;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "phone_no")
+    private String phoneNo;
+    @Column(name = "relation")
+    private String relation;
+    @Column(name = "create_at")
+    private Timestamp createdAt;
+    @Column(name = "update_at")
+    private Timestamp updateAt;
+}

src/main/java/cn/quantgroup/xyqb/entity/Merchant.java

+package cn.quantgroup.xyqb.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+@Data
+@Entity
+@Table(name = "merchant")
+public class Merchant implements Serializable{
+
+    private static final long serialVersionUID = -1L;
+    @Id
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "enable")
+    private boolean enable;
+    @Column(name = "create_at")
+    private Timestamp createAt;
+    @Column(name = "update_at")
+    private Timestamp updateAt;
+}

src/main/java/cn/quantgroup/xyqb/entity/MerchantConfig.java

+package cn.quantgroup.xyqb.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+@Data
+@Entity
+@Table(name = "merchant_config")
+public class MerchantConfig implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+    @Id
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "merchant_id")
+    private Long merchantId;
+    @Column(name = "config_name")
+    private String configName;
+    @Column(name = "config_value")
+    private String configValue;
+    @Column(name = "created_at")
+    private Timestamp createdAt;
+    @Column(name = "updated_at")
+    private Timestamp updateAt;
+}

src/main/java/cn/quantgroup/xyqb/entity/UserExtInfo.java

+package cn.quantgroup.xyqb.entity;
+
+import cn.quantgroup.xyqb.entity.enumerate.EducationEnum;
+import cn.quantgroup.xyqb.entity.enumerate.IncomeEnum;
+import cn.quantgroup.xyqb.entity.enumerate.IncomeRangeEnum;
+import cn.quantgroup.xyqb.entity.enumerate.OccupationEnum;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+@Data
+@Entity
+@Table(name = "user_ext_info")
+public class UserExtInfo implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+    @Id
+    @Column(name = "id")
+    private Long id;
+    @Column(name = "user_id")
+    private Long userId;
+    @Column(name = "means_of_income_payment")
+    private IncomeEnum incomeEnum;
+    @Column(name = "monthly_income_range")
+    private IncomeRangeEnum incomeRangeEnum;
+    @Column(name = "occupation")
+    private OccupationEnum occupationEnum;
+    @Column(name = "education")
+    private EducationEnum educationEnum;
+    @Column(name = "has_car")
+    private boolean hasCar;
+    @Column(name = "has_social_security")
+    private boolean hasSocialSecurity;
+    @Column(name = "has_house")
+    private boolean hasHouse;
+    @Column(name = "has_credit_card")
+    private boolean hasCreditCard;
+    @Column(name = "marry_status")
+    private boolean marryStatus;
+    @Column(name = "created_at")
+    private Timestamp createdAt;
+    @Column(name = "update_at")
+    private Timestamp updateAt;
+
+}

src/main/java/cn/quantgroup/xyqb/entity/enumerate/EducationEnum.java

+package cn.quantgroup.xyqb.entity.enumerate;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public enum EducationEnum {
+}

src/main/java/cn/quantgroup/xyqb/entity/enumerate/IncomeEnum.java

+package cn.quantgroup.xyqb.entity.enumerate;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public enum IncomeEnum {
+    CASH("现金结算"), SALARY_CARD("工资卡"), MIXING("混合");
+    private String desc;
+
+    private IncomeEnum(String desc){
+        this.desc = desc;
+    }
+}
\ No newline at end of file

src/main/java/cn/quantgroup/xyqb/entity/enumerate/IncomeRangeEnum.java

+package cn.quantgroup.xyqb.entity.enumerate;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public enum IncomeRangeEnum {
+    EMPTY("暂无"),
+    LT_ONE_THOUSAND("小于1000元"),
+    BT_ONE_AND_THREE_THOUSAND("1000-3000元"),
+    BT_THREE_AND_FIVE_THOUSAND("3000-5000元"),
+    BT_FIVE_AND_EIGHT_THOUSAND("5000-8000元"),
+    BT_EIGHT_AND_TEN_THOUSAND("8000-10000元"),
+    BT_TEN_AND_FIFTEEN_THOUSAND("10000-15000元"),
+    BT_FIFTEEN_AND_TWENTY_THOUSAND("15000-20000元"),
+    ABOVE_TWENTY_THOUSAND("20000元以上");
+
+    private String desc;
+
+    private IncomeRangeEnum(String desc){
+        this.desc = desc;
+    }
+
+}

src/main/java/cn/quantgroup/xyqb/entity/enumerate/OccupationEnum.java

+package cn.quantgroup.xyqb.entity.enumerate;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public enum OccupationEnum {
+}

src/main/java/cn/quantgroup/xyqb/repository/IAddressRepository.java

+package cn.quantgroup.xyqb.repository;
+
+import cn.quantgroup.xyqb.entity.Address;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public interface IAddressRepository extends JpaRepository<Address, Long> {
+}

src/main/java/cn/quantgroup/xyqb/repository/IContactRepository.java

+package cn.quantgroup.xyqb.repository;
+
+import cn.quantgroup.xyqb.entity.Contact;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public interface IContactRepository extends JpaRepository<Contact, Long> {
+}

src/main/java/cn/quantgroup/xyqb/repository/IMerchantConfigRepository.java

+package cn.quantgroup.xyqb.repository;
+
+import cn.quantgroup.xyqb.entity.MerchantConfig;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public interface IMerchantConfigRepository extends JpaRepository<MerchantConfig, Long>{
+}

src/main/java/cn/quantgroup/xyqb/repository/IMerchantRepository.java

+package cn.quantgroup.xyqb.repository;
+
+import cn.quantgroup.xyqb.entity.Merchant;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public interface IMerchantRepository extends JpaRepository<Merchant, Long> {
+}

src/main/java/cn/quantgroup/xyqb/repository/IUserExtInfo.java

+package cn.quantgroup.xyqb.repository;
+
+import cn.quantgroup.xyqb.entity.UserExtInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Created by 11 on 2016/12/30.
+ */
+public interface IUserExtInfo extends JpaRepository<UserExtInfo, Long> {
+}