Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/UserOrderController.java

@@ -19,6 +19,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.OrderSearch;
 import com.yonge.cooleshow.biz.dal.service.UserOrderService;
 
 import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -64,6 +65,9 @@ public class UserOrderController extends BaseController {
             UserOrderExport export = new UserOrderExport();
             try {
                 BeanUtils.copyProperties(export,o);
+                if(null == export.getFeeAmt()){
+                    export.setFeeAmt(BigDecimal.ZERO);
+                }
                 list.add(export);
             } catch (IllegalAccessException e) {
                 e.printStackTrace();

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/res/HomeUserToDoNum.java

@@ -17,6 +17,8 @@ public class HomeUserToDoNum {
     private Integer musicNum;
     @ApiModelProperty("待审核视频课 ")
     private Integer videoCourseNum;
+    @ApiModelProperty("待审核个人风采 ")
+    private Integer styleNum;
 
     public Integer getEntryNum() {
         return entryNum;
@@ -49,4 +51,12 @@ public class HomeUserToDoNum {
     public void setVideoCourseNum(Integer videoCourseNum) {
         this.videoCourseNum = videoCourseNum;
     }
+
+    public Integer getStyleNum() {
+        return styleNum;
+    }
+
+    public void setStyleNum(Integer styleNum) {
+        this.styleNum = styleNum;
+    }
 }

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

@@ -7,7 +7,8 @@
 			(select count(1) from teacher_auth_entry_record where teacher_auth_status_ = 'DOING') as entryNum,
 			(select count(1) from teacher_auth_musician_record where teacher_auth_status_ = 'DOING') as musicianNum,
         	(select count(1) from music_sheet where del_flag_ = 0 and audit_status_ = 'DOING') as musicNum,
-        	(select count(1) from video_lesson_auth_record where audit_status_ = 'DOING') as videoCourseNum
+        	(select count(1) from video_lesson_auth_record where audit_status_ = 'DOING') as videoCourseNum,
+			(select count(1) from teacher_style_video where auth_status_ = 'DOING') as styleNum
         from dual
 	</select>