Merge branch 'dev-0618' into 'release'

Dev 0618

See merge request !72

common/src/main/java/com/pica/cloud/account/account/common/req/circle/DiyAcctInit.java

@@ -2,9 +2,13 @@ package com.pica.cloud.account.account.common.req.circle;
 
 public class DiyAcctInit {
 
-    private String userName;
+    private String userName; //真实姓名
 
-    private String decryMobile;
+    private String decryMobile; //明文手机
+
+    private String card; //明文 身份证
+
+    private String nativePlace; //身份证地址 可以为空
 
     public String getUserName() {
         return userName;
@@ -21,4 +25,20 @@ public class DiyAcctInit {
     public void setDecryMobile(String decryMobile) {
         this.decryMobile = decryMobile;
     }
+
+    public String getCard() {
+        return card;
+    }
+
+    public void setCard(String card) {
+        this.card = card;
+    }
+
+    public String getNativePlace() {
+        return nativePlace;
+    }
+
+    public void setNativePlace(String nativePlace) {
+        this.nativePlace = nativePlace;
+    }
 }

common/src/main/java/com/pica/cloud/account/account/common/req/circle/DiyAcctInitReq.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 public class DiyAcctInitReq {
 
+    private String code;
+
     private List<String> decryMobileList;
 
     private List<DiyAcctInit> diyAcctInitList;
@@ -23,4 +25,12 @@ public class DiyAcctInitReq {
     public void setDecryMobileList(List<String> decryMobileList) {
         this.decryMobileList = decryMobileList;
     }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
 }

server/src/main/java/com/pica/cloud/account/account/server/controller/CircleUserController.java

@@ -42,4 +42,10 @@ public class CircleUserController {
         return PicaResponse.toResponse(circleAccountService.createDiyAccount(diyAcctInitReq));
     }
 
+    @PostMapping("/acct/registerAndCertify")
+    @EnabledLoginValidate
+    public PicaResponse<List<Integer>> registerAndCertify(@RequestBody DiyAcctInitReq diyAcctInitReq) {
+        return PicaResponse.toResponse(circleAccountService.registerAndCertify(diyAcctInitReq));
+    }
+
 }

server/src/main/java/com/pica/cloud/account/account/server/entity/Account.java

@@ -24,6 +24,12 @@ public class Account {
     @ApiModelProperty("认证状态 1未认证，2认证中，3认证通过，4认证不通过,5验证码认证,6 重新认证中，7 重新认证失败")
     private Integer status;
 
+    private Integer certifyStatus;
+
+    private String nation;
+
+    private String nativePlace;
+
     private String avatarImageUrl;
 
     private String email;
@@ -69,6 +75,30 @@ public class Account {
 
     private Date birthday;
 
+    public String getNativePlace() {
+        return nativePlace;
+    }
+
+    public void setNativePlace(String nativePlace) {
+        this.nativePlace = nativePlace;
+    }
+
+    public String getNation() {
+        return nation;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
+    public Integer getCertifyStatus() {
+        return certifyStatus;
+    }
+
+    public void setCertifyStatus(Integer certifyStatus) {
+        this.certifyStatus = certifyStatus;
+    }
+
     public Long getId() {
         return id;
     }

server/src/main/java/com/pica/cloud/account/account/server/mapper/AccountMapper.java

@@ -27,6 +27,8 @@ public interface AccountMapper {
     //根据手机号获取账号
     Account getByMobilePhone(@Param("mobilePhone") String mobilePhone);
 
+    Account getByCard(@Param("card") String card);
+
     //根据微信unionid获取账号
     Account getByUnionid(@Param("unionid") String unionid);
 

server/src/main/java/com/pica/cloud/account/account/server/service/CircleAccountService.java

@@ -24,4 +24,7 @@ public interface CircleAccountService {
 
     Map<String,Integer> createShopAccount(ShopAcctInitReq shopAcctInitReq);
 
+    // 注册 并且 实名认证用户，临时接口 todo
+    List<Integer> registerAndCertify(DiyAcctInitReq diyAcctInitReq);
+
 }

server/src/main/java/com/pica/cloud/account/account/server/util/AESUtil.java

@@ -188,6 +188,8 @@ public class AESUtil {
     public static void main(String[] args) throws Exception {
 
 
+//        String content = AESUtil.aesDecrypt(encryptEntity.getContent(),decryptKey);
+
 
         String KEY="111";
         System.out.println("-------------加密---------");

server/src/main/resources/mybatis/AccountMapper.xml

@@ -9,6 +9,8 @@
     <result column="mobile_phone" jdbcType="VARCHAR" property="mobilePhone" />
     <result column="acct_id" jdbcType="INTEGER" property="acctId" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="certify_status" jdbcType="INTEGER" property="certifyStatus" />
+    <result column="nation" jdbcType="VARCHAR" property="nation" />
     <result column="avatar_image_url" jdbcType="VARCHAR" property="avatarImageUrl" />
     <result column="email" jdbcType="VARCHAR" property="email" />
     <result column="qrcode" jdbcType="VARCHAR" property="qrcode" />
@@ -34,7 +36,7 @@
   </resultMap>
 
   <sql id="Base_Column_List">
-    id, sex, name, mobile_phone, status, avatar_image_url, email, qrcode, nickname, personal_sign, delete_flag,
+    id, sex, name, mobile_phone, status, certify_status, nation, avatar_image_url, email, qrcode, nickname, personal_sign, delete_flag,
     creat_id, creat_time, modify_id, modify_time, password, info, entire_flag, reg_time, last_login_time,
     unionid, register_source, comment, register_type, first_login_time, card, birthday
   </sql>
@@ -213,6 +215,18 @@
   <update id="updateByIdSelective" parameterType="com.pica.cloud.account.account.server.entity.Account">
     update p_doctor
     <set>
+      <if test="status != null">
+        status = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="certifyStatus != null">
+        certify_status = #{certifyStatus,jdbcType=INTEGER},
+      </if>
+      <if test="nation != null">
+        nation = #{nation,jdbcType=VARCHAR},
+      </if>
+      <if test="nativePlace != null">
+        native_place = #{nativePlace,jdbcType=VARCHAR},
+      </if>
       <if test="sex != null">
         sex = #{sex,jdbcType=INTEGER},
       </if>
@@ -307,6 +321,14 @@
     limit 1
   </select>
 
+  <select id="getByCard" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from p_doctor
+    where card = #{card} and delete_flag = 1
+    limit 1
+  </select>
+
   <select id="getHospitalInfoByPage" resultType="map">
     select id, hospital_id, hospital,mobile_phone,name,
     status, avatar_image_url, email,