Merge branch 'develop'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherTotalDao.java

@@ -26,5 +26,6 @@ public interface TeacherTotalDao extends BaseMapper<TeacherTotal>{
      * @return: com.yonge.cooleshow.biz.dal.vo.TeacherTotalVo
 	 */
 	List<TeacherTotalVo> selectPage(@Param("page") IPage page, @Param("param") TeacherTotalSearch teacherTotal);
-	
+
+    void save(@Param("teacherTotal") TeacherTotal teacherTotal);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -215,7 +215,6 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     @Autowired
     private SmsCodeService smsCodeService;
 
-
     @Autowired
     private ImGroupCoreService imGroupCoreService;
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherTotalServiceImpl.java

@@ -263,7 +263,7 @@ public class TeacherTotalServiceImpl extends ServiceImpl<TeacherTotalDao, Teache
         if (null != old) {
             updateById(teacherTotal);
         } else {
-            save(teacherTotal);
+            baseMapper.save(teacherTotal);
         }
         return teacherTotal;
     }

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherTotalMapper.xml

@@ -34,4 +34,21 @@
         	<include refid="baseColumns" />
 		FROM teacher_total t
 	</select>
+
+	<insert id="save">
+        insert into teacher_total(user_id_, star_grade_,fans_num_, exp_time_, un_exp_time_, live_flag_, music_album_num_,
+        music_sheet_num_)
+        values
+        (#{teacherTotal.userId},#{teacherTotal.starGrade},#{teacherTotal.fansNum},#{teacherTotal.expTime},#{teacherTotal.unExpTime},
+        #{teacherTotal.liveFlag},#{teacherTotal.musicAlbumNum},#{teacherTotal.musicSheetNum})
+
+        ON DUPLICATE KEY UPDATE
+        star_grade_ = VALUES(star_grade_),
+        fans_num_ = VALUES(fans_num_),
+        exp_time_ = VALUES(exp_time_),
+        un_exp_time_ = VALUES(un_exp_time_),
+        live_flag_ = VALUES(live_flag_),
+        music_album_num_ = VALUES(music_album_num_),
+        music_sheet_num_ = VALUES(music_sheet_num_)
+    </insert>
 </mapper>