|
@@ -1,10 +1,12 @@
|
|
package com.txz.mall.service.impl;
|
|
package com.txz.mall.service.impl;
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
import com.txz.mall.constants.Constants;
|
|
import com.txz.mall.constants.Constants;
|
|
import com.txz.mall.core.AbstractService;
|
|
import com.txz.mall.core.AbstractService;
|
|
import com.txz.mall.core.ServiceException;
|
|
import com.txz.mall.core.ServiceException;
|
|
import com.txz.mall.dao.UserSignMapper;
|
|
import com.txz.mall.dao.UserSignMapper;
|
|
|
|
+import com.txz.mall.dubbo.client.OperatingConfigDubboServiceClient;
|
|
import com.txz.mall.model.SystemGroupData;
|
|
import com.txz.mall.model.SystemGroupData;
|
|
import com.txz.mall.model.UserSign;
|
|
import com.txz.mall.model.UserSign;
|
|
import com.txz.mall.service.SystemGroupDataService;
|
|
import com.txz.mall.service.SystemGroupDataService;
|
|
@@ -35,6 +37,8 @@ public class UserSignServiceImpl extends AbstractService<UserSign> implements Us
|
|
private UserSignMapper userSignMapper;
|
|
private UserSignMapper userSignMapper;
|
|
@Resource
|
|
@Resource
|
|
private SystemGroupDataService systemGroupDataService;
|
|
private SystemGroupDataService systemGroupDataService;
|
|
|
|
+ @Resource
|
|
|
|
+ private OperatingConfigDubboServiceClient configDubboServiceClient;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public HashMap<String, Object> todayDetail() {
|
|
public HashMap<String, Object> todayDetail() {
|
|
@@ -51,7 +55,7 @@ public class UserSignServiceImpl extends AbstractService<UserSign> implements Us
|
|
List<SystemGroupData> systemGroupData = groupData();
|
|
List<SystemGroupData> systemGroupData = groupData();
|
|
for (SystemGroupData groupData : systemGroupData) {
|
|
for (SystemGroupData groupData : systemGroupData) {
|
|
if (StringUtils.isNotBlank(groupData.getValue())) {
|
|
if (StringUtils.isNotBlank(groupData.getValue())) {
|
|
- List<GroupDataFormItemCheckVO> fields = com.alibaba.fastjson.JSONObject.parseObject(groupData.getValue(), GroupDataFormCheckVO.class).getFields();
|
|
|
|
|
|
+ List<GroupDataFormItemCheckVO> fields = JSONObject.parseObject(groupData.getValue(), GroupDataFormCheckVO.class).getFields();
|
|
GroupDataFormItemCheckVO vo = new GroupDataFormItemCheckVO();
|
|
GroupDataFormItemCheckVO vo = new GroupDataFormItemCheckVO();
|
|
List<String> dayCollect = fields.stream().filter(field -> field.getName().equals(Constants.SIGN_TYPE_DAY_TITLE)).map(GroupDataFormItemCheckVO::getValue).collect(Collectors.toList());
|
|
List<String> dayCollect = fields.stream().filter(field -> field.getName().equals(Constants.SIGN_TYPE_DAY_TITLE)).map(GroupDataFormItemCheckVO::getValue).collect(Collectors.toList());
|
|
Integer gold = fields.stream().filter(field -> field.getName().equals(Constants.SIGN_TYPE_GOLD_TITLE)).map(GroupDataFormItemCheckVO::getValue).map(Integer::valueOf).reduce(0, Integer::sum);
|
|
Integer gold = fields.stream().filter(field -> field.getName().equals(Constants.SIGN_TYPE_GOLD_TITLE)).map(GroupDataFormItemCheckVO::getValue).map(Integer::valueOf).reduce(0, Integer::sum);
|
|
@@ -95,7 +99,7 @@ public class UserSignServiceImpl extends AbstractService<UserSign> implements Us
|
|
userSign.setUid(USER_ID);
|
|
userSign.setUid(USER_ID);
|
|
userSign.setCreateDay(new Date());
|
|
userSign.setCreateDay(new Date());
|
|
userSign.setContinuousDays(continuousDays);
|
|
userSign.setContinuousDays(continuousDays);
|
|
- userSignMapper.insert(userSign);
|
|
|
|
|
|
+ save(userSign);
|
|
}
|
|
}
|
|
|
|
|
|
// 判断今天是否已经签到
|
|
// 判断今天是否已经签到
|