Browse Source

Merge branch 'test' of https://git.coding.net/aft/AFT.git into test

anderx 8 years ago
parent
commit
4b9d4e6136

+ 38 - 23
src/main/java/com/goafanti/common/mapper/UserIdentityMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
@@ -47,12 +47,13 @@
     <result column="investment" jdbcType="INTEGER" property="investment" />
     <result column="graduate_school" jdbcType="VARCHAR" property="graduateSchool" />
     <result column="consultant" jdbcType="INTEGER" property="consultant" />
+    <result column="consultation_price" jdbcType="DECIMAL" property="consultationPrice" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -86,7 +87,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -120,20 +121,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     id, uid, username, sex, date_of_birth_year, date_of_birth_month, id_number, positive_id_url, 
     opposite_id_url, province, city, area, contact_mobile, bank_name, bank_account, bank_card_number, 
     amount_money, audit_status, process, wrong_count, payment_date, expert, celebrity, 
     international, fixed_tel, qq, postal_address, postcode, review_instructions, industry, 
     contacts, email, professional_title, work_unit, education, major_category, qualification, 
-    investment, graduate_school, consultant
+    investment, graduate_school, consultant, consultation_price
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.UserIdentityExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     select
     <if test="distinct">
@@ -152,7 +153,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -163,7 +164,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     delete from user_identity
     where id = #{id,jdbcType=VARCHAR}
@@ -172,7 +173,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     delete from user_identity
     <if test="_parameter != null">
@@ -183,7 +184,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     insert into user_identity (id, uid, username, 
       sex, date_of_birth_year, date_of_birth_month, 
@@ -198,7 +199,7 @@
       contacts, email, professional_title, 
       work_unit, education, major_category, 
       qualification, investment, graduate_school, 
-      consultant)
+      consultant, consultation_price)
     values (#{id,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, #{username,jdbcType=VARCHAR}, 
       #{sex,jdbcType=VARCHAR}, #{dateOfBirthYear,jdbcType=VARCHAR}, #{dateOfBirthMonth,jdbcType=VARCHAR}, 
       #{idNumber,jdbcType=VARCHAR}, #{positiveIdUrl,jdbcType=VARCHAR}, #{oppositeIdUrl,jdbcType=VARCHAR}, 
@@ -212,13 +213,13 @@
       #{contacts,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{professionalTitle,jdbcType=VARCHAR}, 
       #{workUnit,jdbcType=VARCHAR}, #{education,jdbcType=VARCHAR}, #{majorCategory,jdbcType=VARCHAR}, 
       #{qualification,jdbcType=VARCHAR}, #{investment,jdbcType=INTEGER}, #{graduateSchool,jdbcType=VARCHAR}, 
-      #{consultant,jdbcType=INTEGER})
+      #{consultant,jdbcType=INTEGER}, #{consultationPrice,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.UserIdentity">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     insert into user_identity
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -342,6 +343,9 @@
       <if test="consultant != null">
         consultant,
       </if>
+      <if test="consultationPrice != null">
+        consultation_price,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -464,13 +468,16 @@
       <if test="consultant != null">
         #{consultant,jdbcType=INTEGER},
       </if>
+      <if test="consultationPrice != null">
+        #{consultationPrice,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.UserIdentityExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     select count(*) from user_identity
     <if test="_parameter != null">
@@ -481,7 +488,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     update user_identity
     <set>
@@ -605,6 +612,9 @@
       <if test="record.consultant != null">
         consultant = #{record.consultant,jdbcType=INTEGER},
       </if>
+      <if test="record.consultationPrice != null">
+        consultation_price = #{record.consultationPrice,jdbcType=DECIMAL},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -614,7 +624,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     update user_identity
     set id = #{record.id,jdbcType=VARCHAR},
@@ -656,7 +666,8 @@
       qualification = #{record.qualification,jdbcType=VARCHAR},
       investment = #{record.investment,jdbcType=INTEGER},
       graduate_school = #{record.graduateSchool,jdbcType=VARCHAR},
-      consultant = #{record.consultant,jdbcType=INTEGER}
+      consultant = #{record.consultant,jdbcType=INTEGER},
+      consultation_price = #{record.consultationPrice,jdbcType=DECIMAL}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -665,7 +676,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     update user_identity
     <set>
@@ -786,6 +797,9 @@
       <if test="consultant != null">
         consultant = #{consultant,jdbcType=INTEGER},
       </if>
+      <if test="consultationPrice != null">
+        consultation_price = #{consultationPrice,jdbcType=DECIMAL},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -793,7 +807,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Wed Dec 27 16:44:24 CST 2017.
+      This element was generated on Fri Dec 29 09:20:50 CST 2017.
     -->
     update user_identity
     set uid = #{uid,jdbcType=VARCHAR},
@@ -834,7 +848,8 @@
       qualification = #{qualification,jdbcType=VARCHAR},
       investment = #{investment,jdbcType=INTEGER},
       graduate_school = #{graduateSchool,jdbcType=VARCHAR},
-      consultant = #{consultant,jdbcType=INTEGER}
+      consultant = #{consultant,jdbcType=INTEGER},
+      consultation_price = #{consultationPrice,jdbcType=DECIMAL}
     where id = #{id,jdbcType=VARCHAR}
   </update>
  
@@ -1072,13 +1087,13 @@
     </if>
   </select>
   
-  <select id="countInterest"  resultType="java.lang.Integer">
+  <select id="countInterest" resultType="java.lang.Integer">
   select count(0)
   	from user_interest 
   	where to_uid=#{uid,jdbcType=VARCHAR}
   </select>
   
-  <select id= "findConsultantListByPage"  resultType="com.goafanti.app.bo.consultantListBo" >
+  <select id="findConsultantListByPage" resultType="com.goafanti.app.bo.consultantListBo">
   select t.uid as id,u.nickname as username ,u.head_portrait_url as headPortraitUrl,u.introduction ,t.consultant
   from user_identity t
   left join `user` u on t.uid=u.id
@@ -1088,7 +1103,7 @@
 	</if>
   </select>
   
-  <select id = "findConsultantCount"  resultType="java.lang.Integer">
+  <select id="findConsultantCount" resultType="java.lang.Integer">
    	select count(0) 
   from user_identity t
   left join `user` u on t.uid=u.id

+ 1 - 1
src/main/java/com/goafanti/user/controller/UserRegisterController.java

@@ -131,7 +131,7 @@ public class UserRegisterController extends BaseController {
 			resultObj.put("password", easemobPass);
 			resultObj.put("username", easemobName);
 			resultObj.put("nickname", StringUtils.isBlank(u.getNickname()) ? "技淘用户" + u.getNumber() : u.getNickname());
-			easemobUtils.send(
+			easemobUtils.sendLater(
 					new EasemobInfo().uri("/users/").data(resultObj.toJSONString()).method(HttpMethod.POST));
 			//绑定账号
 			messageService.addJpushEasemobAccount(uuid,u.getId(),easemobName,easemobPass);