Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
S
shop-Mall
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
shop-Mall
Commits
5a5d8274
Commit
5a5d8274
authored
Mar 12, 2021
by
codezwjava
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单获取定时任务测试11
parent
99b25759
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
101 additions
and
28 deletions
+101
-28
AccountMapper.java
...pper/src/main/java/cn/wisenergy/mapper/AccountMapper.java
+7
-0
OrderMapper.java
...mapper/src/main/java/cn/wisenergy/mapper/OrderMapper.java
+2
-0
AccountInfoMapper.xml
...gy-mapper/src/main/resources/mapper/AccountInfoMapper.xml
+11
-0
OrderMapper.xml
wisenergy-mapper/src/main/resources/mapper/OrderMapper.xml
+15
-2
UsersMapper.xml
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
+3
-2
OrderInfo.java
...model/src/main/java/cn/wisenergy/model/app/OrderInfo.java
+6
-0
User.java
...ergy-model/src/main/java/cn/wisenergy/model/app/User.java
+8
-0
UserLevelService.java
.../main/java/cn/wisenergy/service/app/UserLevelService.java
+1
-0
UserLevelServiceImpl.java
...a/cn/wisenergy/service/app/impl/UserLevelServiceImpl.java
+47
-24
ShiroConfig.java
...in/src/main/java/cn/wisenergy/web/config/ShiroConfig.java
+1
-0
No files found.
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java
View file @
5a5d8274
...
@@ -52,4 +52,11 @@ public interface AccountMapper extends BaseMapper<AccountInfo> {
...
@@ -52,4 +52,11 @@ public interface AccountMapper extends BaseMapper<AccountInfo> {
* @return 账户信息
* @return 账户信息
*/
*/
AccountInfo
getByUserIdAndTime
(
@Param
(
"userId"
)
String
userId
,
@Param
(
"yearMonth"
)
String
yearMonth
);
AccountInfo
getByUserIdAndTime
(
@Param
(
"userId"
)
String
userId
,
@Param
(
"yearMonth"
)
String
yearMonth
);
/**
* 修改用户的当月收益个累计收益
* @param accountInfo
* @return
*/
int
updateEarningsMonthAndEarningsTotalByid
(
AccountInfo
accountInfo
);
}
}
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/OrderMapper.java
View file @
5a5d8274
...
@@ -56,4 +56,6 @@ public interface OrderMapper extends BaseMapper<OrderInfo> {
...
@@ -56,4 +56,6 @@ public interface OrderMapper extends BaseMapper<OrderInfo> {
* @return 订单列表
* @return 订单列表
*/
*/
List
<
OrderInfo
>
getByCreateTime
(
@Param
(
"created"
)
Date
created
);
List
<
OrderInfo
>
getByCreateTime
(
@Param
(
"created"
)
Date
created
);
List
<
OrderInfo
>
getByLevelStatus
(
int
levelStatus
);
}
}
wisenergy-mapper/src/main/resources/mapper/AccountInfoMapper.xml
View file @
5a5d8274
...
@@ -103,4 +103,15 @@
...
@@ -103,4 +103,15 @@
</where>
</where>
</select>
</select>
<update
id=
"updateEarningsMonthAndEarningsTotalByid"
parameterType=
"cn.wisenergy.model.app.AccountInfo"
>
UPDATE
<include
refid=
"table"
/>
<set>
<include
refid=
"updateCondition"
/>
</set>
<where>
id = #{id}
</where>
</update>
</mapper>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/OrderMapper.xml
View file @
5a5d8274
...
@@ -17,6 +17,7 @@
...
@@ -17,6 +17,7 @@
<result
column=
"success_time"
property=
"successTime"
/>
<result
column=
"success_time"
property=
"successTime"
/>
<result
column=
"payment"
property=
"payment"
/>
<result
column=
"payment"
property=
"payment"
/>
<result
column=
"rebate_status"
property=
"rebateStatus"
/>
<result
column=
"rebate_status"
property=
"rebateStatus"
/>
<result
column=
"level_status"
property=
"levelStatus"
/>
<result
column=
"month_order_status"
property=
"monthOrderStatus"
/>
<result
column=
"month_order_status"
property=
"monthOrderStatus"
/>
<result
column=
"monthly_task_status"
property=
"monthlyTaskStatus"
/>
<result
column=
"monthly_task_status"
property=
"monthlyTaskStatus"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"create_time"
property=
"createTime"
/>
...
@@ -34,13 +35,13 @@
...
@@ -34,13 +35,13 @@
<sql
id=
"cols_exclude_id"
>
<sql
id=
"cols_exclude_id"
>
buyer_id,item_id,pay_type,youzan_update_time,tid,created,team_type,pay_time,pay_type_str,close_type,refund_state,
buyer_id,item_id,pay_type,youzan_update_time,tid,created,team_type,pay_time,pay_type_str,close_type,refund_state,
success_time,payment,rebate_status,month_order_status,monthly_task_status,create_time,update_time
success_time,payment,rebate_status,
level_status,
month_order_status,monthly_task_status,create_time,update_time
</sql>
</sql>
<sql
id=
"vals"
>
<sql
id=
"vals"
>
#{buyerId},#{itemId},#{payType},#{youzanUpdateTime}, #{tid},#{created},#{teamType},#{payTime},#{payTypeStr},
#{buyerId},#{itemId},#{payType},#{youzanUpdateTime}, #{tid},#{created},#{teamType},#{payTime},#{payTypeStr},
#{closeType},#{refundState},#{successTime},#{payment},
#{closeType},#{refundState},#{successTime},#{payment},
#{rebateStatus},#{monthOrderStatus},#{monthlyTaskStatus},now(),now()
#{rebateStatus},#{
levelStatus},#{
monthOrderStatus},#{monthlyTaskStatus},now(),now()
</sql>
</sql>
<sql
id=
"updateCondition"
>
<sql
id=
"updateCondition"
>
...
@@ -58,6 +59,7 @@
...
@@ -58,6 +59,7 @@
<if
test=
"successTime != null"
>
success_time =#{successTime},
</if>
<if
test=
"successTime != null"
>
success_time =#{successTime},
</if>
<if
test=
"payment != null"
>
payment =#{payment},
</if>
<if
test=
"payment != null"
>
payment =#{payment},
</if>
<if
test=
"rebateStatus != null"
>
rebate_status =#{rebateStatus},
</if>
<if
test=
"rebateStatus != null"
>
rebate_status =#{rebateStatus},
</if>
<if
test=
"levelStatus != null"
>
level_status =#{levelStatus},
</if>
<if
test=
"monthOrderStatus != null"
>
month_order_status =#{monthOrderStatus},
</if>
<if
test=
"monthOrderStatus != null"
>
month_order_status =#{monthOrderStatus},
</if>
<if
test=
"monthlyTaskStatus != null"
>
monthly_task_status =#{monthlyTaskStatus},
</if>
<if
test=
"monthlyTaskStatus != null"
>
monthly_task_status =#{monthlyTaskStatus},
</if>
update_time =now()
update_time =now()
...
@@ -79,6 +81,7 @@
...
@@ -79,6 +81,7 @@
<if
test=
"successTime != null"
>
and success_time =#{successTime}
</if>
<if
test=
"successTime != null"
>
and success_time =#{successTime}
</if>
<if
test=
"payment != null"
>
and payment =#{payment}
</if>
<if
test=
"payment != null"
>
and payment =#{payment}
</if>
<if
test=
"rebateStatus != null"
>
and rebate_status =#{rebateStatus}
</if>
<if
test=
"rebateStatus != null"
>
and rebate_status =#{rebateStatus}
</if>
<if
test=
"levelStatus != null"
>
and level_status =#{levelStatus}
</if>
<if
test=
"monthOrderStatus != null"
>
and month_order_status =#{monthOrderStatus}
</if>
<if
test=
"monthOrderStatus != null"
>
and month_order_status =#{monthOrderStatus}
</if>
<if
test=
"monthlyTaskStatus != null"
>
and monthly_task_status =#{monthlyTaskStatus}
</if>
<if
test=
"monthlyTaskStatus != null"
>
and monthly_task_status =#{monthlyTaskStatus}
</if>
<if
test=
"createTime != null"
>
and create_time
>
= #{createTime}
</if>
<if
test=
"createTime != null"
>
and create_time
>
= #{createTime}
</if>
...
@@ -153,4 +156,14 @@
...
@@ -153,4 +156,14 @@
</where>
</where>
</select>
</select>
<select
id=
"getByLevelStatus"
resultType=
"cn.wisenergy.model.app.OrderInfo"
>
SELECT
<include
refid=
"cols_all"
/>
from
<include
refid=
"table"
/>
<where>
level_status=#{levelStatus}
</where>
</select>
</mapper>
</mapper>
\ No newline at end of file
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @
5a5d8274
...
@@ -108,9 +108,10 @@
...
@@ -108,9 +108,10 @@
<select
id=
"getByUserId"
resultType=
"cn.wisenergy.model.app.User"
parameterType=
"string"
>
<select
id=
"getByUserId"
resultType=
"cn.wisenergy.model.app.User"
parameterType=
"string"
>
select
select
<include
refid=
"cols_all"
/>
id,user_id,password,head_image,user_level,cross_border_line,id_card_number,fans_nickname,fans_id, invite_code,
be_invited_code,create_time,update_time
from
from
<include
refid=
"table"
/>
user_info
<where>
<where>
user_id=#{userId}
user_id=#{userId}
</where>
</where>
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/app/OrderInfo.java
View file @
5a5d8274
...
@@ -110,6 +110,12 @@ public class OrderInfo {
...
@@ -110,6 +110,12 @@ public class OrderInfo {
@ApiModelProperty
(
name
=
"rebateStatus"
,
value
=
"返佣状态"
)
@ApiModelProperty
(
name
=
"rebateStatus"
,
value
=
"返佣状态"
)
private
Integer
rebateStatus
;
private
Integer
rebateStatus
;
/**
* 升级状态 0:该笔订单已做升级处理 1: 该笔订单未做升级处理
*/
@ApiModelProperty
(
name
=
"levelStatus"
,
value
=
"升级状态"
)
private
Integer
levelStatus
;
/**
/**
* 当月订单处理状态 0: 未处理 1:处理
* 当月订单处理状态 0: 未处理 1:处理
*/
*/
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
View file @
5a5d8274
...
@@ -100,4 +100,12 @@ public class User extends Model<User> implements Serializable{
...
@@ -100,4 +100,12 @@ public class User extends Model<User> implements Serializable{
*/
*/
@ApiModelProperty
(
name
=
"updateTime"
,
value
=
"修改时间"
)
@ApiModelProperty
(
name
=
"updateTime"
,
value
=
"修改时间"
)
private
Date
updateTime
;
private
Date
updateTime
;
public
String
getUserId
()
{
return
userId
;
}
public
void
setUserId
(
String
userId
)
{
this
.
userId
=
userId
;
}
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLevelService.java
View file @
5a5d8274
...
@@ -2,4 +2,5 @@ package cn.wisenergy.service.app;
...
@@ -2,4 +2,5 @@ package cn.wisenergy.service.app;
public
interface
UserLevelService
{
public
interface
UserLevelService
{
void
userLevelUpgrade
(
String
userId
);
void
userLevelUpgrade
(
String
userId
);
void
userLevelUp
();
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLevelServiceImpl.java
View file @
5a5d8274
This diff is collapsed.
Click to expand it.
wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/ShiroConfig.java
View file @
5a5d8274
...
@@ -75,6 +75,7 @@ public class ShiroConfig {
...
@@ -75,6 +75,7 @@ public class ShiroConfig {
filterChainDefinitionMap
.
put
(
"/webSocket/**"
,
"anon"
);
//socket
filterChainDefinitionMap
.
put
(
"/webSocket/**"
,
"anon"
);
//socket
filterChainDefinitionMap
.
put
(
"/message/**"
,
"anon"
);
//消息推送接口
filterChainDefinitionMap
.
put
(
"/message/**"
,
"anon"
);
//消息推送接口
filterChainDefinitionMap
.
put
(
"/**"
,
"oauth2"
);
// 其他路径均需要身份认证,一般位于最下面,优先级最低
filterChainDefinitionMap
.
put
(
"/**"
,
"oauth2"
);
// 其他路径均需要身份认证,一般位于最下面,优先级最低
filterChainDefinitionMap
.
put
(
"/userlevel/test"
,
"anon"
);
// 设置拦截器
// 设置拦截器
shiroFilterFactoryBean
.
setFilterChainDefinitionMap
(
filterChainDefinitionMap
);
shiroFilterFactoryBean
.
setFilterChainDefinitionMap
(
filterChainDefinitionMap
);
...
...
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