Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
D
data-server
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
licc
data-server
Commits
c0fa4d7d
Commit
c0fa4d7d
authored
Mar 30, 2021
by
m1991
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
e24177fa
06fc9a82
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
28 additions
and
39 deletions
+28
-39
ImageUtil.java
...on/src/main/java/cn/wisenergy/common/utils/ImageUtil.java
+1
-1
TradeRecordMapper.xml
...gy-mapper/src/main/resources/mapper/TradeRecordMapper.xml
+9
-21
AerialDeliveryUserServiceImpl.java
...nergy/service/app/impl/AerialDeliveryUserServiceImpl.java
+2
-1
UserLevelServiceImpl.java
...a/cn/wisenergy/service/app/impl/UserLevelServiceImpl.java
+5
-2
WalletServiceImpl.java
...java/cn/wisenergy/service/app/impl/WalletServiceImpl.java
+1
-2
AccountController.java
...wisenergy/web/admin/controller/app/AccountController.java
+3
-5
MemberController.java
.../wisenergy/web/admin/controller/app/MemberController.java
+1
-1
PrizeController.java
...n/wisenergy/web/admin/controller/app/PrizeController.java
+1
-1
SettingController.java
...wisenergy/web/admin/controller/app/SettingController.java
+1
-1
TeamController.java
...cn/wisenergy/web/admin/controller/app/TeamController.java
+1
-1
TradeRecordController.java
...nergy/web/admin/controller/app/TradeRecordController.java
+1
-1
ShiroConfig.java
...in/src/main/java/cn/wisenergy/web/config/ShiroConfig.java
+2
-2
No files found.
wisenergy-common/src/main/java/cn/wisenergy/common/utils/ImageUtil.java
View file @
c0fa4d7d
...
...
@@ -26,7 +26,7 @@ public class ImageUtil {
BufferedImage
image
=
new
BufferedImage
(
bgWidth
,
bgHeight
,
BufferedImage
.
TYPE_INT_RGB
);
Graphics2D
g
=
image
.
createGraphics
();
g
.
drawImage
(
srcImage
,
0
,
0
,
bgWidth
,
bgHeight
,
null
);
g
.
drawImage
(
waterImage
,
bgWidth
-
150
,
bgHeight
-
15
0
,
waterImage
.
getWidth
(),
waterImage
.
getHeight
(),
null
);
g
.
drawImage
(
waterImage
,
bgWidth
-
200
,
bgHeight
-
20
0
,
waterImage
.
getWidth
(),
waterImage
.
getHeight
(),
null
);
g
.
dispose
();
ByteArrayOutputStream
out
=
new
ByteArrayOutputStream
();
ImageIO
.
write
(
image
,
"jpg"
,
out
);
...
...
wisenergy-mapper/src/main/resources/mapper/TradeRecordMapper.xml
View file @
c0fa4d7d
...
...
@@ -90,34 +90,22 @@
</where>
</select>
<select
id=
"getByUserIdAndTime"
resultType=
"cn.wisenergy.model.app.TradeRecord"
>
select
<include
refid=
"cols_all"
/>
from
<include
refid=
"table"
/>
<where>
trade_type !=1
<if
test=
"userId"
>
and user_id=#{userId}
</if>
<if
test=
"yearMonth != null"
>
AND(
YEAR(create_time) = YEAR(#{yearMonth})
AND MONTH(create_time) = MONTH(#{yearMonth}))
</if>
</where>
</select>
<select
id=
"getSixMonthIncome"
resultType=
"cn.wisenergy.model.vo.AccumulatedIncomeVo"
>
SELECT user_id as userId,sum(money) as income ,
date_format(create_time,'%Y-%m') as yearMonth
select a.user_id as userId,a.money as income,date_format(a.create_time,'%Y-%m') as yearMonth
FROM trade_record as a right join (SELECT user_id ,trade_type,
date_format(create_time,'%Y-%m'),max(create_time) as time
FROM
<include
refid=
"table"
/>
WHERE date_format(create_time,'%Y-%m')
<
= date_format(now(),'%Y-%m')
and date_format(create_time,'%Y-%m') >= date_format(now() - interval 5 month,'%Y-%m')
and (status=1 or status=0)
and user_id=#{userId}
group by user_id ,create_time;
and trade_type in(2,4,5,7,8)
group by user_id ,trade_type,date_format(create_time,'%Y-%m')) as b on
a.user_id= b.user_id
and a.trade_type=b.trade_type
and a.create_time =b.time
ORDER BY b.time desc
</select>
<select
id=
"getWithdrawalRecord"
resultType=
"cn.wisenergy.model.vo.WithdrawalRecordVo"
>
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AerialDeliveryUserServiceImpl.java
View file @
c0fa4d7d
...
...
@@ -9,6 +9,7 @@ import cn.wisenergy.model.app.User;
import
cn.wisenergy.model.app.UserDataInfo
;
import
cn.wisenergy.service.Manager.UserDataInfoManager
;
import
cn.wisenergy.service.app.AerialDeliveryUserService
;
import
com.xxl.job.core.handler.annotation.XxlJob
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -45,7 +46,7 @@ public class AerialDeliveryUserServiceImpl implements AerialDeliveryUserService
* 随机邀请人要求 1:注册时间早于当前用户
*
*/
// @XxlJob(
)
@XxlJob
(
"aerialDeliveryUserRandjobhandler"
)
@Override
public
void
aerialDeliveryUserRand
(){
log
.
info
(
"shop-mall[]UserServiceImpl[]aerialDeliveryUserRand[]"
);
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLevelServiceImpl.java
View file @
c0fa4d7d
...
...
@@ -57,6 +57,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
@Override
@Transactional
public
void
userLevelUpgrade
(
String
userId
)
{
log
.
info
(
"--------------------当前用户id:"
+
userId
);
//当前用户对象
User
user
=
usersMapper
.
getByUserId
(
userId
);
//当前用户直推表对象
...
...
@@ -65,6 +66,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
TeamUserInfo
teamUserInfoMapperByUserId
=
teamUserInfoMapper
.
getByUserId
(
userId
);
//当前用户等级
Integer
userLevel
=
user
.
getUserLevel
();
log
.
info
(
"---------------当前用户等级:"
+
userLevel
);
//当前用户的累计消费
BigDecimal
performanceByUserid
=
new
BigDecimal
(
0
);
if
(
userLevel
==
0
){
...
...
@@ -76,7 +78,8 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
}
//当前用户的推荐人邀请码
String
beInvitedCode
=
user
.
getBeInvitedCode
();
//
log
.
info
(
"--------------------当前用户的邀请码:"
+
beInvitedCode
);
String
inviteUserId
=
""
;
RecommendUser
inviteRecommendUser
=
new
RecommendUser
();
//若当前用户的推荐人邀请码是 “1” 时 则当前用户没有邀请人
...
...
@@ -85,6 +88,7 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
User
byBeInvitedCode
=
usersMapper
.
getByBeInvitedCode
(
beInvitedCode
);
if
(
null
!=
byBeInvitedCode
)
{
inviteUserId
=
byBeInvitedCode
.
getUserId
();
log
.
info
(
"-------------------推荐人userid"
+
inviteUserId
);
//邀请人的直推用户信息
inviteRecommendUser
=
recommendUserMapper
.
getByUserId
(
inviteUserId
);
}
...
...
@@ -662,7 +666,6 @@ public class UserLevelServiceImpl extends ServiceImpl<UsersMapper, User> impleme
cultivatingPrizeInfo
.
setSeedling
(
seedling
);
cultivatingPrizeInfoMapper
.
updateById
(
cultivatingPrizeInfo
);
}
}
}
}
else
if
(
2
==
level
)
{
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/WalletServiceImpl.java
View file @
c0fa4d7d
...
...
@@ -11,7 +11,6 @@ import cn.wisenergy.model.app.TradeRecord;
import
cn.wisenergy.model.enums.TradeRecordEnum
;
import
cn.wisenergy.model.vo.*
;
import
cn.wisenergy.service.app.WalletService
;
import
io.swagger.models.auth.In
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -110,7 +109,7 @@ public class WalletServiceImpl implements WalletService {
return
R
.
error
(
"入参为空!"
);
}
//获取
不
包括本月在内的六个月的收益
//获取包括本月在内的六个月的收益
List
<
AccumulatedIncomeVo
>
list
=
tradeRecordMapper
.
getSixMonthIncome
(
userId
);
return
R
.
ok
(
list
);
}
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/AccountController.java
View file @
c0fa4d7d
...
...
@@ -13,7 +13,6 @@ import lombok.extern.slf4j.Slf4j;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
/**
...
...
@@ -21,7 +20,6 @@ import org.springframework.web.bind.annotation.RestController;
*/
@Api
(
tags
=
"账户管理"
)
@RestController
@RequestMapping
(
"/account"
)
@Slf4j
public
class
AccountController
extends
BaseController
{
@Autowired
...
...
@@ -29,7 +27,7 @@ public class AccountController extends BaseController {
@ApiOperation
(
value
=
"获取账户信息"
,
notes
=
"获取账户信息"
,
httpMethod
=
"GET"
)
@ApiImplicitParam
(
name
=
"userId"
,
value
=
"用户id"
,
dataType
=
"String"
)
@GetMapping
(
"/getByUserId"
)
@GetMapping
(
"/
account/
getByUserId"
)
public
R
<
AccountInfo
>
getByUserId
(
String
userId
)
{
return
accountService
.
getByUserId
(
userId
);
}
...
...
@@ -37,7 +35,7 @@ public class AccountController extends BaseController {
@ApiOperation
(
value
=
"获取账户分页列表"
,
notes
=
"获取账户分页列表"
,
httpMethod
=
"GET"
)
@ApiImplicitParam
(
name
=
"query"
,
value
=
"查询条件"
,
dataType
=
"AccountInfoQuery"
)
@GetMapping
(
"/getList"
)
@GetMapping
(
"
admin/account
/getList"
)
public
R
<
PageInfo
<
AccountInfo
>>
getList
(
AccountInfoQuery
query
)
{
return
accountService
.
getList
(
query
);
}
...
...
@@ -45,7 +43,7 @@ public class AccountController extends BaseController {
@ApiOperation
(
value
=
"设置页-版本更新"
,
notes
=
"设置页-版本更新"
,
httpMethod
=
"GET"
)
@ApiImplicitParam
(
name
=
"version"
,
value
=
"版本号"
,
dataType
=
"string"
)
@GetMapping
(
"/version"
)
@GetMapping
(
"/
account/
version"
)
public
R
<
String
>
version
(
String
version
)
{
if
(
StringUtils
.
isBlank
(
version
)){
return
R
.
error
(
"入参不能为空!"
);
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/MemberController.java
View file @
c0fa4d7d
...
...
@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@Api
(
tags
=
"会员优惠比列-后台管理"
)
@RestController
@RequestMapping
(
"/member"
)
@RequestMapping
(
"/
admin/
member"
)
@Slf4j
public
class
MemberController
{
@Autowired
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PrizeController.java
View file @
c0fa4d7d
...
...
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@Api
(
tags
=
"后台管理--进步奖"
)
@RestController
@RequestMapping
(
"/prize"
)
@RequestMapping
(
"/
admin/
prize"
)
@Slf4j
public
class
PrizeController
{
@Autowired
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SettingController.java
View file @
c0fa4d7d
...
...
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@Api
(
tags
=
"后台管理 -- 应用设置"
)
@RestController
@RequestMapping
(
"/set"
)
@RequestMapping
(
"/
admin/
set"
)
@Slf4j
public
class
SettingController
{
@Autowired
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/TeamController.java
View file @
c0fa4d7d
...
...
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@Api
(
tags
=
"团队业绩--后台管理"
)
@RestController
@RequestMapping
(
"/team"
)
@RequestMapping
(
"/
admin/
team"
)
@Slf4j
public
class
TeamController
{
@Autowired
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/TradeRecordController.java
View file @
c0fa4d7d
...
...
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
*/
@Api
(
tags
=
"交易流水-后台管理"
)
@RestController
@RequestMapping
(
"/trade"
)
@RequestMapping
(
"/
admin/
trade"
)
@Slf4j
public
class
TradeRecordController
{
@Autowired
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/ShiroConfig.java
View file @
c0fa4d7d
...
...
@@ -73,8 +73,8 @@ public class ShiroConfig {
filterChainDefinitionMap
.
put
(
"/api/sms/**"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/upload_flowChart/**"
,
"anon"
);
//图片地址
filterChainDefinitionMap
.
put
(
"/userlevel/test"
,
"anon"
);
//
后台设置
filterChainDefinitionMap
.
put
(
"/
set
/**"
,
"anon"
);
//
管理端
filterChainDefinitionMap
.
put
(
"/
admin
/**"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/customerService/uploadWeChatImg"
,
"anon"
);
filterChainDefinitionMap
.
put
(
"/customerService/service"
,
"anon"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment