Compare commits

...

2 Commits

4 changed files with 12 additions and 12 deletions

View File

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

View File

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

View File

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

View File

@ -35,13 +35,13 @@ public enum ESpecialArea {
*/
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),
/**
* 重消专区
*/