java_project
/
bml_travel
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.增加个人用户钱包提现申请审核字段

master
pref_mail@163.com 3 years ago
parent
f99fa1ca33
commit
f059581b49
6 changed files with 126 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 112
      mls-admin/src/main/java/com/mls/web/controller/bmb/activity/api/BusClubActivityApiController.java
  2. 28
      mls-admin/src/main/java/com/mls/web/controller/bmb/wxpay/api/PayApiController.java
  3. 1
      mls-bmb/src/main/java/com/mls/bmb/activity/service/impl/BusClubActivityServiceImpl.java
  4. 7
      mls-bmb/src/main/java/com/mls/bmb/club/domain/BusClubCash.java
  5. 43
      mls-bmb/src/main/java/com/mls/bmb/club/vomain/ClubCashDetailVO.java
  6. 6
      mls-bmb/src/main/resources/mapper/club/BusClubCashMapper.xml

112
mls-admin/src/main/java/com/mls/web/controller/bmb/activity/api/BusClubActivityApiController.java
Unescape View File

@ -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);

28
mls-admin/src/main/java/com/mls/web/controller/bmb/wxpay/api/PayApiController.java
Unescape View File

@ -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<String, Object> 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<String, Object> 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);
}

1
mls-bmb/src/main/java/com/mls/bmb/activity/service/impl/BusClubActivityServiceImpl.java
Unescape View File

@ -623,6 +623,7 @@ public class BusClubActivityServiceImpl implements IBusClubActivityService
if ("1".equals(editVO.getIsFree())){
// 费用信息列表
List<BusActivityCost> costAddVOList = editVO.getCostList();
System.out.println(">>>>"+costAddVOList);
for(BusActivityCost cost : costAddVOList){
if(null == cost.getCostId()){
BusActivityCost busActivityCost = new BusActivityCost();

7
mls-bmb/src/main/java/com/mls/bmb/club/domain/BusClubCash.java
Unescape View File

@ -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;

43
mls-bmb/src/main/java/com/mls/bmb/club/vomain/ClubCashDetailVO.java
Unescape View File

@ -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;
}
}

6
mls-bmb/src/main/resources/mapper/club/BusClubCashMapper.xml
Unescape View File

@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updatedBy" column="UPDATED_BY" />
<result property="updatedTime" column="UPDATED_TIME" />
<result property="notes" column="notes" />
<result property="cashStatus" column="cash_status" />
</resultMap>
<sql id="selectBusClubCashAll">
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
</sql>
<select id="selectBusClubCashList" parameterType="BusClubCash" resultMap="BusClubCashResult">
@ -66,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updatedBy != null and updatedBy != ''">UPDATED_BY,</if>
<if test="updatedTime != null ">UPDATED_TIME,</if>
<if test="notes != null and notes != ''">notes,</if>
<if test="cashStatus != null ">cash_status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="cashId != null and cashId != ''">#{cashId},</if>
@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updatedBy != null and updatedBy != ''">#{updatedBy},</if>
<if test="updatedTime != null ">#{updatedTime},</if>
<if test="notes != null and notes != ''">#{notes},</if>
<if test="cashStatus != null ">#{cashStatus},</if>
</trim>
</insert>
@ -109,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updatedBy != null and updatedBy != ''">UPDATED_BY = #{updatedBy},</if>
<if test="updatedTime != null ">UPDATED_TIME = #{updatedTime},</if>
<if test="notes != null and notes != ''">notes = #{notes},</if>
<if test="cashStatus != null ">cash_status = #{cashStatus},</if>
</trim>
where cash_id = #{cashId}
</update>

Write Preview
Loading…
Cancel
Save