Tenlion/system-card
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加文字长度自动设置/栏目增加校验

Browse Source
This commit is contained in:
cuibaocheng 2021-09-06 16:12:44 +08:00
parent d9d51bcc6a
commit ff46264284
9 changed files with 200 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/cn/com/tenlion/systemcard/enums/AccountTypeEnum.java
View File

@ -2,8 +2,9 @@ package cn.com.tenlion.systemcard.enums;
public enum AccountTypeEnum {
TIXIAN("TIXIAN", "提现"),
TICHENG("TICHENG", "邀请收益");
TIXIAN("TIXIAN", "账户提现"),
TICHENG("TICHENG", "邀请使用名片服务收益"),
XUFEITICHENG("XUFEITICHENG", "邀请续费名片服务收益");
private String type;

20
src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardchargerole/CardChargeRoleDTO.java
View File

@ -26,6 +26,10 @@ public class CardChargeRoleDTO {
private Double cardChargeRoleDispatchProp;
@ApiModelProperty(name = "cardChargeRoleInvitationProp", value = "邀请码邀请的提成比例")
private Double cardChargeRoleInvitationProp;
@ApiModelProperty(name = "cardChargeRoleDispatchRenewProp", value = "转发邀请的提成比例(续费)")
private Double cardChargeRoleDispatchRenewProp;
@ApiModelProperty(name = "cardChargeRoleInvitationRenewProp", value = "邀请码邀请的提成比例(续费)")
private Double cardChargeRoleInvitationRenewProp;
@ApiModelProperty(name = "cardChargeRoleType", value = "角色类型.1:个人普通版,2:企业普通版,3:企业高级版")
private String cardChargeRoleType;
@ApiModelProperty(name = "cardChargeRolePersonNumber", value = "企业版支持人数")
@ -47,6 +51,22 @@ public class CardChargeRoleDTO {
@ApiModelProperty(name = "isDelete", value = "")
private Integer isDelete;
public Double getCardChargeRoleDispatchRenewProp() {
return cardChargeRoleDispatchRenewProp;
}
public void setCardChargeRoleDispatchRenewProp(Double cardChargeRoleDispatchRenewProp) {
this.cardChargeRoleDispatchRenewProp = cardChargeRoleDispatchRenewProp;
}
public Double getCardChargeRoleInvitationRenewProp() {
return cardChargeRoleInvitationRenewProp;
}
public void setCardChargeRoleInvitationRenewProp(Double cardChargeRoleInvitationRenewProp) {
this.cardChargeRoleInvitationRenewProp = cardChargeRoleInvitationRenewProp;
}
public Integer getCardChargeRoleOrder() {
return cardChargeRoleOrder;
}

6
src/main/java/cn/com/tenlion/systemcard/pojo/vos/cardcharge/CardChargeVO.java
View File

@ -39,8 +39,8 @@ public class CardChargeVO {
private String cardChargeUserId;
@ApiModelProperty(name = "cardChargeInvitationUserId", value = "邀请人ID")
private String cardChargeInvitationUserId;
@ApiModelProperty(name = "cardChargeInvitationNumber", value = "邀请码")
private String cardChargeInvitationNumber;
/* @ApiModelProperty(name = "cardChargeInvitationNumber", value = "邀请码")
private String cardChargeInvitationNumber;*/
@ApiModelProperty(name = "cardChargeOrderNumber", value = "交易订单号")
private String cardChargeOrderNumber;
@ApiModelProperty(name = "cardTemplateId", value = "模板购买")
@ -108,6 +108,7 @@ public class CardChargeVO {
this.cardChargeOrderNumber = cardChargeOrderNumber;
}
/*
public String getCardChargeInvitationNumber() {
return cardChargeInvitationNumber == null ? "" : cardChargeInvitationNumber;
}
@ -115,6 +116,7 @@ public class CardChargeVO {
public void setCardChargeInvitationNumber(String cardChargeInvitationNumber) {
this.cardChargeInvitationNumber = cardChargeInvitationNumber;
}
*/
public String getCardChargeInvitationUserId() {
return cardChargeInvitationUserId == null ? "" : cardChargeInvitationUserId;

20
src/main/java/cn/com/tenlion/systemcard/pojo/vos/cardchargerole/CardChargeRoleVO.java
View File

@ -31,6 +31,10 @@ public class CardChargeRoleVO {
@ApiModelProperty(name = "cardChargeRoleInvitationProp", value = "邀请码邀请的提成比例")
@CheckNumberAnnotation(name = "邀请码邀请的提成比例")
private Double cardChargeRoleInvitationProp;
@ApiModelProperty(name = "cardChargeRoleDispatchRenewProp", value = "转发邀请的提成比例(续费)")
private Double cardChargeRoleDispatchRenewProp;
@ApiModelProperty(name = "cardChargeRoleInvitationRenewProp", value = "邀请码邀请的提成比例(续费)")
private Double cardChargeRoleInvitationRenewProp;
@ApiModelProperty(name = "cardChargeRoleType", value = "角色类型.1:个人普通版,2:企业普通版,3:企业高级版")
private String cardChargeRoleType;
@ApiModelProperty(name = "cardChargeRolePersonNumber", value = "企业版支持人数")
@ -43,6 +47,22 @@ public class CardChargeRoleVO {
@ApiModelProperty(name = "cardChargeRoleOrder", value = "排序")
private Integer cardChargeRoleOrder;
public Double getCardChargeRoleDispatchRenewProp() {
return cardChargeRoleDispatchRenewProp;
}
public void setCardChargeRoleDispatchRenewProp(Double cardChargeRoleDispatchRenewProp) {
this.cardChargeRoleDispatchRenewProp = cardChargeRoleDispatchRenewProp;
}
public Double getCardChargeRoleInvitationRenewProp() {
return cardChargeRoleInvitationRenewProp;
}
public void setCardChargeRoleInvitationRenewProp(Double cardChargeRoleInvitationRenewProp) {
this.cardChargeRoleInvitationRenewProp = cardChargeRoleInvitationRenewProp;
}
public Integer getCardChargeRoleOrder() {
return cardChargeRoleOrder;
}

87
src/main/java/cn/com/tenlion/systemcard/service/cardcharge/impl/CardChargeServiceImpl.java
View File

@ -115,19 +115,6 @@ public class CardChargeServiceImpl extends DefaultBaseService implements ICardCh
* @param cardChargeDTO
*/
private void accountItemAdd(CardChargeDTO cardChargeDTO) {
/**
* 查询我的缴费记录列表 , 判断是否存在缴费 , 存在则为续费 , 不存在则为缴费
*/
Map<String, Object> query = getHashMap(2);
query.put("cardChargeUserId" , cardChargeDTO.getCardChargeUserId());
List<CardChargeDTO> list = list(query);
for(CardChargeDTO dTO : list) {
// 说明在本次缴费之前 , 已经有过缴费记录 , 本次属于续费 , 没有提成
if ("2".equals(dTO.getCardChargeOrderStatus()) && !cardChargeDTO.getCardChargeId().equals(dTO.getCardChargeId())) {
return;
}
}
/**
* 缴费成功到账到公司账户后 , 给予邀请人账户提成
*/
@ -137,6 +124,20 @@ public class CardChargeServiceImpl extends DefaultBaseService implements ICardCh
* 找出邀请人(邀请人ID会以 邀请码 || 邀请人用户ID的形式传入 )
*/
String userIdOrUserCode = cardChargeDTO.getCardChargeInvitationUserId();
/**
* 查询我的缴费记录列表 , 判断这个角色续费 , 我是第一次(首次) , 还是第N次(续费)
*/
String cardChargeMode = cardChargeDTO.getCardChargeMode();
Map<String, Object> query = getHashMap(2);
query.put("cardChargeUserId" , cardChargeDTO.getCardChargeUserId());
List<CardChargeDTO> list = list(query);
Boolean isRenew = false; // 是否为续费.
for(CardChargeDTO dTO : list) {
// 相同模式的, 缴费成功的, 不是本次缴费的 . 如果有,则是续费, 如果没有则是新用户
if (cardChargeMode.equals(roleDTO.getCardChargeRoleType()) && "2".equals(dTO.getCardChargeOrderStatus()) && !cardChargeDTO.getCardChargeId().equals(dTO.getCardChargeId())) {
isRenew = true;
}
}
// 邀请人的用户ID
String invitationUserId = "";
String invitationType = "";
@ -145,15 +146,37 @@ public class CardChargeServiceImpl extends DefaultBaseService implements ICardCh
// 判断是否为邀请码
MiniappUserPO miniappUserPO = iMiniappUserService.getPOByUserCode(userIdOrUserCode);
if(miniappUserPO != null) {
invitationUserId = miniappUserPO.getUserId();
invitationType = "邀请码.邀请" + userPO.getNickName() + "使用名片服务";
invitationProp = roleDTO.getCardChargeRoleInvitationProp().intValue();// 邀请码邀请的提成比例
// 判断是否为userId
// 填写自己的邀请码, 没有提成
if(miniappUserPO.getUserId().equals(cardChargeDTO.getCardChargeUserId())) {
return;
}
// 是否为续费
if(isRenew) {
invitationUserId = miniappUserPO.getUserId();
invitationType = "邀请码.邀请" + userPO.getNickName() + "续费名片服务";
invitationProp = roleDTO.getCardChargeRoleInvitationRenewProp().intValue();// 邀请码邀请的提成比例(续费)
}else{
invitationUserId = miniappUserPO.getUserId();
invitationType = "邀请码.邀请" + userPO.getNickName() + "使用名片服务";
invitationProp = roleDTO.getCardChargeRoleInvitationProp().intValue();// 邀请码邀请的提成比例(首次)
}
// 判断是否为userId
}else {
MiniappUserPO miniappUser = iMiniappUserService.getPO(userIdOrUserCode);
invitationUserId = miniappUser.getUserId();
invitationType = "转发.邀请" + userPO.getNickName() + "使用名片服务";
invitationProp = roleDTO.getCardChargeRoleDispatchProp().intValue(); // 转发邀请的提成比例
// 自己的转发, 没有提成
if(miniappUser.getUserId().equals(cardChargeDTO.getCardChargeUserId())) {
return;
}
// 是否为续费
if(isRenew) {
invitationUserId = miniappUser.getUserId();
invitationType = "转发.邀请" + userPO.getNickName() + "续费名片服务";
invitationProp = roleDTO.getCardChargeRoleDispatchRenewProp().intValue(); // 转发邀请的提成比例(续费)
}else{
invitationUserId = miniappUser.getUserId();
invitationType = "转发.邀请" + userPO.getNickName() + "使用名片服务";
invitationProp = roleDTO.getCardChargeRoleDispatchProp().intValue(); // 转发邀请的提成比例(首次)
}
}
}
/**
@ -161,16 +184,23 @@ public class CardChargeServiceImpl extends DefaultBaseService implements ICardCh
* 邀请人的 账号流水 增加特定比例的提成
*/
if(!StringUtils.isEmpty(invitationUserId)) {
int cardChargePrice = PayUtil.buiderMoney(cardChargeDTO.getCardChargePrice());// 本次缴费金额
/**
* 计算提成
*/
int cardChargePrice = PayUtil.buiderMoney(cardChargeDTO.getCardChargePrice());// 本次缴费金额
// 大于等于10分钱, 走提成
if(cardChargePrice >= 10) {
int tiCheng = cardChargePrice * invitationProp / 100;
if(tiCheng > 0) {
// 邀请人的账户增加一条流水
iAccountItemPayService.addInAccount(cardChargeDTO.getCardChargeOrderNumber(), invitationUserId, tiCheng, invitationType, AccountTypeEnum.TICHENG);
// 续费提成
if(isRenew){
// 邀请人的账户增加一条流水
iAccountItemPayService.addInAccount(cardChargeDTO.getCardChargeOrderNumber(), invitationUserId, tiCheng, invitationType, AccountTypeEnum.XUFEITICHENG);
}else{
// 邀请人的账户增加一条流水
iAccountItemPayService.addInAccount(cardChargeDTO.getCardChargeOrderNumber(), invitationUserId, tiCheng, invitationType, AccountTypeEnum.TICHENG);
}
}
}
}
@ -276,6 +306,17 @@ public class CardChargeServiceImpl extends DefaultBaseService implements ICardCh
if(!priceDTO.getCardCharge()) {
throw new SaveException("无需缴费");
}*/
String userIdOrUserCode = cardChargeAppVO.getCardChargeInvitationUserId();
if (!StringUtils.isEmpty(cardChargeAppVO.getCardChargeInvitationUserId())) {
// 判断是否为邀请码
MiniappUserPO miniappUserPO = iMiniappUserService.getPOByUserCode(userIdOrUserCode);
if(miniappUserPO != null) {
// 填写自己的邀请码, 没有提成
if(miniappUserPO.getUserId().equals(userId)) {
throw new SaveException("不能填写自己的邀请码");
}
}
}
/**
* 查找出当前选择的 缴费配置
*/

28
src/main/resources/mybatis/mapper/cardchargerole/card-charge-role-mapper.xml
View File

@ -9,6 +9,8 @@
<result column="card_charge_role_price" property="cardChargeRolePrice"/>
<result column="card_charge_role_dispatch_prop" property="cardChargeRoleDispatchProp"/>
<result column="card_charge_role_invitation_prop" property="cardChargeRoleInvitationProp"/>
<result column="card_charge_role_dispatch_renew_prop" property="cardChargeRoleDispatchRenewProp"/>
<result column="card_charge_role_invitation_renew_prop" property="cardChargeRoleInvitationRenewProp"/>
<result column="card_charge_role_type" property="cardChargeRoleType"/>
<result column="card_charge_role_person_number" property="cardChargeRolePersonNumber"/>
<result column="card_charge_role_time" property="cardChargeRoleTime"/>
@ -66,6 +68,8 @@
card_charge_role_price,
card_charge_role_dispatch_prop,
card_charge_role_invitation_prop,
card_charge_role_dispatch_renew_prop,
card_charge_role_invitation_renew_prop,
card_charge_role_type,
card_charge_role_person_number,
card_charge_role_time,
@ -83,6 +87,8 @@
#{cardChargeRolePrice},
#{cardChargeRoleDispatchProp},
#{cardChargeRoleInvitationProp},
#{cardChargeRoleDispatchRenewProp},
#{cardChargeRoleInvitationRenewProp},
#{cardChargeRoleType},
#{cardChargeRolePersonNumber},
#{cardChargeRoleTime},
@ -142,6 +148,12 @@
<if test="cardChargeRoleInvitationProp != null">
card_charge_role_invitation_prop = #{cardChargeRoleInvitationProp},
</if>
<if test="cardChargeRoleDispatchRenewProp != null">
card_charge_role_dispatch_renew_prop = #{cardChargeRoleDispatchRenewProp},
</if>
<if test="cardChargeRoleInvitationRenewProp != null">
card_charge_role_invitation_renew_prop = #{cardChargeRoleInvitationRenewProp},
</if>
<if test="cardChargeRolePersonNumber != null">
card_charge_role_person_number = #{cardChargeRolePersonNumber},
</if>
@ -175,7 +187,9 @@
t1.card_charge_role_time,
t1.card_charge_role_remark,
t1.card_charge_role_id,
t1.card_charge_role_order
t1.card_charge_role_order,
t1.card_charge_role_dispatch_renew_prop,
t1.card_charge_role_invitation_renew_prop
FROM
e_card_charge_role t1
WHERE
@ -203,7 +217,9 @@
t1.gmt_create,
t1.modifier,
t1.gmt_modified,
t1.is_delete
t1.is_delete,
t1.card_charge_role_dispatch_renew_prop,
t1.card_charge_role_invitation_renew_prop
FROM
e_card_charge_role t1
WHERE
@ -231,7 +247,9 @@
t1.gmt_create,
t1.modifier,
t1.gmt_modified,
t1.is_delete
t1.is_delete,
t1.card_charge_role_dispatch_renew_prop,
t1.card_charge_role_invitation_renew_prop
FROM
e_card_charge_role t1
WHERE
@ -260,7 +278,9 @@
t1.modifier,
t1.gmt_modified,
t1.is_delete,
t1.card_charge_role_order
t1.card_charge_role_order,
t1.card_charge_role_dispatch_renew_prop,
t1.card_charge_role_invitation_renew_prop
FROM
e_card_charge_role t1
WHERE

21
src/main/resources/templates/cardchargerole/list.html
View File

@ -155,7 +155,7 @@
return rowData + ' <span style="color: red">RMB</span>';
}
},
{field: 'cardChargeRoleDispatchProp', width: 180, title: '转发邀请提成比例', align:'center',
{field: 'cardChargeRoleDispatchProp', width: 120, title: '转发(首次)', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
@ -164,7 +164,24 @@
return rowData + "%";
}
},
{field: 'cardChargeRoleInvitationProp', width: 180, title: '邀请码邀请提成比例', align:'center',
{field: 'cardChargeRoleInvitationProp', width: 120, title: '邀请码(首次)', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData + "%";
}
},{field: 'cardChargeRoleDispatchRenewProp', width: 120, title: '转发(续费)', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-';
}
return rowData + "%";
}
},
{field: 'cardChargeRoleInvitationRenewProp', width: 120, title: '邀请码(续费)', align:'center',
templet: function(row) {
var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {

24
src/main/resources/templates/cardchargerole/save.html
View File

@ -73,7 +73,7 @@
</div>
<div class="layui-form-item layui-row" pane >
<div class="layui-col-lg6" >
<label class="layui-form-label">转发<span style="color: red">*</span></label>
<label class="layui-form-label">转发(首次)<span style="color: red">*</span></label>
<div class="layui-input-block">
<input style="width:70%;float: left" type="number" step="0.01" id="cardChargeRoleDispatchProp" name="cardChargeRoleDispatchProp" class="layui-input" value="" placeholder="请输入转发邀请的提成比例" lay-verify="required">
<div type="button" onclick="javascript:void(0);" class="layui-btn layui-btn-sm" style="height:38px;width:30%;">
@ -82,7 +82,7 @@
</div>
</div>
<div class="layui-col-lg6" >
<label class="layui-form-label">邀请码<span style="color: red">*</span></label>
<label class="layui-form-label">邀请码(首次)<span style="color: red">*</span></label>
<div class="layui-input-block">
<input style="width:70%;float: left" type="number" step="0.01" id="cardChargeRoleInvitationProp" name="cardChargeRoleInvitationProp" class="layui-input" value="" placeholder="请输入邀请码邀请的提成比例" lay-verify="required">
<div type="button" onclick="javascript:void(0);" class="layui-btn layui-btn-sm" style="height:38px;width:30%;">
@ -91,6 +91,26 @@
</div>
</div>
</div>
<div class="layui-form-item layui-row" pane >
<div class="layui-col-lg6" >
<label class="layui-form-label">转发(续费)<span style="color: red">*</span></label>
<div class="layui-input-block">
<input style="width:70%;float: left" type="number" step="0.01" id="cardChargeRoleDispatchRenewProp" name="cardChargeRoleDispatchRenewProp" class="layui-input" value="" placeholder="请输入转发邀请的提成比例" lay-verify="required">
<div type="button" onclick="javascript:void(0);" class="layui-btn layui-btn-sm" style="height:38px;width:30%;">
<i class="fa fa-sm fa-bar-chart " style="margin-top:10px;"></i>&nbsp;转发提成比例
</div>
</div>
</div>
<div class="layui-col-lg6" >
<label class="layui-form-label">邀请码(续费)<span style="color: red">*</span></label>
<div class="layui-input-block">
<input style="width:70%;float: left" type="number" step="0.01" id="cardChargeRoleInvitationRenewProp" name="cardChargeRoleInvitationRenewProp" class="layui-input" value="" placeholder="请输入邀请码邀请的提成比例" lay-verify="required">
<div type="button" onclick="javascript:void(0);" class="layui-btn layui-btn-sm" style="height:38px;width:30%;">
<i class="fa fa-sm fa-bar-chart " style="margin-top:10px;"></i>&nbsp;邀请码提成比例
</div>
</div>
</div>
</div>
<div class="layui-form-item layui-row" >
<div class="layui-col-lg6" >
<label class="layui-form-label">排序</label>

27
src/main/resources/templates/cardchargerole/update.html
View File

@ -73,7 +73,7 @@
</div>
<div class="layui-form-item layui-row" pane >
<div class="layui-col-lg6" >
<label class="layui-form-label">转发<span style="color: red">*</span></label>
<label class="layui-form-label">转发(首次)<span style="color: red">*</span></label>
<div class="layui-input-block">
<input style="width:70%;float: left" type="number" step="0.01" id="cardChargeRoleDispatchProp" name="cardChargeRoleDispatchProp" class="layui-input" value="" placeholder="请输入转发邀请的提成比例" lay-verify="required">
<div type="button" onclick="javascript:void(0);" class="layui-btn layui-btn-sm" style="height:38px;width:30%;">
@ -82,7 +82,7 @@
</div>
</div>
<div class="layui-col-lg6" >
<label class="layui-form-label">邀请码<span style="color: red">*</span></label>
<label class="layui-form-label">邀请码(首次)<span style="color: red">*</span></label>
<div class="layui-input-block">
<input style="width:70%;float: left" type="number" step="0.01" id="cardChargeRoleInvitationProp" name="cardChargeRoleInvitationProp" class="layui-input" value="" placeholder="请输入邀请码邀请的提成比例" lay-verify="required">
<div type="button" onclick="javascript:void(0);" class="layui-btn layui-btn-sm" style="height:38px;width:30%;">
@ -91,6 +91,26 @@
</div>
</div>
</div>
<div class="layui-form-item layui-row" pane >
<div class="layui-col-lg6" >
<label class="layui-form-label">转发(续费)<span style="color: red">*</span></label>
<div class="layui-input-block">
<input style="width:70%;float: left" type="number" step="0.01" id="cardChargeRoleDispatchRenewProp" name="cardChargeRoleDispatchRenewProp" class="layui-input" value="" placeholder="请输入转发邀请的提成比例" lay-verify="required">
<div type="button" onclick="javascript:void(0);" class="layui-btn layui-btn-sm" style="height:38px;width:30%;">
<i class="fa fa-sm fa-bar-chart " style="margin-top:10px;"></i>&nbsp;转发提成比例
</div>
</div>
</div>
<div class="layui-col-lg6" >
<label class="layui-form-label">邀请码(续费)<span style="color: red">*</span></label>
<div class="layui-input-block">
<input style="width:70%;float: left" type="number" step="0.01" id="cardChargeRoleInvitationRenewProp" name="cardChargeRoleInvitationRenewProp" class="layui-input" value="" placeholder="请输入邀请码邀请的提成比例" lay-verify="required">
<div type="button" onclick="javascript:void(0);" class="layui-btn layui-btn-sm" style="height:38px;width:30%;">
<i class="fa fa-sm fa-bar-chart " style="margin-top:10px;"></i>&nbsp;邀请码提成比例
</div>
</div>
</div>
</div>
<div class="layui-form-item layui-row" >
<div class="layui-col-lg6" >
<label class="layui-form-label">排序</label>
@ -228,8 +248,9 @@
// 提交表单
form.on('submit(submitForm)', function(formData) {
top.dialog.confirm(top.dataMessage.commit, function(index) {
top.dialog.close(index);
top.layer.close(index);
var loadLayerIndex;
return;
formData.field['cardChargeRoleStatus'] = formData.field['cardChargeRoleStatus'] == "1" ? "1" : "0";
top.restAjax.put(top.restAjax.path('api/cardchargerole/update/{cardChargeRoleId}', [cardChargeRoleId]), formData.field, null, function(code, data) {
var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, {