|
@@ -223,8 +223,8 @@ func (self *BalanceController) TakeCash() {
|
|
|
wxUser := self.GetCurrentWxUser(false)
|
|
wxUser := self.GetCurrentWxUser(false)
|
|
|
todayOrderList := balance_model.GetTakeCashOrderListByWxUIdAndTime(wxUser.Id, time.Now(), false)
|
|
todayOrderList := balance_model.GetTakeCashOrderListByWxUIdAndTime(wxUser.Id, time.Now(), false)
|
|
|
|
|
|
|
|
- if len(todayOrderList) > 0 {
|
|
|
|
|
- self.ReturnError(403, []string{"todaySubmitedTakeCashOrder", "温馨提示,目前单日仅限提现1次"}, "", nil)
|
|
|
|
|
|
|
+ if len(todayOrderList) >= balance_model.TAKE_CASH_LIMIT {
|
|
|
|
|
+ self.ReturnError(403, []string{"todaySubmitedTakeCashOrder", "温馨提示,目前单日仅限提现7次"}, "", nil)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
canExtract := balance_model.GetCashTotalBalance(wxUser.Id)
|
|
canExtract := balance_model.GetCashTotalBalance(wxUser.Id)
|
|
@@ -348,6 +348,9 @@ func (self *BalanceController) GetTakeCashOrders() {
|
|
|
retList := make([]*Order, 0, 0)
|
|
retList := make([]*Order, 0, 0)
|
|
|
|
|
|
|
|
for _, item := range list {
|
|
for _, item := range list {
|
|
|
|
|
+ if wxUser != nil {
|
|
|
|
|
+ syncTakeCashMerchantTransfer(wxUser, item)
|
|
|
|
|
+ }
|
|
|
order := new(Order)
|
|
order := new(Order)
|
|
|
|
|
|
|
|
order.Id = item.Id
|
|
order.Id = item.Id
|