Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yanxuan-wx-store-sharer
Overview
Overview
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
wx
yanxuan-wx-store-sharer
Commits
3cc33c49
Commit
3cc33c49
authored
Mar 14, 2025
by
fanjiaxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
联调问题处理
parent
3b1aadff
Pipeline
#71641
passed with stages
in 57 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
+6
-7
DrmSharerConfig.java
...e/yanxuan/wx/store/sharer/biz/config/DrmSharerConfig.java
+1
-1
UserServiceImpl.java
...uan/wx/store/sharer/biz/service/impl/UserServiceImpl.java
+3
-3
SharerInfo.java
...yanxuan/wx/store/sharer/dal/meta/model/po/SharerInfo.java
+1
-1
SharerProductCommission.java
...ore/sharer/dal/meta/model/po/SharerProductCommission.java
+1
-2
No files found.
yanxuan-wx-store-sharer-biz/src/main/java/com/netease/yanxuan/wx/store/sharer/biz/config/DrmSharerConfig.java
View file @
3cc33c49
...
@@ -473,7 +473,7 @@ public class DrmSharerConfig {
...
@@ -473,7 +473,7 @@ public class DrmSharerConfig {
commissionRatio
=
commissionRatio
commissionRatio
=
commissionRatio
.
divide
(
wechatMultiplier
)
.
divide
(
wechatMultiplier
)
.
setScale
(
2
,
RoundingMode
.
HALF_UP
);
.
setScale
(
2
,
RoundingMode
.
HALF_UP
);
sharerProductCommission
.
setCommissionRatio
(
commissionRatio
);
sharerProductCommission
.
setCommissionRatio
(
commissionRatio
.
toPlainString
()
);
sharerProductCommission
.
setCommissionType
(
CommissionTypeEnum
.
PLATFORM
.
getCode
().
toString
());
sharerProductCommission
.
setCommissionType
(
CommissionTypeEnum
.
PLATFORM
.
getCode
().
toString
());
sharerProductCommission
.
setUnset
(
unsetEnum
.
getCode
());
sharerProductCommission
.
setUnset
(
unsetEnum
.
getCode
());
sharerProductCommission
.
setUpdateTime
(
now
);
sharerProductCommission
.
setUpdateTime
(
now
);
...
...
yanxuan-wx-store-sharer-biz/src/main/java/com/netease/yanxuan/wx/store/sharer/biz/service/impl/UserServiceImpl.java
View file @
3cc33c49
...
@@ -67,7 +67,7 @@ public class UserServiceImpl implements IUserService {
...
@@ -67,7 +67,7 @@ public class UserServiceImpl implements IUserService {
sharerInfo
=
new
SharerInfo
();
sharerInfo
=
new
SharerInfo
();
sharerInfo
.
setOpenId
(
userInfoVO
.
getOpenid
());
sharerInfo
.
setOpenId
(
userInfoVO
.
getOpenid
());
// 默认佣金比例
// 默认佣金比例
sharerInfo
.
setCommissionRatio
(
drmSharerConfig
.
getDefaultCommissionRatio
());
sharerInfo
.
setCommissionRatio
(
drmSharerConfig
.
getDefaultCommissionRatio
()
.
toPlainString
()
);
sharerInfo
.
setCommissionType
(
CommissionTypeEnum
.
PLATFORM
.
getCode
());
sharerInfo
.
setCommissionType
(
CommissionTypeEnum
.
PLATFORM
.
getCode
());
sharerInfo
.
setCreateTime
(
now
);
sharerInfo
.
setCreateTime
(
now
);
sharerInfo
.
setUpdateTime
(
now
);
sharerInfo
.
setUpdateTime
(
now
);
...
@@ -111,7 +111,7 @@ public class UserServiceImpl implements IUserService {
...
@@ -111,7 +111,7 @@ public class UserServiceImpl implements IUserService {
BigDecimal
commissionRatio
=
sharerInfoVO
.
getCommission_ratio
()
BigDecimal
commissionRatio
=
sharerInfoVO
.
getCommission_ratio
()
.
divide
(
wechatMultiplier
)
.
divide
(
wechatMultiplier
)
.
setScale
(
2
,
RoundingMode
.
HALF_UP
);
.
setScale
(
2
,
RoundingMode
.
HALF_UP
);
sharerInfo
.
setCommissionRatio
(
commissionRatio
);
sharerInfo
.
setCommissionRatio
(
commissionRatio
.
toPlainString
()
);
Integer
commissionType
=
null
!=
sharerInfoVO
.
getCommission_type
()
?
sharerInfoVO
.
getCommission_type
()
:
CommissionTypeEnum
.
PLATFORM
.
getCode
();
Integer
commissionType
=
null
!=
sharerInfoVO
.
getCommission_type
()
?
sharerInfoVO
.
getCommission_type
()
:
CommissionTypeEnum
.
PLATFORM
.
getCode
();
sharerInfo
.
setCommissionType
(
commissionType
);
sharerInfo
.
setCommissionType
(
commissionType
);
// 刷新缓存
// 刷新缓存
...
@@ -122,7 +122,7 @@ public class UserServiceImpl implements IUserService {
...
@@ -122,7 +122,7 @@ public class UserServiceImpl implements IUserService {
// 初始化保存
// 初始化保存
if
(
null
==
sharerInfo
.
getId
())
{
if
(
null
==
sharerInfo
.
getId
())
{
// 默认佣金比例
// 默认佣金比例
sharerInfo
.
setCommissionRatio
(
drmSharerConfig
.
getDefaultCommissionRatio
());
sharerInfo
.
setCommissionRatio
(
drmSharerConfig
.
getDefaultCommissionRatio
()
.
toPlainString
()
);
sharerInfo
.
setCommissionType
(
CommissionTypeEnum
.
PLATFORM
.
getCode
());
sharerInfo
.
setCommissionType
(
CommissionTypeEnum
.
PLATFORM
.
getCode
());
sharerInfo
.
setCreateTime
(
now
);
sharerInfo
.
setCreateTime
(
now
);
sharerInfo
.
setUpdateTime
(
now
);
sharerInfo
.
setUpdateTime
(
now
);
...
...
yanxuan-wx-store-sharer-dal/src/main/java/com/netease/yanxuan/wx/store/sharer/dal/meta/model/po/SharerInfo.java
View file @
3cc33c49
...
@@ -40,7 +40,7 @@ public class SharerInfo implements Serializable {
...
@@ -40,7 +40,7 @@ public class SharerInfo implements Serializable {
/**
/**
* 佣金比例
* 佣金比例
*/
*/
private
BigDecimal
commissionRatio
;
private
String
commissionRatio
;
/**
/**
* 分佣类型【0:平台分佣 1:机构分佣】
* 分佣类型【0:平台分佣 1:机构分佣】
*/
*/
...
...
yanxuan-wx-store-sharer-dal/src/main/java/com/netease/yanxuan/wx/store/sharer/dal/meta/model/po/SharerProductCommission.java
View file @
3cc33c49
...
@@ -8,7 +8,6 @@ import lombok.Getter;
...
@@ -8,7 +8,6 @@ import lombok.Getter;
import
lombok.RequiredArgsConstructor
;
import
lombok.RequiredArgsConstructor
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.math.BigInteger
;
import
java.math.BigInteger
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -42,7 +41,7 @@ public class SharerProductCommission implements Serializable {
...
@@ -42,7 +41,7 @@ public class SharerProductCommission implements Serializable {
/**
/**
* 佣金比例
* 佣金比例
*/
*/
private
BigDecimal
commissionRatio
;
private
String
commissionRatio
;
/**
/**
* 佣金类型
* 佣金类型
*/
*/
...
...
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