From f059581b49998b61aa23c9e61ca59f94e375c5e8 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" <123456> Date: Fri, 8 Jul 2022 00:02:39 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=B8=AA=E4=BA=BA=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=92=B1=E5=8C=85=E6=8F=90=E7=8E=B0=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/BusClubActivityApiController.java | 112 +++++++++--------- .../bmb/wxpay/api/PayApiController.java | 28 ++--- .../impl/BusClubActivityServiceImpl.java | 1 + .../com/mls/bmb/club/domain/BusClubCash.java | 7 ++ .../mls/bmb/club/vomain/ClubCashDetailVO.java | 43 +++++++ .../mapper/club/BusClubCashMapper.xml | 6 +- 6 files changed, 126 insertions(+), 71 deletions(-) diff --git a/mls-admin/src/main/java/com/mls/web/controller/bmb/activity/api/BusClubActivityApiController.java b/mls-admin/src/main/java/com/mls/web/controller/bmb/activity/api/BusClubActivityApiController.java index 74b45ae..0a7981c 100644 --- a/mls-admin/src/main/java/com/mls/web/controller/bmb/activity/api/BusClubActivityApiController.java +++ b/mls-admin/src/main/java/com/mls/web/controller/bmb/activity/api/BusClubActivityApiController.java @@ -286,36 +286,36 @@ public class BusClubActivityApiController extends BaseMobileController { return MobileResult.error("活动开始时间或结束时间不能为空"); } - Date thisDate = new Date(); - // 判断活动时间 - if(DateUtils.parse(req.getStartRegisterTime() + ":00").getTime() - > DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime()){ - return MobileResult.error("活动报名开始时间不能大于活动报名结束时间"); - } - -// if(DateUtils.parse(req.getStartRegisterTime()+ ":00").getTime() < thisDate.getTime() -// || DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime() < thisDate.getTime()){ -// return MobileResult.error("活动报名开始时间或结束时间不能小于当前时间"); +// Date thisDate = new Date(); +// // 判断活动时间 +// if(DateUtils.parse(req.getStartRegisterTime() + ":00").getTime() +// > DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime()){ +// return MobileResult.error("活动报名开始时间不能大于活动报名结束时间"); +// } +// +//// if(DateUtils.parse(req.getStartRegisterTime()+ ":00").getTime() < thisDate.getTime() +//// || DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime() < thisDate.getTime()){ +//// return MobileResult.error("活动报名开始时间或结束时间不能小于当前时间"); +//// } +// +// if(req.getStartTime().getTime() > req.getEndTime().getTime()){ +// return MobileResult.error("活动开始时间不能大于活动结束时间"); +// } +// +// if(req.getStartTime().getTime() < thisDate.getTime() +// || req.getEndTime().getTime() < thisDate.getTime()){ +// return MobileResult.error("活动开始时间或结束时间不能小于当前时间"); +// } +// +// if(req.getStartTime().getTime() < DateUtils.parse(req.getStartRegisterTime() + ":00").getTime() +// || req.getStartTime().getTime() < DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime()){ +// return MobileResult.error("活动开始时间不能小于报名开始时间或报名结束时间"); +// } +// +// if(req.getEndTime().getTime() < DateUtils.parse(req.getStartRegisterTime() + ":00").getTime() +// || req.getEndTime().getTime() < DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime()){ +// return MobileResult.error("活动结束时间不能小于报名开始时间或报名结束时间"); // } - - if(req.getStartTime().getTime() > req.getEndTime().getTime()){ - return MobileResult.error("活动开始时间不能大于活动结束时间"); - } - - if(req.getStartTime().getTime() < thisDate.getTime() - || req.getEndTime().getTime() < thisDate.getTime()){ - return MobileResult.error("活动开始时间或结束时间不能小于当前时间"); - } - - if(req.getStartTime().getTime() < DateUtils.parse(req.getStartRegisterTime() + ":00").getTime() - || req.getStartTime().getTime() < DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime()){ - return MobileResult.error("活动开始时间不能小于报名开始时间或报名结束时间"); - } - - if(req.getEndTime().getTime() < DateUtils.parse(req.getStartRegisterTime() + ":00").getTime() - || req.getEndTime().getTime() < DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime()){ - return MobileResult.error("活动结束时间不能小于报名开始时间或报名结束时间"); - } if(null == req.getIsHelpRegister()){ req.setIsHelpRegister(-1); @@ -378,36 +378,36 @@ public class BusClubActivityApiController extends BaseMobileController { return MobileResult.error("活动开始时间或结束时间不能为空"); } - Date thisDate = new Date(); +// Date thisDate = new Date(); // 判断活动时间 - if(DateUtils.parse(req.getStartRegisterTime() + ":00").getTime() - > DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime()){ - return MobileResult.error("活动报名开始时间不能大于活动报名结束时间"); - } - - if(DateUtils.parse(req.getStartRegisterTime()+ ":00").getTime() < thisDate.getTime() - || DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime() < thisDate.getTime()){ - return MobileResult.error("活动报名开始时间或结束时间不能小于当前时间"); - } - - if(req.getStartTime().getTime() > req.getEndTime().getTime()){ - return MobileResult.error("活动开始时间不能大于活动结束时间"); - } - - if(req.getStartTime().getTime() < thisDate.getTime() - || req.getEndTime().getTime() < thisDate.getTime()){ - return MobileResult.error("活动开始时间或结束时间不能小于当前时间"); - } +// if(DateUtils.parse(req.getStartRegisterTime() + ":00").getTime() +// > DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime()){ +// return MobileResult.error("活动报名开始时间不能大于活动报名结束时间"); +// } - if(req.getStartTime().getTime() < DateUtils.parse(req.getStartRegisterTime() + ":00").getTime() - || req.getStartTime().getTime() < DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime()){ - return MobileResult.error("活动开始时间不能小于报名开始时间或报名结束时间"); - } +// if(DateUtils.parse(req.getStartRegisterTime()+ ":00").getTime() < thisDate.getTime() +// || DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime() < thisDate.getTime()){ +// return MobileResult.error("活动报名开始时间或结束时间不能小于当前时间"); +// } +// +// if(req.getStartTime().getTime() > req.getEndTime().getTime()){ +// return MobileResult.error("活动开始时间不能大于活动结束时间"); +// } - if(req.getEndTime().getTime() < DateUtils.parse(req.getStartRegisterTime() + ":00").getTime() - || req.getEndTime().getTime() < DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime()){ - return MobileResult.error("活动结束时间不能小于报名开始时间或报名结束时间"); - } +// if(req.getStartTime().getTime() < thisDate.getTime() +// || req.getEndTime().getTime() < thisDate.getTime()){ +// return MobileResult.error("活动开始时间或结束时间不能小于当前时间"); +// } +// +// if(req.getStartTime().getTime() < DateUtils.parse(req.getStartRegisterTime() + ":00").getTime() +// || req.getStartTime().getTime() < DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime()){ +// return MobileResult.error("活动开始时间不能小于报名开始时间或报名结束时间"); +// } +// +// if(req.getEndTime().getTime() < DateUtils.parse(req.getStartRegisterTime() + ":00").getTime() +// || req.getEndTime().getTime() < DateUtils.parse(req.getEndRegisterTime()+ ":00").getTime()){ +// return MobileResult.error("活动结束时间不能小于报名开始时间或报名结束时间"); +// } if(null == req.getIsHelpRegister()){ req.setIsHelpRegister(-1); diff --git a/mls-admin/src/main/java/com/mls/web/controller/bmb/wxpay/api/PayApiController.java b/mls-admin/src/main/java/com/mls/web/controller/bmb/wxpay/api/PayApiController.java index 49c6f75..37718f7 100644 --- a/mls-admin/src/main/java/com/mls/web/controller/bmb/wxpay/api/PayApiController.java +++ b/mls-admin/src/main/java/com/mls/web/controller/bmb/wxpay/api/PayApiController.java @@ -238,19 +238,19 @@ public class PayApiController extends BaseMobileController { return MobileResult.error("金额不能小于等于0！"); } - WxPayService wxPayService = wxPayServer.getService(); - TransferOrder order = new TransferOrder(); - // 商户转账订单号 - order.setOutNo("C"+ DateUtils.dateTimeNow()+"0000"+((int)((Math.random()*9+1)*100000))); - order.setPayeeAccount(openId); - //收款用户姓名， 非必填，如果填写将强制验证收款人姓名 - //order.setPayeeName("收款用户姓名， 非必填，如果填写将强制验证收款人姓名"); - //转账备注, 非必填 - order.setRemark(message); - order.setAmount(new BigDecimal(amount)); - //转账到余额，这里不设置则默认值是转账到银行卡 - order.setTransferType(WxTransferType.TRANSFERS); - Map result = wxPayService.transfer(order); +// WxPayService wxPayService = wxPayServer.getService(); +// TransferOrder order = new TransferOrder(); +// // 商户转账订单号 +// order.setOutNo("C"+ DateUtils.dateTimeNow()+"0000"+((int)((Math.random()*9+1)*100000))); +// order.setPayeeAccount(openId); +// //收款用户姓名， 非必填，如果填写将强制验证收款人姓名 +// //order.setPayeeName("收款用户姓名， 非必填，如果填写将强制验证收款人姓名"); +// //转账备注, 非必填 +// order.setRemark(message); +// order.setAmount(new BigDecimal(amount)); +// //转账到余额，这里不设置则默认值是转账到银行卡 +// order.setTransferType(WxTransferType.TRANSFERS); +// Map result = wxPayService.transfer(order); // 记提现流水 减去用户钱包或俱乐部钱包的金额 if(param == null || param.length()<1){ @@ -271,7 +271,7 @@ public class PayApiController extends BaseMobileController { return toAjax(r); } - return MobileResult.success(result); + return MobileResult.success(null); } diff --git a/mls-bmb/src/main/java/com/mls/bmb/activity/service/impl/BusClubActivityServiceImpl.java b/mls-bmb/src/main/java/com/mls/bmb/activity/service/impl/BusClubActivityServiceImpl.java index 1b558c6..b23d79c 100644 --- a/mls-bmb/src/main/java/com/mls/bmb/activity/service/impl/BusClubActivityServiceImpl.java +++ b/mls-bmb/src/main/java/com/mls/bmb/activity/service/impl/BusClubActivityServiceImpl.java @@ -623,6 +623,7 @@ public class BusClubActivityServiceImpl implements IBusClubActivityService if ("1".equals(editVO.getIsFree())){ // 费用信息列表 List costAddVOList = editVO.getCostList(); + System.out.println(">>>>"+costAddVOList); for(BusActivityCost cost : costAddVOList){ if(null == cost.getCostId()){ BusActivityCost busActivityCost = new BusActivityCost(); diff --git a/mls-bmb/src/main/java/com/mls/bmb/club/domain/BusClubCash.java b/mls-bmb/src/main/java/com/mls/bmb/club/domain/BusClubCash.java index 81092e8..06043eb 100644 --- a/mls-bmb/src/main/java/com/mls/bmb/club/domain/BusClubCash.java +++ b/mls-bmb/src/main/java/com/mls/bmb/club/domain/BusClubCash.java @@ -47,6 +47,13 @@ public class BusClubCash extends BaseEntity @Excel(name = "记录状态 0-无效 1-有效") private String recordStatus; + /** + * 0 待审核 + * 1 审核成功 + * 2 审核失败 + */ + private Integer cashStatus; + /** 乐观锁 */ @Excel(name = "乐观锁") private Long revision; diff --git a/mls-bmb/src/main/java/com/mls/bmb/club/vomain/ClubCashDetailVO.java b/mls-bmb/src/main/java/com/mls/bmb/club/vomain/ClubCashDetailVO.java index de25dc1..7b06547 100644 --- a/mls-bmb/src/main/java/com/mls/bmb/club/vomain/ClubCashDetailVO.java +++ b/mls-bmb/src/main/java/com/mls/bmb/club/vomain/ClubCashDetailVO.java @@ -3,6 +3,8 @@ package com.mls.bmb.club.vomain; import com.mls.common.core.vomain.BaseVO; import io.swagger.annotations.ApiModel; +import java.util.Date; + /** * 使用模块： * 查询俱乐部提现流水 @@ -12,4 +14,45 @@ import io.swagger.annotations.ApiModel; @ApiModel("查询俱乐部提现流水") public class ClubCashDetailVO extends BaseVO { + /** + * 提现金额 + */ + private Double money; + + /** + * 0 待审核 + * 1 审核成功 + * 2 审核失败 + */ + private Integer cashStatus; + + /** + * 创建时间 + * + */ + private Date createdTime; + + public Double getMoney() { + return money; + } + + public void setMoney(Double money) { + this.money = money; + } + + public Integer getCashStatus() { + return cashStatus; + } + + public void setCashStatus(Integer cashStatus) { + this.cashStatus = cashStatus; + } + + public Date getCreatedTime() { + return createdTime; + } + + public void setCreatedTime(Date createdTime) { + this.createdTime = createdTime; + } } diff --git a/mls-bmb/src/main/resources/mapper/club/BusClubCashMapper.xml b/mls-bmb/src/main/resources/mapper/club/BusClubCashMapper.xml index c617ed1..392e6a0 100644 --- a/mls-bmb/src/main/resources/mapper/club/BusClubCashMapper.xml +++ b/mls-bmb/src/main/resources/mapper/club/BusClubCashMapper.xml @@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select cash_id, cash_serial, club_id, user_id, money, account, wechat_id, record_status, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, notes from bus_club_cash + select cash_id, cash_serial, club_id, user_id, money, account, wechat_id, record_status, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME, notes,cash_status from bus_club_cash