diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java index 081c7e6..42bc162 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java @@ -101,6 +101,21 @@ public class ShopDealerWithdrawController extends BaseController { shopDealerWithdraw.setApplyStatus(10); shopDealerWithdraw.setAuditTime(null); + if(shopDealerWithdraw.getTenantId().equals(10584)){ + // 1.如果体现金额小于等于50,则可以自动审核通过 + if (shopDealerWithdraw.getMoney().compareTo(java.math.BigDecimal.valueOf(50)) <= 0) { + shopDealerWithdraw.setApplyStatus(20); + shopDealerWithdraw.setAuditTime(LocalDateTime.now()); + } + // 2.如果提现金额大于50,小于1000,则需要人工审核 + shopDealerWithdraw.setApplyStatus(10); + shopDealerWithdraw.setAuditTime(null); + // 3.如果金额大于1000,小于10000,则除了财务审核还需要农总审核 + + // 4.如果金额大于10000,则需要财务、农总、明、钟四个人审核 + + } + final ShopDealerUser dealerUser = shopDealerUserService.getByUserIdRel(loginUser.getUserId()); if (dealerUser == null) { return fail("分销商信息不存在"); diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index 0a1ebfc..de69242 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -157,7 +157,7 @@ public class ShopOrderController extends BaseController { if (shopOrder.getUpdateTime() == null) { shopOrder.setUpdateTime(now); } - shopOrder.setExpirationTime(shopOrder.getCreateTime().plusMinutes(10)); + shopOrder.setExpirationTime(shopOrder.getCreateTime().plusMinutes(60)); if (shopOrder.getOrderNo() == null) { shopOrder.setOrderNo(Long.toString(IdUtil.getSnowflakeNextId()));