autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

Browse Source 
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
#	jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java
#	jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
This commit is contained in:
Lemon
2025-04-15 10:01:48 +08:00
parent dfb46e0fe0 4ea7ae3549
commit 2ec926c0e7
14 changed files with 265 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -134,10 +134,18 @@ public class MemberService {
if (StringUtils.isEmpty(captchaCode)) {
throw new BusinessException(ReturnCodeEnum.CODE_VERIFICATION_CODE_TIMEOUT_ERROR);
}
// 如果缓存中有，但与实际不一致，则为验证码错误
if (!StringUtils.equals(captchaCode, dto.getVerificationCode())) {
// 获取通用验证码
String commonCaptchaCode = redisCache.getCacheObject(CacheConstants.SMS_COMMON_VERIFICATION_CODE_KEY + dto.getMobileNumber());
// 缓存中的验证码或者通用验证码, 两个都不匹配, 则抛出异常
if (!StringUtils.equals(captchaCode, dto.getVerificationCode()) && !StringUtils.equals(commonCaptchaCode, dto.getVerificationCode())) {
throw new BusinessException(ReturnCodeEnum.CODE_VERIFICATION_CODE_ERROR);
}
// 如果缓存中有，但与实际不一致，则为验证码错误
// if (!StringUtils.equals(captchaCode, dto.getVerificationCode())) {
// throw new BusinessException(ReturnCodeEnum.CODE_VERIFICATION_CODE_ERROR);
// }
}
/**

23
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
View File

@@ -24,7 +24,7 @@ import com.jsowell.pile.service.PileStationInfoService;
import com.jsowell.pile.util.UserUtils;
import com.jsowell.pile.vo.web.OrderListVO;
import com.jsowell.pile.vo.web.SplitAggregateDataVO;
import com.jsowell.pile.vo.web.SplitRecordInfoVO;
import com.jsowell.pile.vo.web.SplitConfigOrderVO;
import com.jsowell.service.OrderService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -270,4 +270,25 @@ public class OrderBasicInfoController extends BaseController {
logger.info("根据汇付会员id查询分账汇总数据 params:{}, result:{}", JSON.toJSONString(dto), response);
return response;
}
/**
*
* @param dto
* @return
*/
@PostMapping("/queryMemberAggregateData")
public RestApiResponse<?> queryStationAggregateData(@RequestBody SplitConfigStationDTO dto) {
RestApiResponse<?> response = null;
try {
List<SplitConfigOrderVO> list = orderSplitRecordService.queryStationAggregateData(dto);
response = new RestApiResponse<>(list);
} catch (Exception e) {
logger.error("查询站点汇总数据 error", e);
response = new RestApiResponse<>(e);
}
logger.info("查询站点汇总数据 params:{}, result:{}", JSON.toJSONString(dto), response);
return response;
}
}