|
@@ -51,6 +51,7 @@ import java.util.Optional;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
|
|
+ * admin/用户代充值列表
|
|
|
* @author chan
|
|
* @author chan
|
|
|
* @date 2022/9/27 6:45 PM
|
|
* @date 2022/9/27 6:45 PM
|
|
|
*/
|
|
*/
|
|
@@ -148,6 +149,7 @@ public class CmsGroupRelationController {
|
|
|
public Result<String> updateRechargeStatus(@RequestBody GroupsRelationRechargeView rechargeView) {
|
|
public Result<String> updateRechargeStatus(@RequestBody GroupsRelationRechargeView rechargeView) {
|
|
|
long adminId = StpUtil.getLoginIdAsLong();
|
|
long adminId = StpUtil.getLoginIdAsLong();
|
|
|
Long relationId = rechargeView.getRelationId();
|
|
Long relationId = rechargeView.getRelationId();
|
|
|
|
|
+ String password = rechargeView.getPassword();
|
|
|
GroupsRelation relation = groupsRelationMapper.selectById(relationId);
|
|
GroupsRelation relation = groupsRelationMapper.selectById(relationId);
|
|
|
Assert.notNull(relation, "代充车票不存在");
|
|
Assert.notNull(relation, "代充车票不存在");
|
|
|
if (relation.getRenewStatus() == null || relation.getRechargeStatus() == GroupsRelation.RechargeStatus.complete) {
|
|
if (relation.getRenewStatus() == null || relation.getRechargeStatus() == GroupsRelation.RechargeStatus.complete) {
|
|
@@ -163,6 +165,9 @@ public class CmsGroupRelationController {
|
|
|
relation.setOperator(cmsUser.getNickname());
|
|
relation.setOperator(cmsUser.getNickname());
|
|
|
//邀请制家庭组链接
|
|
//邀请制家庭组链接
|
|
|
relation.setInviteLink(rechargeView.getInviteLink());
|
|
relation.setInviteLink(rechargeView.getInviteLink());
|
|
|
|
|
+ if (StrUtil.isNotEmpty(password)) {
|
|
|
|
|
+ relation.setPassword(password);
|
|
|
|
|
+ }
|
|
|
OrderDon orderDon = null;
|
|
OrderDon orderDon = null;
|
|
|
if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
|
|
if (rechargeStatus == GroupsRelation.RechargeStatus.complete) {
|
|
|
relation.setSendTime(DateTime.now());
|
|
relation.setSendTime(DateTime.now());
|