|
@@ -3,7 +3,6 @@ package com.cyksj.web.controller.distribute;
|
|
|
import cn.hutool.core.date.DateTime;
|
|
import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
-import cn.hutool.core.util.URLUtil;
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.cyksj.common.EnvCommonService;
|
|
import com.cyksj.common.EnvCommonService;
|
|
|
import com.cyksj.common.constant.Constant;
|
|
import com.cyksj.common.constant.Constant;
|
|
@@ -80,8 +79,8 @@ public class EquipmentDistributeController {
|
|
|
.eq(EquipmentUserChance::getUserId, userId).last("limit 1"));
|
|
.eq(EquipmentUserChance::getUserId, userId).last("limit 1"));
|
|
|
EquipmentDistributeView view = new EquipmentDistributeView();
|
|
EquipmentDistributeView view = new EquipmentDistributeView();
|
|
|
view.setNum(chance == null ? 0 : chance.getNum());
|
|
view.setNum(chance == null ? 0 : chance.getNum());
|
|
|
- String encodeUrl = URLUtil.encode(String.format("%syinhe/web/detail/15?sharedId=%s&dsType=%s", envCommonService.getDomain(), userId, 2));
|
|
|
|
|
- view.setUrl(encodeUrl);
|
|
|
|
|
|
|
+ String equipDistributeUrl = String.format("%syinhe/web/detail/15?sharedId=%s&dsType=%s", envCommonService.getDomain(), userId, 2);
|
|
|
|
|
+ view.setUrl(equipDistributeUrl);
|
|
|
SysConfig config = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class)
|
|
SysConfig config = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class)
|
|
|
.eq(SysConfig::getSysKey, Constant.EQUIPMENT_DISTRIBUTE_KEY).last("limit 1"));
|
|
.eq(SysConfig::getSysKey, Constant.EQUIPMENT_DISTRIBUTE_KEY).last("limit 1"));
|
|
|
if (config != null) {
|
|
if (config != null) {
|