angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:6e51f999d7c0711418925468b3cfd273d1ede4b8
Branches Tags
angelo:master
angelo:online
angelo:test
angelo:dev
..
compare: angelo:43f6119e4b69b5c63f36e50e88771557d2ee8c12
Branches Tags
angelo:online
angelo:test
angelo:dev
angelo:master

No commits in common. "6e51f999d7c0711418925468b3cfd273d1ede4b8" and "43f6119e4b69b5c63f36e50e88771557d2ee8c12" have entirely different histories.
6e51f999d7 ... 43f6119e4b

4 changed files with 12 additions and 12 deletions
Show Stats Expand all files Collapse all files

6
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisTotalVO.java
View File

@ -63,19 +63,19 @@ public class CuBonusVertexStatisTotalVO {
/** /**
* 商城专区金额 * 商城专区金额
*/ */
@Excel(name = "北大甄选", scale = 2) @Excel(name = "商城专区", scale = 2)
@BigDecimalFormat @BigDecimalFormat
private BigDecimal mainRepurAmount = BigDecimal.ZERO; private BigDecimal mainRepurAmount = BigDecimal.ZERO;
/** /**
* 商城专区金额 * 商城专区金额
*/ */
@Excel(name = "北大甄选奖金", scale = 2) @Excel(name = "商城专区奖金", scale = 2)
@BigDecimalFormat @BigDecimalFormat
private BigDecimal mainRepurBonus = BigDecimal.ZERO; private BigDecimal mainRepurBonus = BigDecimal.ZERO;
/** /**
* 商城专区金额 * 商城专区金额
*/ */
@Excel(name = "北大甄选拨比(%)", scale = 2) @Excel(name = "商城专区拨比(%)", scale = 2)
@BigDecimalFormat @BigDecimalFormat
private BigDecimal mainRepurBonusRate = BigDecimal.ZERO; private BigDecimal mainRepurBonusRate = BigDecimal.ZERO;

2
bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisVO.java
View File

@ -55,7 +55,7 @@ public class CuBonusVertexStatisVO {
/** /**
* 商城专区金额 * 商城专区金额
*/ */
@Excel(name = "北大甄选", scale = 2) @Excel(name = "商城专区", scale = 2)
@BigDecimalFormat @BigDecimalFormat
private BigDecimal mainRepurAmount = BigDecimal.ZERO; private BigDecimal mainRepurAmount = BigDecimal.ZERO;
/** /**

8
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderType.java
View File

@ -41,13 +41,13 @@ public enum EOrderType {
RETAIL_REGISTER(41, "精品专区", 0), RETAIL_REGISTER(41, "精品专区", 0),
/** /**
* 复购专区 -- 甄选专区（使用精品专区的商品） * 甄选专区 -- 甄选专区
*/ */
RETAIL_UPGRADE(42, "复购专区", 0), RETAIL_UPGRADE(42, "甄选专区", 0),
/** /**
* 北大甄选 -- 商城专区 * 商城专区 -- 复购专区
*/ */
RETAIL_REPURCHASE(43, "北大甄选", 0), RETAIL_REPURCHASE(43, "商城专区", 0),
/** /**
* 重消订单 * 重消订单
*/ */

8
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java
View File

@ -35,13 +35,13 @@ public enum ESpecialArea {
*/ */
RETAIL_REGISTER(41, "精品专区", 0, 41, -1), RETAIL_REGISTER(41, "精品专区", 0, 41, -1),
/** /**
* 复购专区 -- 甄选专区（使用精品专区的商品） * 甄选专区
*/ */
RETAIL_UPGRADE(42, "复购专区", 0, 42, -1), RETAIL_UPGRADE(42, "甄选专区", 0, 42, -1),
/** /**
* 北大甄选 -- 商城专区 * 商城专区
*/ */
RETAIL_REPURCHASE(43, "北大甄选", 0, 43, -1), RETAIL_REPURCHASE(43, "商城专区", 0, 43, -1),
/** /**
* 重消专区 * 重消专区
*/ */