创客额度相关更改逻辑
This commit is contained in:
@@ -88,38 +88,15 @@ public class UserMakerQuotaServiceImpl extends ServiceImpl<UserMakerQuotaMapper,
|
||||
Integer pageSize = size;
|
||||
Integer offset = (page-1)*size;
|
||||
UserApp userApp = userAppService.queryUserAppByToken();
|
||||
MerchantBaseInfo merchantBaseInfoByUserId = merchantBaseInfoService.getMerchantBaseInfoByUserId(String.valueOf(userApp.getUserId()));
|
||||
switch (type) {
|
||||
//额度明细
|
||||
case 1:
|
||||
List<UserMakerFlow> userMakerFlowsList = userMakerFlowMapper.selectByUserId(userApp.getUserId(), pageSize, offset);
|
||||
List<UserMakerQuotaVO> vos = new ArrayList<>();
|
||||
for (UserMakerFlow userMakerFlow : userMakerFlowsList) {
|
||||
UserMakerQuotaVO userMakerQuotaVO = new UserMakerQuotaVO();
|
||||
userMakerQuotaVO.setUserName(merchantBaseInfoByUserId == null?"下级商户":merchantBaseInfoByUserId.getAlias());
|
||||
userMakerQuotaVO.setAmount(userMakerFlow.getAmount());
|
||||
userMakerQuotaVO.setCreateTime(userMakerFlow.getCreateTime());
|
||||
if (userMakerFlow.getAmount().compareTo(new BigDecimal(BigInteger.ZERO))>0) {
|
||||
userMakerQuotaVO.setLowerAmount(userMakerFlow.getAmount().multiply(new BigDecimal("2")).setScale(2, RoundingMode.DOWN));
|
||||
}else {
|
||||
userMakerQuotaVO.setLowerAmount(userMakerFlow.getAmount());
|
||||
}
|
||||
vos.add(userMakerQuotaVO);
|
||||
}
|
||||
return vos;
|
||||
List<UserMakerQuotaVO> userMakerFlowsList = userMakerFlowMapper.selectByUserId(userApp.getUserId(), pageSize, offset);
|
||||
return userMakerFlowsList;
|
||||
//返现明细
|
||||
case 2:
|
||||
List<UserAccountFlow> userAccountFlowsList = userAccountFlowMapper.selectByUserIdType(userApp.getUserId(),pageSize, offset);
|
||||
List<UserMakerQuotaVO> userAccountVos = new ArrayList<>();
|
||||
for (UserAccountFlow userAccountFlow : userAccountFlowsList) {
|
||||
UserMakerQuotaVO userMakerQuotaVO = new UserMakerQuotaVO();
|
||||
userMakerQuotaVO.setUserName(merchantBaseInfoByUserId == null?"下级商户":merchantBaseInfoByUserId.getAlias());
|
||||
userMakerQuotaVO.setAmount(userAccountFlow.getAmount());
|
||||
userMakerQuotaVO.setCreateTime(userAccountFlow.getCreateTime());
|
||||
userMakerQuotaVO.setLowerAmount(userAccountFlow.getOrderAmount());
|
||||
userAccountVos.add(userMakerQuotaVO);
|
||||
}
|
||||
return userAccountVos;
|
||||
List<UserMakerQuotaVO> userAccountFlowsList = userAccountFlowMapper.selectByUserIdType(userApp.getUserId(),pageSize, offset);
|
||||
return userAccountFlowsList;
|
||||
}
|
||||
return new ArrayList<UserMakerQuotaVO>();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user