Browse Source

fix cashout

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
964a66122c
2 changed files with 8 additions and 7 deletions
  1. +6
    -6
      mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java
  2. +2
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java

+ 6
- 6
mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java View File

@@ -64,11 +64,11 @@ public class WxCashOutController extends BaseController {
return wxCashOutService.applyCashout(buser, wxCashOut,EnumPayWay.PAY_WAY_WECHAT);
}
@ApiOperation("微信B端重新提现")
@PostMapping("recashout")
public ResultData recashout(@RequestBody WxCashOut wxCashOut) {
WxMerchantBUser buser = getLoginBUser();
return wxCashOutService.reCashout(buser, wxCashOut,EnumPayWay.PAY_WAY_WECHAT);
}
// @ApiOperation("微信B端重新提现")
// @PostMapping("recashout")
// public ResultData recashout(@RequestBody WxCashOut wxCashOut) {
// WxMerchantBUser buser = getLoginBUser();
// return wxCashOutService.reCashout(buser, wxCashOut,EnumPayWay.PAY_WAY_WECHAT);
// }

}

+ 2
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java View File

@@ -58,7 +58,8 @@ public class CashOutSchedule {
//时间在1天以上的
Calendar startA = Calendar.getInstance();
startA.setTime(curDate);
startA.add(Calendar.DAY_OF_YEAR, -1);
//startA.add(Calendar.DAY_OF_YEAR, -1);
startA.add(Calendar.MINUTE, -10);
cashOut.setCreateDateEnd(startA.getTime());
List<WxCashOut> cashoutlist = wxCashOutMapper.findList(cashOut);
if (null != cashoutlist && cashoutlist.size() > 0 ) {


Loading…
Cancel
Save