|
|
@@ -14,12 +14,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.cyksj.common.annotation.Log;
|
|
|
import com.cyksj.common.annotation.NoSubmit;
|
|
|
import com.cyksj.common.exception.BusinessRuntimeException;
|
|
|
+import com.cyksj.common.util.SmsUtil;
|
|
|
import com.cyksj.dto.Result;
|
|
|
import com.cyksj.enums.BusinessType;
|
|
|
import com.cyksj.enums.GatewayResponse;
|
|
|
import com.cyksj.mapper.*;
|
|
|
import com.cyksj.mapper.manage.AccountDeletedRecordMapper;
|
|
|
import com.cyksj.mapper.manage.cms.CmsUserMapper;
|
|
|
+import com.cyksj.mapper.market.task.UserBindDetailMapper;
|
|
|
import com.cyksj.model.entity.*;
|
|
|
import com.cyksj.model.excel.ExcelExpiredAccountData;
|
|
|
import com.cyksj.model.excel.ExcelImportAccountData;
|
|
|
@@ -99,6 +101,8 @@ public class CmsAccountController {
|
|
|
|
|
|
private final CouponCommonService couponCommonService;
|
|
|
|
|
|
+ private final UserBindDetailMapper userBindDetailMapper;
|
|
|
+
|
|
|
@GetMapping("/get")
|
|
|
@SaCheckPermission("account:view")
|
|
|
public Result<SearchResult<AccountView>> get(Long userId ,String nickName ,String submitAccount ,String expiryStartTime, String expiryEndTime) {
|
|
|
@@ -653,7 +657,24 @@ public class CmsAccountController {
|
|
|
accountDeletedRecord.setRelationExpireTime(expiryTime);
|
|
|
if (userId != 0) {
|
|
|
//发送5元优惠券
|
|
|
- couponCommonService.sendCouponToUser(userId, xx, 0, 0, 0, CouponUser.Channel.manual);
|
|
|
+ couponCommonService.sendCouponToUser(userId, 89l, 0l, 0l, 0l, CouponUser.Channel.manual);
|
|
|
+ //发送短信通知
|
|
|
+ User user = userMapper.selectById(userId);
|
|
|
+ String phone = null;
|
|
|
+ if (user != null) {
|
|
|
+ phone = user.getLoginPhone();
|
|
|
+ if (StrUtil.isEmpty(phone)) {
|
|
|
+ UserBindDetail userBindDetail = userBindDetailMapper.selectById(userId);
|
|
|
+ if (userBindDetail != null) {
|
|
|
+ phone = userBindDetail.getPhone();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (StrUtil.isNotBlank(phone)) {
|
|
|
+ String msg = goodsDon != null ? goodsDon.getTitle() : "车票";
|
|
|
+ SmsUtil.sendLuoKey2Msg(phone, "xx");
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
accountDeletedRecordMapper.insert(accountDeletedRecord);
|
|
|
log.info("记录用户:{}被删除车票入库", view.getUserId());
|
zoujiajian