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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/TeacherSalaryEnum.java

@@ -8,9 +8,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
  */
 public enum TeacherSalaryEnum implements BaseEnum<String, TeacherSalaryEnum> {
     //未上课-还未开始上课等待上课结束后结算
-    NOT_START("未上课"),
-    //待结算-老师上完课等待结算
-    WAIT("待结算"),
+    NOT_START("未结算"),
     //已结算-已经结算完成
     COMPLETE("已结算"),
     //已取消-学生发起退款等等其他操作

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

@@ -331,9 +331,6 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
                 userAccountRecord.setTransAmount(salary.getExpectSalary());//扣除手续费后所得金额
                 userAccountRecord.setOrderNo(payment.getOrderNo());
                 userAccountService.accountChange(userAccountRecord);
-                //修改老师课酬表
-                salary.setStatus(TeacherSalaryEnum.COMPLETE.getCode());
-                courseScheduleTeacherSalaryService.updateById(salary);
             }
         });
     }
@@ -389,9 +386,6 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
                 userAccountRecord.setTransAmount(salary.getActualSalary());//扣除手续费后所得金额
                 userAccountRecord.setOrderNo(payment.getOrderNo());
                 userAccountService.accountChange(userAccountRecord);
-                //修改老师课酬表
-                salary.setStatus(TeacherSalaryEnum.COMPLETE.getCode());
-                courseScheduleTeacherSalaryService.updateById(salary);
             }
         });
     }

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

@@ -96,7 +96,7 @@ public class UserWithdrawalServiceImpl extends ServiceImpl<UserWithdrawalDao, Us
     public HttpResponseResult<Boolean> withdrawal(SysUser user, WithdrawalReq withdrawalReq) {
         BigDecimal withdrawalServiceFee = getWithdrawalServiceFee();
         //校验金额
-        if (withdrawalReq.getAmountWithdrawal().subtract(withdrawalServiceFee).floatValue() < 0) {
+        if (withdrawalReq.getAmountWithdrawal().floatValue() <= 0) {
             return HttpResponseResult.failed("提现金额过小");
         }
         //获取用户提现金额

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

@@ -43,7 +43,7 @@
             bc.bank_name_ as bankName,
             bc.bank_card_ as bankCard,
             bc.phone_ as phone,
-            u.username_  as withdrawaUser,
+            u.username_  as withdrawaUser
         FROM user_withdrawal t
         LEFT JOIN user_bank_card bc on t.bank_card_id_ = bc.id_ and t.user_id_ = bc.user_id_
         left join sys_user u on t.user_id_ = u.id_