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

## 添加秒杀专区；商品添加秒杀专区字段；去掉部分乐学代金券逻辑；去掉部分枚举国际化；

This commit is contained in:
cabbage 2025-07-30 17:28:02 +08:00
parent 0a2a773c7c
commit 531f5a5cd7
49 changed files with 418 additions and 760 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICurrencyServiceApi.java
View File

@ -28,7 +28,7 @@ public interface ICurrencyServiceApi {
R<List<CurrencyDTO>> getCurrencyByPkCountryList(Set<Integer> pkCountryList);
/*
* @description: 查询需要的所有汇率
* 查询需要的所有汇率
**/
R<List<CurrencyDTO>> getCurrencyById(Set<Integer> currencyIdSet);
@ -41,7 +41,7 @@ public interface ICurrencyServiceApi {
R<CurrencyDTO> getCurrencyByPkId(Integer currencyId);
/*
* @description: 根据省查询对应的发货仓库
* 根据省查询对应的发货仓库
**/
R<BdStorehouse> queryBdStorehouseByProvince(Integer province, Integer... type);
@ -65,23 +65,4 @@ public interface ICurrencyServiceApi {
*/
R<List<CurrencyDTO>> findAll();
/*
* @description: 提供查询供应商的dubbo调用
**/
R<BdCubasdocExt> queryBdCubasdocById(Integer pkId, Integer pkCountry);
/*
* @description: 提供查询供应商的dubbo调用
**/
R<BdCubasdocExt> queryBdCustomerById(Integer pkId, Integer pkCountry);
/*
* @description: 提供查询采购组织的dubbo调用
**/
R<SysCorp> querySysCorp(Integer pkId, Integer pkCountry);
/*
* @description: 根据仓库主键查询仓库
**/
R<List<BdStorehouse>> queryStorehouseByIds(Set<Integer> storehouseIdSet, Integer pkCountry, Integer pkCorp);
}

7
bd-api/bd-api-system/src/main/java/com/hzs/system/base/dto/CurrencyDTO.java
View File

@ -5,13 +5,6 @@ import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Description:
* @Author: sui q
* @Time: 2022/9/8 15:22
* @Classname: CurrencyDTO
* @PackageName: com.hzs.system.base.dto
*/
@Data
public class CurrencyDTO implements Serializable {
private static final long serialVersionUID = 1L;

91
bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailLookExtVO.java
View File

@ -4,16 +4,15 @@ import com.hzs.common.core.annotation.BigDecimalFormat;
import com.hzs.common.core.annotation.Excel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* 余额汇总查看
*
* @author hzs
* @since 2022-08-11
*/
@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@NoArgsConstructor
@ -23,98 +22,98 @@ public class CuMemberAccountDetailLookExtVO extends CuMemberAccountDetailLookVO
/**
* 消费账户
*/
@Excel(name = "消费余额($)", scale = 2)
@Excel(name = "消费余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount1;
/**
* 消费账户
*/
@Excel(name = "可用消费($)", scale = 2)
@Excel(name = "可用消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount1;
/**
* 消费锁定账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount1;
/**
* 消费账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount1;
/**
* 现金账户
*/
@Excel(name = "现金余额($)", scale = 2)
@Excel(name = "现金余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount2;
/**
* 消费账户
*/
@Excel(name = "可用现金($)", scale = 2)
@Excel(name = "可用现金", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount2;
/**
* 现金锁定账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount2;
/**
* 现金账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount2;
/**
* 政策账户
*/
@Excel(name = "政策余额($)", scale = 2)
@Excel(name = "政策余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount3;
/**
* 政策账户
*/
@Excel(name = "可用政策($)", scale = 2)
@Excel(name = "可用政策", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount3;
/**
* 锁定政策账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount3;
/**
* 政策账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount3;
/**
* 奖金账户
*/
@Excel(name = "奖金余额($)", scale = 2)
@Excel(name = "奖金余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount4;
/**
* 奖金账户
*/
@Excel(name = "可用奖金($)", scale = 2)
@Excel(name = "可用奖金", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount4;
@ -122,21 +121,21 @@ public class CuMemberAccountDetailLookExtVO extends CuMemberAccountDetailLookVO
/**
* 奖金锁定账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount4;
/**
* 奖金账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount4;
/**
* 奖金账户锁定提现
*/
@Excel(name = "禁止提现($)", scale = 2)
@Excel(name = "禁止提现", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockWithdrawAccount4;
@ -144,182 +143,182 @@ public class CuMemberAccountDetailLookExtVO extends CuMemberAccountDetailLookVO
/**
* 重消账户
*/
@Excel(name = "重消余额($)", scale = 2)
@Excel(name = "重消余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount5;
/**
* 重消账户
*/
@Excel(name = "可用重消($)", scale = 2)
@Excel(name = "可用重消", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount5;
/**
* 锁定重消账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount5;
/**
* 重消账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount5;
/**
* 积分账户
*/
@Excel(name = "积分余额($)", scale = 2)
@Excel(name = "积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount6;
/**
* 重消账户
*/
@Excel(name = "可用积分($)", scale = 2)
@Excel(name = "可用积分", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount6;
/**
* 锁定积分账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount6;
/**
* 积分账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount6;
/**
* 鼓励账户
*/
@Excel(name = "鼓励余额($)", scale = 2)
@Excel(name = "鼓励余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount7;
/**
* 重消账户
*/
@Excel(name = "可用鼓励($)", scale = 2)
@Excel(name = "可用鼓励", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount7;
/**
* 锁定鼓励账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount7;
/**
* 鼓励账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount7;
/**
* 复购券账户
*/
@Excel(name = "复购券余额($)", scale = 2)
@Excel(name = "复购券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount8;
/**
* 重消账户
*/
@Excel(name = "可用复购券($)", scale = 2)
@Excel(name = "可用复购券", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount8;
/**
* 锁定复购券
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount8;
/**
* 复购券锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount8;
/**
* 全球积分
*/
@Excel(name = "全球积分余额($)", scale = 2)
@Excel(name = "全球积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount9;
/**
* 重消账户
*/
@Excel(name = "可用全球积分($)", scale = 2)
@Excel(name = "可用全球积分", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount9;
/**
* 锁定全球积分
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount9;
/**
* 全球积分锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount9;
/**
* 车奖积分
*/
@Excel(name = "车奖积分余额($)", scale = 2)
@Excel(name = "车奖积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount10;
/**
* 重消账户
*/
@Excel(name = "可用车奖积分($)", scale = 2)
@Excel(name = "可用车奖积分", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount10;
/**
* 锁定车奖积分
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount10;
/**
* 车奖积分锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount10;
/**
* 全球积分
*/
@Excel(name = "直播代金券余额($)", scale = 2)
@Excel(name = "直播代金券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount11;
/**
* 车奖积分
*/
@Excel(name = "乐学代金券余额($)", scale = 2)
@Excel(name = "乐学代金券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount12;

92
bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailLookVO.java
View File

@ -1,6 +1,5 @@
package com.hzs.member.account.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.hzs.common.core.annotation.BigDecimalFormat;
import com.hzs.common.core.annotation.Excel;
@ -14,9 +13,6 @@ import java.util.List;
/**
* 余额汇总查看
*
* @author hzs
* @since 2022-08-11
*/
@Data
@AllArgsConstructor
@ -62,98 +58,98 @@ public class CuMemberAccountDetailLookVO implements Serializable {
/**
* 消费账户
*/
@Excel(name = "消费余额(¥)", scale = 2)
@Excel(name = "消费余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account1;
/**
* 消费账户
*/
@Excel(name = "可用消费(¥)", scale = 2)
@Excel(name = "可用消费", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount1;
/**
* 消费锁定账户
*/
@Excel(name = "禁止消费(¥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount1;
/**
* 消费账户锁定转账
*/
@Excel(name = "禁止转账(¥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount1;
/**
* 现金账户
*/
@Excel(name = "现金余额(¥)", scale = 2)
@Excel(name = "现金余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account2;
/**
* 消费账户
*/
@Excel(name = "可用现金(¥)", scale = 2)
@Excel(name = "可用现金", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount2;
/**
* 现金锁定账户
*/
@Excel(name = "禁止消费(¥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount2;
/**
* 现金账户锁定转账
*/
@Excel(name = "禁止转账(¥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount2;
/**
* 政策账户
*/
@Excel(name = "政策余额(¥)", scale = 2)
@Excel(name = "政策余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account3;
/**
* 政策账户
*/
@Excel(name = "可用政策(¥)", scale = 2)
@Excel(name = "可用政策", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount3;
/**
* 锁定政策账户
*/
@Excel(name = "禁止消费(¥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount3;
/**
* 政策账户锁定转账
*/
@Excel(name = "禁止转账(¥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount3;
/**
* 奖金账户
*/
@Excel(name = "奖金余额(¥)", scale = 2)
@Excel(name = "奖金余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account4;
/**
* 奖金账户
*/
@Excel(name = "可用奖金(¥)", scale = 2)
@Excel(name = "可用奖金", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount4;
@ -166,28 +162,28 @@ public class CuMemberAccountDetailLookVO implements Serializable {
/**
* 可提现账户
*/
@Excel(name = "可提奖金(¥)", scale = 2)
@Excel(name = "可提奖金", scale = 2)
@BigDecimalFormat()
private BigDecimal submitAccount4;
/**
* 奖金锁定账户
*/
@Excel(name = "禁止消费(¥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount4;
/**
* 奖金账户锁定转账
*/
@Excel(name = "禁止转账(¥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount4;
/**
* 奖金账户锁定提现
*/
@Excel(name = "禁止提现(¥)", scale = 2)
@Excel(name = "禁止提现", scale = 2)
@BigDecimalFormat()
private BigDecimal lockWithdrawAccount4;
@ -195,168 +191,168 @@ public class CuMemberAccountDetailLookVO implements Serializable {
/**
* 重消账户
*/
@Excel(name = "重消余额(¥)", scale = 2)
@Excel(name = "重消余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account5;
/**
* 重消账户
*/
@Excel(name = "可用重消(¥)", scale = 2)
@Excel(name = "可用重消", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount5;
/**
* 锁定重消账户
*/
@Excel(name = "禁止消费(¥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount5;
/**
* 重消账户锁定转账
*/
@Excel(name = "禁止转账(¥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount5;
/**
* 积分账户
*/
@Excel(name = "积分余额(¥)", scale = 2)
@Excel(name = "积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account6;
/**
* 重消账户
*/
@Excel(name = "可用积分(¥)", scale = 2)
@Excel(name = "可用积分", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount6;
/**
* 锁定积分账户
*/
@Excel(name = "禁止消费(¥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount6;
/**
* 积分账户锁定转账
*/
@Excel(name = "禁止转账(¥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount6;
/**
* 鼓励账户
*/
@Excel(name = "鼓励余额(¥)", scale = 2)
@Excel(name = "鼓励余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account7;
/**
* 重消账户
*/
@Excel(name = "可用鼓励(¥)", scale = 2)
@Excel(name = "可用鼓励", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount7;
/**
* 锁定鼓励账户
*/
@Excel(name = "禁止消费(¥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount7;
/**
* 鼓励账户锁定转账
*/
@Excel(name = "禁止转账(¥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount7;
/**
* 复购券账户
*/
@Excel(name = "复购券余额(¥)", scale = 2)
@Excel(name = "复购券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account8;
/**
* 重消账户
*/
@Excel(name = "可用复购券(¥)", scale = 2)
@Excel(name = "可用复购券", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount8;
/**
* 锁定复购券
*/
@Excel(name = "禁止消费(¥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount8;
/**
* 复购券锁定转账
*/
@Excel(name = "禁止转账(¥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount8;
/**
* 全球积分
*/
@Excel(name = "全球积分余额(¥)", scale = 2)
@Excel(name = "全球积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account9;
/**
* 重消账户
*/
@Excel(name = "可用全球积分(¥)", scale = 2)
@Excel(name = "可用全球积分", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount9;
/**
* 锁定全球积分
*/
@Excel(name = "禁止消费(¥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount9;
/**
* 全球积分锁定转账
*/
@Excel(name = "禁止转账(¥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount9;
/**
* 车奖积分
*/
@Excel(name = "车奖积分余额(¥)", scale = 2)
@Excel(name = "车奖积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account10;
/**
* 重消账户
*/
@Excel(name = "可用车奖积分(¥)", scale = 2)
@Excel(name = "可用车奖积分", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount10;
/**
* 锁定车奖积分
*/
@Excel(name = "禁止消费(¥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount10;
/**
* 车奖积分锁定转账
*/
@Excel(name = "禁止转账(¥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount10;
@ -364,14 +360,14 @@ public class CuMemberAccountDetailLookVO implements Serializable {
/**
* 直播代金券
*/
@Excel(name = "直播代金券余额(¥)", scale = 2)
@Excel(name = "直播代金券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account11;
/**
* 乐学代金券
*/
@Excel(name = "乐学代金券余额(¥)", scale = 2)
@Excel(name = "乐学代金券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account12;

54
bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountDetailVO.java
View File

@ -14,12 +14,6 @@ import java.util.List;
/**
* 会员账户详情 VO
*
* @Description:
* @Author: ljc
* @Time: 2022/12/28 9:56
* @Classname: CuMemberAccountDetailVO
* @Package_name: com.hzs.member.account.vo
*/
@Data
@AllArgsConstructor
@ -42,42 +36,42 @@ public class CuMemberAccountDetailVO implements Serializable {
/**
* 消费账户
*/
@Excel(name = "消费账户余额(¥)", scale = 2)
@Excel(name = "消费账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account1;
/**
* 现金账户
*/
@Excel(name = "现金账户余额(¥)", scale = 2)
@Excel(name = "现金账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account2;
/**
* 政策账户
*/
@Excel(name = "政策账户余额(¥)", scale = 2)
@Excel(name = "政策账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account3;
/**
* 奖金账户
*/
@Excel(name = "奖金账户余额(¥)", scale = 2)
@Excel(name = "奖金账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account4;
/**
* 重消账户
*/
@Excel(name = "重消账户余额(¥)", scale = 2)
@Excel(name = "重消账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account5;
/**
* 积分账户
*/
@Excel(name = "积分账户余额(¥)", scale = 2)
@Excel(name = "积分账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account6;
@ -85,7 +79,7 @@ public class CuMemberAccountDetailVO implements Serializable {
/**
* 鼓励账户
*/
@Excel(name = "鼓励账户余额(¥)", scale = 2)
@Excel(name = "鼓励账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account7;
@ -93,77 +87,77 @@ public class CuMemberAccountDetailVO implements Serializable {
/**
* 复购券账户
*/
@Excel(name = "复购券余额(¥)", scale = 2)
@Excel(name = "复购券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account8;
/**
* 全球积分
*/
@Excel(name = "全球积分余额(¥)", scale = 2)
@Excel(name = "全球积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account9;
/**
* 车奖积分
*/
@Excel(name = "车奖积分余额(¥)", scale = 2)
@Excel(name = "车奖积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account10;
/**
* 直播代金券
*/
@Excel(name = "直播代金券余额(¥)", scale = 2)
@Excel(name = "直播代金券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account11;
/**
* 乐学代金券
*/
@Excel(name = "乐学代金券余额(¥)", scale = 2)
@Excel(name = "乐学代金券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account12;
/**
* 消费账户
*/
@Excel(name = "消费账户余额($)", scale = 2)
@Excel(name = "消费账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount1;
/**
* 现金账户
*/
@Excel(name = "现金账户余额($)", scale = 2)
@Excel(name = "现金账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount2;
/**
* 政策账户
*/
@Excel(name = "政策账户余额($)", scale = 2)
@Excel(name = "政策账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount3;
/**
* 奖金账户
*/
@Excel(name = "奖金账户余额($)", scale = 2)
@Excel(name = "奖金账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount4;
/**
* 重消账户
*/
@Excel(name = "重消账户余额($)", scale = 2)
@Excel(name = "重消账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount5;
/**
* 积分账户
*/
@Excel(name = "积分账户余额($)", scale = 2)
@Excel(name = "积分账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount6;
@ -171,7 +165,7 @@ public class CuMemberAccountDetailVO implements Serializable {
/**
* 鼓励账户
*/
@Excel(name = "鼓励账户余额($)", scale = 2)
@Excel(name = "鼓励账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount7;
@ -179,21 +173,21 @@ public class CuMemberAccountDetailVO implements Serializable {
/**
* 复购券账户
*/
@Excel(name = "复购券余额($)", scale = 2)
@Excel(name = "复购券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount8;
/**
* 全球积分
*/
@Excel(name = "全球积分余额($)", scale = 2)
@Excel(name = "全球积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount9;
/**
* 车奖积分
*/
@Excel(name = "车奖积分余额($)", scale = 2)
@Excel(name = "车奖积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount10;
@ -201,14 +195,14 @@ public class CuMemberAccountDetailVO implements Serializable {
/**
* 全球积分
*/
@Excel(name = "直播代金券余额($)", scale = 2)
@Excel(name = "直播代金券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount11;
/**
* 车奖积分
*/
@Excel(name = "乐学代金券余额($)", scale = 2)
@Excel(name = "乐学代金券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount12;

180
bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountExportVO.java
View File

@ -13,12 +13,6 @@ import java.math.BigDecimal;
/**
* 冻结明细导出VO
*
* @Description:
* @Author: ljc
* @Time: 2023/7/21 16:11
* @Classname: CuMemberAccountExportVO
* @Package_name: com.hzs.member.account.vo
*/
@Data
@Builder
@ -45,84 +39,84 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 消费账户
*/
@Excel(name = "消费账户余额(￥)", scale = 2)
@Excel(name = "消费账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account1;
/**
* 消费账户
*/
@Excel(name = "可用消费账户(￥)", scale = 2)
@Excel(name = "可用消费账户", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount1;
/**
* 消费锁定账户
*/
@Excel(name = "禁止消费(￥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount1;
/**
* 消费账户锁定转账
*/
@Excel(name = "禁止转账(￥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount1;
/**
* 消费账户
*/
@Excel(name = "消费账户余额($)", scale = 2)
@Excel(name = "消费账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount1;
/**
* 消费账户
*/
@Excel(name = "可用消费账户($)", scale = 2)
@Excel(name = "可用消费账户", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount1;
/**
* 消费锁定账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount1;
/**
* 消费账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount1;
/**
* 现金账户
*/
@Excel(name = "现金账户余额(￥)", scale = 2)
@Excel(name = "现金账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account2;
/**
* 消费账户
*/
@Excel(name = "可用现金账户(￥)", scale = 2)
@Excel(name = "可用现金账户", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount2;
/**
* 现金锁定账户
*/
@Excel(name = "禁止消费(￥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount2;
/**
* 现金账户锁定转账
*/
@Excel(name = "禁止转账(￥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount2;
@ -130,28 +124,28 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 现金账户
*/
@Excel(name = "现金账户余额($)", scale = 2)
@Excel(name = "现金账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount2;
/**
* 消费账户
*/
@Excel(name = "可用现金账户($)", scale = 2)
@Excel(name = "可用现金账户", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount2;
/**
* 现金锁定账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount2;
/**
* 现金账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount2;
@ -160,28 +154,28 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 政策账户
*/
@Excel(name = "政策账户余额(￥)", scale = 2)
@Excel(name = "政策账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account3;
/**
* 政策账户
*/
@Excel(name = "可用政策账户(￥)", scale = 2)
@Excel(name = "可用政策账户", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount3;
/**
* 锁定政策账户
*/
@Excel(name = "禁止消费(￥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount3;
/**
* 政策账户锁定转账
*/
@Excel(name = "禁止转账(￥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount3;
@ -189,28 +183,28 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 政策账户
*/
@Excel(name = "政策余额($)", scale = 2)
@Excel(name = "政策余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount3;
/**
* 政策账户
*/
@Excel(name = "可用政策($)", scale = 2)
@Excel(name = "可用政策", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount3;
/**
* 锁定政策账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount3;
/**
* 政策账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount3;
@ -219,14 +213,14 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 奖金账户
*/
@Excel(name = "奖金账户余额(￥)", scale = 2)
@Excel(name = "奖金账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account4;
/**
* 奖金账户
*/
@Excel(name = "可用奖金账户(￥)", scale = 2)
@Excel(name = "可用奖金账户", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount4;
@ -239,28 +233,28 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 可提现账户
*/
@Excel(name = "可提奖金(￥)", scale = 2)
@Excel(name = "可提奖金", scale = 2)
@BigDecimalFormat()
private BigDecimal submitAccount4;
/**
* 奖金锁定账户
*/
@Excel(name = "禁止消费(￥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount4;
/**
* 奖金账户锁定转账
*/
@Excel(name = "禁止转账(￥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount4;
/**
* 奖金账户锁定提现
*/
@Excel(name = "禁止提现(￥)", scale = 2)
@Excel(name = "禁止提现", scale = 2)
@BigDecimalFormat()
private BigDecimal lockWithdrawAccount4;
@ -268,14 +262,14 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 奖金账户
*/
@Excel(name = "奖金账户余额($)", scale = 2)
@Excel(name = "奖金账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount4;
/**
* 奖金账户
*/
@Excel(name = "可用奖金账户($)", scale = 2)
@Excel(name = "可用奖金账户", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount4;
@ -283,21 +277,21 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 奖金锁定账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount4;
/**
* 奖金账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount4;
/**
* 奖金账户锁定提现
*/
@Excel(name = "禁止提现($)", scale = 2)
@Excel(name = "禁止提现", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockWithdrawAccount4;
@ -305,56 +299,56 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 重消账户
*/
@Excel(name = "重消账户余额(￥)", scale = 2)
@Excel(name = "重消账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account5;
/**
* 重消账户
*/
@Excel(name = "可用重消账户(￥)", scale = 2)
@Excel(name = "可用重消账户", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount5;
/**
* 锁定重消账户
*/
@Excel(name = "禁止消费(￥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount5;
/**
* 重消账户锁定转账
*/
@Excel(name = "禁止转账(￥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount5;
/**
* 重消账户
*/
@Excel(name = "重消余额($)", scale = 2)
@Excel(name = "重消余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount5;
/**
* 重消账户
*/
@Excel(name = "可用重消($)", scale = 2)
@Excel(name = "可用重消", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount5;
/**
* 锁定重消账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount5;
/**
* 重消账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount5;
@ -364,28 +358,28 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 积分账户
*/
@Excel(name = "积分账户余额(￥)", scale = 2)
@Excel(name = "积分账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account6;
/**
* 重消账户
*/
@Excel(name = "可用积分账户(￥)", scale = 2)
@Excel(name = "可用积分账户", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount6;
/**
* 锁定积分账户
*/
@Excel(name = "禁止消费(￥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount6;
/**
* 积分账户锁定转账
*/
@Excel(name = "禁止转账(￥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount6;
@ -393,28 +387,28 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 积分账户
*/
@Excel(name = "积分账户余额($)", scale = 2)
@Excel(name = "积分账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount6;
/**
* 重消账户
*/
@Excel(name = "可用积分账户($)", scale = 2)
@Excel(name = "可用积分账户", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount6;
/**
* 锁定积分账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount6;
/**
* 积分账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount6;
@ -425,56 +419,56 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 鼓励账户
*/
@Excel(name = "鼓励账户余额(￥)", scale = 2)
@Excel(name = "鼓励账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account7;
/**
* 重消账户
*/
@Excel(name = "可用鼓励账户(￥)", scale = 2)
@Excel(name = "可用鼓励账户", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount7;
/**
* 锁定鼓励账户
*/
@Excel(name = "禁止消费(￥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount7;
/**
* 鼓励账户锁定转账
*/
@Excel(name = "禁止转账(￥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount7;
/**
* 鼓励账户
*/
@Excel(name = "鼓励余账户额($)", scale = 2)
@Excel(name = "鼓励余账户额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount7;
/**
* 重消账户
*/
@Excel(name = "可用鼓励账户($)", scale = 2)
@Excel(name = "可用鼓励账户", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount7;
/**
* 锁定鼓励账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount7;
/**
* 鼓励账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount7;
@ -483,56 +477,56 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 复购券账户
*/
@Excel(name = "复购券账户余额(￥)", scale = 2)
@Excel(name = "复购券账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account8;
/**
* 重消账户
*/
@Excel(name = "可用复购券账户(￥)", scale = 2)
@Excel(name = "可用复购券账户", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount8;
/**
* 锁定复购券
*/
@Excel(name = "禁止消费(￥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount8;
/**
* 复购券锁定转账
*/
@Excel(name = "禁止转账(￥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount8;
/**
* 复购券账户
*/
@Excel(name = "复购券账户余额($)", scale = 2)
@Excel(name = "复购券账户余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount8;
/**
* 重消账户
*/
@Excel(name = "可用复购券账户($)", scale = 2)
@Excel(name = "可用复购券账户", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount8;
/**
* 锁定复购券
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount8;
/**
* 复购券锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount8;
@ -541,56 +535,56 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 全球积分
*/
@Excel(name = "全球积分余额(￥)", scale = 2)
@Excel(name = "全球积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account9;
/**
* 重消账户
*/
@Excel(name = "可用全球积分(￥)", scale = 2)
@Excel(name = "可用全球积分", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount9;
/**
* 锁定全球积分
*/
@Excel(name = "禁止消费(￥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount9;
/**
* 全球积分锁定转账
*/
@Excel(name = "禁止转账(￥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount9;
/**
* 全球积分
*/
@Excel(name = "全球积分余额($)", scale = 2)
@Excel(name = "全球积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount9;
/**
* 重消账户
*/
@Excel(name = "可用全球积分($)", scale = 2)
@Excel(name = "可用全球积分", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount9;
/**
* 锁定全球积分
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount9;
/**
* 全球积分锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount9;
@ -598,28 +592,28 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 车奖积分
*/
@Excel(name = "车奖积分余额(￥)", scale = 2)
@Excel(name = "车奖积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal account10;
/**
* 重消账户
*/
@Excel(name = "可用车奖积分(￥)", scale = 2)
@Excel(name = "可用车奖积分", scale = 2)
@BigDecimalFormat()
private BigDecimal availableAccount10;
/**
* 锁定车奖积分
*/
@Excel(name = "禁止消费(￥)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal lockAccount10;
/**
* 车奖积分锁定转账
*/
@Excel(name = "禁止转账(￥)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal lockTransferAccount10;
@ -627,28 +621,28 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 车奖积分
*/
@Excel(name = "车奖积分余额($)", scale = 2)
@Excel(name = "车奖积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount10;
/**
* 重消账户
*/
@Excel(name = "可用车奖积分($)", scale = 2)
@Excel(name = "可用车奖积分", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount10;
/**
* 锁定车奖积分
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount10;
/**
* 车奖积分锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount10;
@ -657,14 +651,14 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 直播代金券
*/
@Excel(name = "直播代金券(￥)", scale = 2)
@Excel(name = "直播代金券", scale = 2)
@BigDecimalFormat()
private BigDecimal account11;
/**
* 直播代金券
*/
@Excel(name = "直播代金券($)", scale = 2)
@Excel(name = "直播代金券", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount11;
@ -673,14 +667,14 @@ public class CuMemberAccountExportVO implements Serializable {
/**
* 乐学代金券
*/
@Excel(name = "乐学代金券(￥)", scale = 2)
@Excel(name = "乐学代金券", scale = 2)
@BigDecimalFormat()
private BigDecimal account12;
/**
* 乐学代金券
*/
@Excel(name = "乐学代金券($)", scale = 2)
@Excel(name = "乐学代金券", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount12;

93
bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberAccountExtVO.java
View File

@ -4,18 +4,15 @@ import com.hzs.common.core.annotation.BigDecimalFormat;
import com.hzs.common.core.annotation.Excel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* <p>
* 会员账户信息
* </p>
*
* @author hzs
* @since 2022-08-11
*/
@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@NoArgsConstructor
@ -24,98 +21,98 @@ public class CuMemberAccountExtVO extends CuMemberAccountVO {
/**
* 消费账户
*/
@Excel(name = "消费余额($)", scale = 2)
@Excel(name = "消费余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount1;
/**
* 消费账户
*/
@Excel(name = "可用消费($)", scale = 2)
@Excel(name = "可用消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount1;
/**
* 消费锁定账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount1;
/**
* 消费账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount1;
/**
* 现金账户
*/
@Excel(name = "现金余额($)", scale = 2)
@Excel(name = "现金余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount2;
/**
* 消费账户
*/
@Excel(name = "可用现金($)", scale = 2)
@Excel(name = "可用现金", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount2;
/**
* 现金锁定账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount2;
/**
* 现金账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount2;
/**
* 政策账户
*/
@Excel(name = "政策余额($)", scale = 2)
@Excel(name = "政策余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount3;
/**
* 政策账户
*/
@Excel(name = "可用政策($)", scale = 2)
@Excel(name = "可用政策", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount3;
/**
* 锁定政策账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount3;
/**
* 政策账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount3;
/**
* 奖金账户
*/
@Excel(name = "奖金余额($)", scale = 2)
@Excel(name = "奖金余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount4;
/**
* 奖金账户
*/
@Excel(name = "可用奖金($)", scale = 2)
@Excel(name = "可用奖金", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount4;
@ -123,21 +120,21 @@ public class CuMemberAccountExtVO extends CuMemberAccountVO {
/**
* 奖金锁定账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount4;
/**
* 奖金账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount4;
/**
* 奖金账户锁定提现
*/
@Excel(name = "禁止提现($)", scale = 2)
@Excel(name = "禁止提现", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockWithdrawAccount4;
@ -145,168 +142,168 @@ public class CuMemberAccountExtVO extends CuMemberAccountVO {
/**
* 重消账户
*/
@Excel(name = "重消余额($)", scale = 2)
@Excel(name = "重消余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount5;
/**
* 重消账户
*/
@Excel(name = "可用重消($)", scale = 2)
@Excel(name = "可用重消", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount5;
/**
* 锁定重消账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount5;
/**
* 重消账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount5;
/**
* 积分账户
*/
@Excel(name = "积分余额($)", scale = 2)
@Excel(name = "积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount6;
/**
* 重消账户
*/
@Excel(name = "可用积分($)", scale = 2)
@Excel(name = "可用积分", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount6;
/**
* 锁定积分账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount6;
/**
* 积分账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount6;
/**
* 鼓励账户
*/
@Excel(name = "鼓励余额($)", scale = 2)
@Excel(name = "鼓励余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount7;
/**
* 重消账户
*/
@Excel(name = "可用鼓励($)", scale = 2)
@Excel(name = "可用鼓励", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount7;
/**
* 锁定鼓励账户
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount7;
/**
* 鼓励账户锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount7;
/**
* 复购券账户
*/
@Excel(name = "复购券余额($)", scale = 2)
@Excel(name = "复购券余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount8;
/**
* 重消账户
*/
@Excel(name = "可用复购券($)", scale = 2)
@Excel(name = "可用复购券", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount8;
/**
* 锁定复购券
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount8;
/**
* 复购券锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount8;
/**
* 全球积分
*/
@Excel(name = "全球积分余额($)", scale = 2)
@Excel(name = "全球积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount9;
/**
* 重消账户
*/
@Excel(name = "可用全球积分($)", scale = 2)
@Excel(name = "可用全球积分", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount9;
/**
* 锁定全球积分
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount9;
/**
* 全球积分锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount9;
/**
* 车奖积分
*/
@Excel(name = "车奖积分余额($)", scale = 2)
@Excel(name = "车奖积分余额", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount10;
/**
* 重消账户
*/
@Excel(name = "可用车奖积分($)", scale = 2)
@Excel(name = "可用车奖积分", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAvailableAccount10;
/**
* 锁定车奖积分
*/
@Excel(name = "禁止消费($)", scale = 2)
@Excel(name = "禁止消费", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockAccount10;
/**
* 车奖积分锁定转账
*/
@Excel(name = "禁止转账($)", scale = 2)
@Excel(name = "禁止转账", scale = 2)
@BigDecimalFormat()
private BigDecimal settleLockTransferAccount10;
@ -314,7 +311,7 @@ public class CuMemberAccountExtVO extends CuMemberAccountVO {
/**
* 直播代金券
*/
@Excel(name = "直播代金券($)", scale = 2)
@Excel(name = "直播代金券", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount11;
@ -322,7 +319,7 @@ public class CuMemberAccountExtVO extends CuMemberAccountVO {
/**
* 乐学代金券
*/
@Excel(name = "乐学代金券($)", scale = 2)
@Excel(name = "乐学代金券", scale = 2)
@BigDecimalFormat()
private BigDecimal settleAccount12;

38
bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/RechargeTemplateVO.java
View File

@ -11,12 +11,6 @@ import java.math.BigDecimal;
/**
* 充值模块
*
* @Description:
* @Author: ljc
* @Time: 2023/7/17 10:05
* @Classname: RechargeTemplateVO
* @Package_name: com.hzs.member.account.vo
*/
@Data
@AllArgsConstructor
@ -41,58 +35,57 @@ public class RechargeTemplateVO implements Serializable {
/**
* 交款方式(1:支付宝 2:微信 3:转账 4:现金 5:特批 6:活动)
*/
@Excel(name = "交款方式", combo = {"支付宝", "微信", "转账", "现金", "特批", "活动","退款","调换货"})
@Excel(name = "交款方式", combo = {"支付宝", "微信", "转账", "现金", "特批", "活动", "退款", "调换货"})
private String paymentMethod;
/**
* 现金账户
*/
@Excel(name = "现金账户变更(￥)", scale = 2)
@Excel(name = "现金账户变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account2;
/**
* 消费账户
*/
@Excel(name = "消费账户变更(￥)", scale = 2)
@Excel(name = "消费账户变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account1;
/**
* 奖金账户
*/
@Excel(name = "奖金账户变更(￥)", scale = 2)
@Excel(name = "奖金账户变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account4;
/**
* 重消账户
*/
@Excel(name = "重消账户变更(￥)", scale = 2)
@Excel(name = "重消账户变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account5;
/**
* 直播代金券
*/
@Excel(name = "直播代金券账户变更(￥)", scale = 2)
@Excel(name = "直播代金券账户变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account11;
/**
* 复购券账户
*/
@Excel(name = "复购券账户变更(￥)", scale = 2)
@Excel(name = "复购券账户变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account8;
/**
* 政策账户
*/
@Excel(name = "政策账户变更(￥)", scale = 2)
@Excel(name = "政策账户变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account3;
@ -100,7 +93,7 @@ public class RechargeTemplateVO implements Serializable {
/**
* 鼓励账户
*/
@Excel(name = "鼓励账户变更(￥)", scale = 2)
@Excel(name = "鼓励账户变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account7;
@ -108,41 +101,38 @@ public class RechargeTemplateVO implements Serializable {
/**
* 积分账户
*/
@Excel(name = "积分账户变更(￥)", scale = 2)
@Excel(name = "积分账户变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account6;
/**
* 全球积分
*/
@Excel(name = "全球积分账户变更(￥)", scale = 2)
@Excel(name = "全球积分账户变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account9;
/**
* 车奖积分
*/
@Excel(name = "车奖积分账户变更(￥)", scale = 2)
@Excel(name = "车奖积分账户变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account10;
/**
* 乐学代金券
*/
@Excel(name = "乐学代金券变更(￥)", scale = 2)
@Excel(name = "乐学代金券变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account12;
/**
* 乐学代金券
*/
@Excel(name = "海豆账户变更(￥)", scale = 2)
@Excel(name = "海豆账户变更", scale = 2)
@BigDecimalFormat()
private BigDecimal account13;
/**

25
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
View File

@ -22,7 +22,6 @@ import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.core.utils.reflect.ReflectUtils;
import com.hzs.common.core.web.domain.BaseEntity;
import com.hzs.common.domain.activity.draw.ext.AcDrawRewardNumExt;
import com.hzs.common.domain.activity.pick.ext.AcPickExt;
import com.hzs.common.domain.member.account.CuMemberAccount;
import com.hzs.common.domain.member.account.CuMemberTrade;
import com.hzs.common.domain.member.account.CuMemberTradeBonus;
@ -181,27 +180,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
if (!iAcPickServiceApi.handlePickOrder(saOrder.getPkMember(), saOrder.getOrderCode()).isSuccess()) {
throw new RuntimeException("提货数量更新失败");
}
} else if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == saOrder.getOrderType()) {
if (cuMemberAccountExt.getPayAccount12() != null
&& ComputeUtil.compareValue(cuMemberAccountExt.getPayAccount12())
&& CollectionUtil.isNotEmpty(cuMemberAccountExt.getPickExtList())) {
List<AcPickExt> pickExtList = new ArrayList<>();
// 获取专区币种，从redis中获得
BdAccount bdAccount = iAccountServiceApi.getBdAccountByFieldValue(saOrder.getPkCountry(), EAccount.CASH_COUPON.getValue()).getData();
if (bdAccount != null) {
List<CuMemberTrade> cuMemberTradeList = new ArrayList<>();
for (AcPickExt acPickExt : cuMemberAccountExt.getPickExtList()) {
cuMemberTradeList.add(packageMemberTrade(saOrder, saOrder.getPkCountry(), bdAccount.getPkId(),
acPickExt.getRetailPrice(), acPickExt.getRetailPrice().negate(), ETradeClassify.CONSUME.getValue()));
acPickExt.setOrderCode(saOrder.getOrderCode());
pickExtList.add(acPickExt);
}
iCuMemberTradeService.saveBatch(cuMemberTradeList);
if (pickExtList.size() > 0 && !iAcPickServiceApi.updatePickUse(pickExtList, ESignSource.MANAGE.getValue(), null).getData()) {
throw new RuntimeException("更新提货单失败");
}
}
}
}
} catch (Exception e) {
log.error("saveMember error: {}", e.getMessage(), e);
@ -211,11 +189,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
}
/**
* 保存奖衔
*
* @param cuMember 会员
* @param levelType 升级类型
* @param saOrder 订单
* @param pkOldLevel 原等级
* @Description: 保存奖衔
*/
private Boolean saveLevelUpgrade(CuMember cuMember, Integer levelType, SaOrder saOrder, Integer pkOldLevel) {
// V3可以买一单升V4，这个位置需要添加校验，如果是购买升级 并且 原等级大于新等级，不添加升级记录

16
bd-business/bd-business-report/src/main/java/com/hzs/report/member/vo/PositStatVO.java
View File

@ -11,12 +11,7 @@ import java.util.List;
/**
* <p>
* 安置业绩统计VO
* </p>
*
* @author zhangjing
* @since 2023-05-31
*/
@Data
public class PositStatVO {
@ -68,26 +63,26 @@ public class PositStatVO {
* 左区新增金额
*/
@BigDecimalFormat
@Excel(name = "左区新增金额($)",scale = 2)
@Excel(name = "左区新增金额", scale = 2)
private BigDecimal leftAmount;
/**
* 右区新增金额
*/
@BigDecimalFormat
@Excel(name = "右区新增金额($)",scale = 2)
@Excel(name = "右区新增金额", scale = 2)
private BigDecimal rightAmount;
/**
* 左区新增业绩
*/
@BigDecimalFormat
@Excel(name = "左区新增业绩(PV)",scale = 2)
@Excel(name = "左区新增业绩(PV)", scale = 2)
private BigDecimal leftAchieve;
/**
* 右区新增业绩
*/
@BigDecimalFormat
@Excel(name = "右区新增业绩(PV)",scale = 2)
@Excel(name = "右区新增业绩(PV)", scale = 2)
private BigDecimal rightAchieve;
/**
@ -135,7 +130,4 @@ public class PositStatVO {
private Integer placeDept;
}

9
bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/mapper/AcPickMapper.java
View File

@ -130,13 +130,4 @@ public interface AcPickMapper extends BaseMapper<AcPick> {
*/
List<ApiPickListVO> pickList(@Param("pkMember") Long pkMember, @Param("pkCountry") Integer pkCountry);
/**
* 撤单扣减乐学代金券
*
* @param pkMember
* @param pkOrder
* @return
*/
int deductionsCouponByOrder(@Param("pkMember") Long pkMember, @Param("pkOrder") Long pkOrder);
}

9
bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java
View File

@ -152,13 +152,4 @@ public interface IAcPickService extends IService<AcPick> {
*/
BigDecimal postageHandle(AcPick acPick, Integer quantity, Integer recProvince, Integer recCity, Integer pkCountry);
/**
* 撤单扣减乐学代金券
*
* @param pkMember
* @param pkOrder
* @return
*/
int deductionsCouponByOrder(Long pkMember, Long pkOrder);
}

5
bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/impl/AcPickServiceImpl.java
View File

@ -800,9 +800,4 @@ public class AcPickServiceImpl extends ServiceImpl<AcPickMapper, AcPick> impleme
throw new ServiceException(postageR.getMsg());
}
@Override
public int deductionsCouponByOrder(Long pkMember, Long pkOrder) {
return baseMapper.deductionsCouponByOrder(pkMember, pkOrder);
}
}

11
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java
View File

@ -42,11 +42,7 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 发货清单立即发货控制器
* @Author: jiang chao
* @Time: 2022/11/7 17:20
* @Classname: SaDeliverController
* @PackageName: com.hzs.sale.deliver.controller.manage
* 发货清单立即发货控制器
*/
@RestController
@RequestMapping("/manage/deliver")
@ -127,6 +123,7 @@ public class SaDeliverController extends BaseController {
// 省市区处理
OrderUtil.handleOrderAddress(areaMap, deliver);
deliver.setOperateScopeVal(ESupplyWay.getLabelByVal(deliver.getOperateScope()));
// 处理追溯编号
SaDeliverBarCode deliverBarCode = barCodeMap.get(deliver.getDeliverItemsId());
if (null != deliverBarCode) {
@ -190,7 +187,7 @@ public class SaDeliverController extends BaseController {
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDeliveryStatus.values(), EDelivery.values(),
ESupplyWay.values(), ETransportType.values(), EOrderType.values(), EYesNo.values(), EDealerYesNo.values(), EShippingChannel.values());
ETransportType.values(), EOrderType.values(), EYesNo.values(), EDealerYesNo.values(), EShippingChannel.values());
// 发货单明细ID
List<Long> deliverItemsIdList = resultList.stream().map(DeliverVO::getDeliverItemsId).collect(Collectors.toList());
@ -201,9 +198,9 @@ public class SaDeliverController extends BaseController {
// 省市区处理
OrderUtil.handleOrderAddress(areaMap, deliver);
deliver.setOperateScopeVal(ESupplyWay.getLabelByVal(deliver.getOperateScope()));
deliver.setDeliverStatusVal(transactionMap.get(EnumsPrefixConstants.DELIVERY_STATUS + deliver.getDeliverStatus()));
deliver.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliver.getDeliveryWay()));
deliver.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliver.getOperateScope()));
deliver.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliver.getOrderType()));
deliver.setSecondDeliverVal(transactionMap.get(EnumsPrefixConstants.DEALER_YES_NO + deliver.getSecondDeliver()));
deliver.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliver.getTranType()));

11
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverHandledController.java
View File

@ -44,11 +44,7 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 发货清单已合单控制器
* @Author: jiang chao
* @Time: 2022/10/19 16:43
* @Classname: SaDeliverController
* @PackageName: com.hzs.sale.order.controller.manager
* 发货清单已合单控制器
*/
@RestController
@RequestMapping("/manage/deliver-handled")
@ -125,6 +121,7 @@ public class SaDeliverHandledController extends BaseController {
// 省市区处理
OrderUtil.handleOrderAddress(areaMap, deliverHandled);
deliverHandled.setOperateScopeVal(ESupplyWay.getLabelByVal(deliverHandled.getOperateScope()));
// 处理追溯编号、扫码时间
SaDeliverBarCode deliverBarCode = barCodeMap.get(deliverHandled.getPkId());
if (null != deliverBarCode) {
@ -189,17 +186,17 @@ public class SaDeliverHandledController extends BaseController {
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), EOrderStatus.values(),
EOrderType.values(), EDeliveryStatus.values(), ESupplyWay.values(), ETransportType.values(), EPresaleStatus.values(),
EOrderType.values(), EDeliveryStatus.values(), ETransportType.values(), EPresaleStatus.values(),
EPrintStatus.values(), EShippingChannel.values(), EYesNo.values());
for (DeliverHandledVO deliverHandled : resultList) {
// 省市区处理
OrderUtil.handleOrderAddress(areaMap, deliverHandled);
deliverHandled.setOperateScopeVal(ESupplyWay.getLabelByVal(deliverHandled.getOperateScope()));
deliverHandled.setOrderStatusVal(transactionMap.get(EnumsPrefixConstants.ORDER_STATUS + deliverHandled.getOrderStatus()));
deliverHandled.setOrderTypeVal(transactionMap.get(EnumsPrefixConstants.ORDER_TYPE + deliverHandled.getOrderType()));
deliverHandled.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliverHandled.getDeliveryWay()));
deliverHandled.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliverHandled.getOperateScope()));
deliverHandled.setPreSaleStatusVal(transactionMap.get(EnumsPrefixConstants.PRESALE_STATUS + deliverHandled.getPreSaleStatus()));
deliverHandled.setPrintStatusVal(transactionMap.get(EnumsPrefixConstants.E_PRINT_STATUS + deliverHandled.getPrintStatus()));
deliverHandled.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliverHandled.getTranType()));

12
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java
View File

@ -7,7 +7,6 @@ import com.hzs.common.core.annotation.Log;
import com.hzs.common.core.annotation.RepeatSubmitSimple;
import com.hzs.common.core.constant.CacheConstants;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import com.hzs.common.core.constant.msg.CommonMsgConstants;
import com.hzs.common.core.constant.msg.SaOrderMsgConstants;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.service.RedisService;
@ -50,11 +49,7 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @Description: 发货清单未合单控制器
* @Author: jiang chao
* @Time: 2022/10/28 11:24
* @Classname: SaDeliverOrderController
* @PackageName: com.hzs.sale.deliver.controller.manage
* 发货清单未合单控制器
*/
@RestController
@RequestMapping("/manage/deliver-unhandled")
@ -137,6 +132,7 @@ public class SaDeliverUnhandledController extends BaseController {
for (DeliverUnhandledVO deliverUnhandled : resultList) {
// 省市区处理
OrderUtil.handleOrderAddress(areaMap, deliverUnhandled);
deliverUnhandled.setOperateScopeVal(ESupplyWay.getLabelByVal(deliverUnhandled.getOperateScope()));
}
}
return getDataTable(resultList);
@ -191,15 +187,15 @@ public class SaDeliverUnhandledController extends BaseController {
Map<Integer, String> areaMap = iAreaServiceApi.getAllAreaNoCache(pkCountry).getData();
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), ESupplyWay.values(), ETransportType.values(), EPresaleStatus.values(), EOrderType.values(), EOrderStatus.values(), ESaleType.values(), EShippingChannel.values());
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), ETransportType.values(), EPresaleStatus.values(), EOrderType.values(), EOrderStatus.values(), ESaleType.values(), EShippingChannel.values());
for (DeliverUnhandledVO deliverUnhandled : resultList) {
// 省市区处理
OrderUtil.handleOrderAddress(areaMap, deliverUnhandled);
deliverUnhandled.setOperateScopeVal(ESupplyWay.getLabelByVal(deliverUnhandled.getOperateScope()));
deliverUnhandled.setIsGiftVal(transactionMap.get(EnumsPrefixConstants.E_SALE_TYPE + deliverUnhandled.getIsGift()));
deliverUnhandled.setDeliveryWayVal(transactionMap.get(EnumsPrefixConstants.DELIVERY + deliverUnhandled.getDeliveryWay()));
deliverUnhandled.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + deliverUnhandled.getOperateScope()));
deliverUnhandled.setShippingChannelVal(transactionMap.get(EnumsPrefixConstants.E_SHIPPING_CHANNEL + deliverUnhandled.getShippingChannel()));
deliverUnhandled.setTranTypeVal(transactionMap.get(EnumsPrefixConstants.ENU_TRA + deliverUnhandled.getTranType()));
deliverUnhandled.setPreSaleStatusVal(transactionMap.get(EnumsPrefixConstants.PRESALE_STATUS + deliverUnhandled.getPreSaleStatus()));

9
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverHandledVO.java
View File

@ -10,11 +10,7 @@ import lombok.Data;
import java.util.Date;
/**
* @Description: 发货单已合并列表VO
* @Author: jiang chao
* @Time: 2022/11/5 15:51
* @Classname: DeliverHandledVO
* @PackageName: com.hzs.sale.deliver.vo
* 发货单已合并列表VO
*/
@Data
public class DeliverHandledVO {
@ -68,7 +64,7 @@ public class DeliverHandledVO {
* 订单类型显示
*/
@Excel(name = "订单类型")
private String orderTypeVal;
private String orderTypeVal;
/**
* 订单状态（EOrderStatus）
@ -251,7 +247,6 @@ public class DeliverHandledVO {
* 供应方式（ESupplyWay）
*/
@JsonIgnore
@Transaction(transactionKey = EnumsPrefixConstants.SUPPLY_WAY)
private Integer operateScope;
/**
* 供应方式显示

9
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverUnhandledVO.java
View File

@ -11,11 +11,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* @Description: 发货单未合并列表VO
* @Author: jiang chao
* @Time: 2022/11/4 11:29
* @Classname: DeliverUnhandledVO
* @PackageName: com.hzs.sale.deliver.vo
* 发货单未合并列表VO
*/
@Data
public class DeliverUnhandledVO {
@ -208,7 +204,6 @@ public class DeliverUnhandledVO {
* 供应方式（ESupplyWay）
*/
@JsonIgnore
@Transaction(transactionKey = EnumsPrefixConstants.SUPPLY_WAY)
private Integer operateScope;
/**
* 供应方式显示
@ -251,7 +246,7 @@ public class DeliverUnhandledVO {
*/
@Excel(name = "备注")
private String remark;
/**
* 创建时间
*/

7
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverVO.java
View File

@ -10,11 +10,7 @@ import lombok.Data;
import java.util.Date;
/**
* @Description: 立即发货返回VO
* @Author: jiang chao
* @Time: 2022/11/8 9:58
* @Classname: DeliverVO
* @PackageName: com.hzs.sale.deliver.vo
* 立即发货返回VO
*/
@Data
public class DeliverVO {
@ -228,7 +224,6 @@ public class DeliverVO {
* 供应方式（ESupplyWay）
*/
@JsonIgnore
@Transaction(transactionKey = EnumsPrefixConstants.SUPPLY_WAY)
private Integer operateScope;
/**
* 供应方式显示

12
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderChargeLogController.java
View File

@ -129,7 +129,7 @@ public class SaOrderChargeLogController extends BaseController {
Map<Long, VertexDTO> vertexMap = vertexAll.getData().stream().collect(Collectors.toMap(VertexDTO::getPkId, Function.identity()));
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveRechargeStatus.values(), EPresaleStatus.values(),
ESupplyWay.values(), EDelivery.values(), EOrderStatus.values(), EPlaceDept.values(), ECustomerType.values(), EApprovalBusiness.values(),
EDelivery.values(), EOrderStatus.values(), EPlaceDept.values(), ECustomerType.values(), EApprovalBusiness.values(),
EOrderType.values(), ETransportType.values(), EYesNo.values(), EShippingChannel.values(), EUnit.values(), ESignSource.values(), EOrderSource.values());
for (SaOrderChargeLogExt orderChargeLogExt : list) {
@ -238,9 +238,7 @@ public class SaOrderChargeLogController extends BaseController {
orderChargeLogVo.setDeliveryWayStr(transactionMap.get(EDelivery.getDelivery(orderChargeLogExt.getDeliveryWay()).getKey()));
}
//销售方式
if (orderChargeLogExt.getOperateScope() != null && ESupplyWay.getESupplyWay(orderChargeLogExt.getOperateScope()) != null) {
orderChargeLogVo.setOperateScopeStr(transactionMap.get(ESupplyWay.getESupplyWay(orderChargeLogExt.getOperateScope()).getKey()));
}
orderChargeLogVo.setOperateScopeStr(ESupplyWay.getLabelByVal(orderChargeLogExt.getOperateScope()));
// 运输方式
List<String> tranList = new ArrayList<>();
if (orderChargeLogExt.getIsLandTrans() != null && orderChargeLogExt.getIsLandTrans().equals(0)) {
@ -349,7 +347,7 @@ public class SaOrderChargeLogController extends BaseController {
Map<Long, VertexDTO> vertexMap = vertexAll.getData().stream().collect(Collectors.toMap(VertexDTO::getPkId, Function.identity()));
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveRechargeStatus.values(), EPresaleStatus.values(),
ESupplyWay.values(), EDelivery.values(), EOrderStatus.values(), EPlaceDept.values(), ECustomerType.values(), EApprovalBusiness.values(),
EDelivery.values(), EOrderStatus.values(), EPlaceDept.values(), ECustomerType.values(), EApprovalBusiness.values(),
EOrderType.values(), ETransportType.values(), EYesNo.values(), EShippingChannel.values(), EUnit.values(), ESignSource.values(), EOrderSource.values());
for (SaOrderChargeLogExt orderChargeLogExt : list) {
@ -460,9 +458,7 @@ public class SaOrderChargeLogController extends BaseController {
orderChargeLogVo.setDeliveryWayStr(transactionMap.get(EDelivery.getDelivery(orderChargeLogExt.getDeliveryWay()).getKey()));
}
//销售方式
if (orderChargeLogExt.getOperateScope() != null && ESupplyWay.getESupplyWay(orderChargeLogExt.getOperateScope()) != null) {
orderChargeLogVo.setOperateScopeStr(transactionMap.get(ESupplyWay.getESupplyWay(orderChargeLogExt.getOperateScope()).getKey()));
}
orderChargeLogVo.setOperateScopeStr(ESupplyWay.getLabelByVal(orderChargeLogExt.getOperateScope()));
// 运输方式
List<String> tranList = new ArrayList<>();
if (orderChargeLogExt.getIsLandTrans() != null && orderChargeLogExt.getIsLandTrans().equals(0)) {

5
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/OrderBusinessServiceImpl.java
View File

@ -1189,11 +1189,6 @@ public class OrderBusinessServiceImpl implements IOrderBusinessService {
// 订单、订单明细状态变更为已删除
iSaOrderService.deleteOrderAndItems(Collections.singletonList(saOrder.getPkId()), userId, pkCountry);
if (EOrderType.SPECIAL_UPGRADE_ORDER.getValue() == saOrder.getOrderType()) {
// 乐学升级需要扣除代金券
iAcPickService.deductionsCouponByOrder(saOrder.getPkMember(), saOrder.getPkId());
}
// 根据订单原路退回支付信息
R<?> resultR = iMemberAccountServiceApi.orderReturnBatch(saOrder, userId);
if (!resultR.isSuccess()) {

64
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java
View File

@ -36,8 +36,6 @@ import com.hzs.sale.wares.param.WaresDetailParams;
import com.hzs.sale.wares.param.*;
import com.hzs.sale.wares.service.*;
import com.hzs.sale.wares.vo.*;
import com.hzs.system.base.ICurrencyServiceApi;
import com.hzs.system.base.dto.CurrencyDTO;
import com.hzs.system.config.IRangeServiceApi;
import com.hzs.system.sys.dto.LoginUser;
import lombok.extern.slf4j.Slf4j;
@ -58,8 +56,6 @@ import java.util.stream.Collectors;
@RequestMapping("/manage/wares")
public class BdWaresController extends BaseController {
@DubboReference
ICurrencyServiceApi iCurrencyServiceApi;
@DubboReference
IRangeServiceApi iRangeServiceApi;
@ -144,13 +140,13 @@ public class BdWaresController extends BaseController {
if (CollectionUtil.isNotEmpty(resultList)) {
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(ESpecialArea.values(), EYesNo.values(), ESupplyWay.values(), EPresaleStatus.values());
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EYesNo.values(), EPresaleStatus.values());
resultList.parallelStream().forEach(waresVo -> {
// 所属专区
waresVo.setSpecialAreaVal(transactionMap.get(EnumsPrefixConstants.SPECIAL_AREA + waresVo.getSpecialArea()));
waresVo.setSpecialAreaVal(ESpecialArea.getLabelByValue(waresVo.getSpecialArea()));
// 供应方式
waresVo.setOperateScopeVal(transactionMap.get(EnumsPrefixConstants.SUPPLY_WAY + waresVo.getOperateScope()));
waresVo.setOperateScopeVal(ESupplyWay.getLabelByVal(waresVo.getOperateScope()));
// 预售状态
waresVo.setPreSaleStatusVal(transactionMap.get(EnumsPrefixConstants.PRESALE_STATUS + waresVo.getPreSaleStatus()));
@ -560,6 +556,12 @@ public class BdWaresController extends BaseController {
if (wares.getWaresPrice() == null) {
return AjaxResult.error("商品价格必填");
}
if (wares.getPkAreaClassify() == null) {
return AjaxResult.error("商品分类不能为空");
}
if (wares.getCover1() == null) {
return AjaxResult.error("商品图片必传");
}
if (StringUtils.isNotBlank(wares.getWaresCode())) {
LambdaQueryWrapper<BdWares> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BdWares::getWaresCode, wares.getWaresCode());
@ -568,12 +570,7 @@ public class BdWaresController extends BaseController {
return AjaxResult.error("商品编号重复");
}
}
if (wares.getPkAreaClassify() == null) {
return AjaxResult.error("商品分类不能为空");
}
if (wares.getCover1() == null) {
return AjaxResult.error("商品图片必传");
}
// 是否陆运
int isLandTrans = 1;
// 是否空运
@ -686,16 +683,6 @@ public class BdWaresController extends BaseController {
if (waresParams.getPreSaleStatus() == null) {
return AjaxResult.error("预售状态必传");
}
// 商品编号 重复
if (StringUtils.isNotBlank(waresParams.getWaresCode())) {
LambdaQueryWrapper<BdWares> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BdWares::getWaresCode, waresParams.getWaresCode());
queryWrapper.eq(BdWares::getSpecialArea, waresParams.getSpecialArea());
queryWrapper.notIn(BdWares::getPkId, waresParams.getWaresId());
if (waresService.count(queryWrapper) > 0) {
return AjaxResult.error("商品编号重复");
}
}
if (StringUtils.isBlank(waresParams.getWaresName())) {
return AjaxResult.error("商品名称不存在");
}
@ -708,6 +695,16 @@ public class BdWaresController extends BaseController {
if (waresParams.getCover1() == null) {
return AjaxResult.error("商品图片必传");
}
// 商品编号 重复
if (StringUtils.isNotBlank(waresParams.getWaresCode())) {
LambdaQueryWrapper<BdWares> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BdWares::getWaresCode, waresParams.getWaresCode());
queryWrapper.eq(BdWares::getSpecialArea, waresParams.getSpecialArea());
queryWrapper.notIn(BdWares::getPkId, waresParams.getWaresId());
if (waresService.count(queryWrapper) > 0) {
return AjaxResult.error("商品编号重复");
}
}
// if (waresParams.getPkPrefixLabel() == null || waresParams.getPkCoolLabel() == null || waresParams.getPkGuaranteeLabel() == null || waresParams.getPkSellingPoint() == null){
// return AjaxResult.error(WaresMsgConstants.WARES_LABEL_DUPLICATE);
// }
@ -889,10 +886,10 @@ public class BdWaresController extends BaseController {
waresParams.setPkSpecialCurrency(waresExtend.getPkSpecialCurrency());
waresParams.setSortStatus(wares.getSortStatus());
waresParams.setSystemType(waresExtend.getSystemType());
if (waresExtend.getMakerIncome() != null) {
R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
waresParams.setMakerIncome(waresExtend.getMakerIncome().multiply(currencyDto.getData().getInExchangeRate()));
}
waresParams.setInventory(waresExtend.getInventory());
waresParams.setInventoryRatio(waresExtend.getInventoryRatio());
waresParams.setMemberLimit(waresExtend.getMemberLimit());
waresParams.setMemberMonthLimit(waresExtend.getMemberMonthLimit());
BdAreaClassify parentAreaClassify = areaClassifyService.getAreaClassify(wares.getPkAreaClassify());
if (parentAreaClassify != null) {
@ -1142,7 +1139,6 @@ public class BdWaresController extends BaseController {
LoginUser loginUser = userTokenService.getLoginUser();
waresService.waresMove(waresId, waresMoveType, loginUser, specialArea);
return AjaxResult.success();
}
/**
@ -1191,7 +1187,7 @@ public class BdWaresController extends BaseController {
*
* @return
*/
@GetMapping("create-wares-sort")
@GetMapping("/create-wares-sort")
public AjaxResult createWaresSort() {
Integer pkCountry = SecurityUtils.getPkCountry();
Integer maxSort = waresService.getMaxSort(pkCountry);
@ -1204,7 +1200,7 @@ public class BdWaresController extends BaseController {
/**
* 查询商品
*/
@GetMapping("get-wares-list")
@GetMapping("/get-wares-list")
public AjaxResult getWares(String waresName) {
// TODO 需要优化此接口 空单查询
LambdaQueryWrapper<BdWares> queryWrapper = new LambdaQueryWrapper<>();
@ -1263,7 +1259,7 @@ public class BdWaresController extends BaseController {
*
* @return
*/
@PostMapping("get-empty-order-wares")
@PostMapping("/get-empty-order-wares")
public AjaxResult getEmptyOrderWares(@RequestBody EmptyOrderWares emptyOrderWares) {
List<EmptyOrderWares> resultList = new ArrayList<>();
for (int i = 0; i < emptyOrderWares.getPkWaresSpecsSkus().size(); i++) {
@ -1281,7 +1277,7 @@ public class BdWaresController extends BaseController {
eo.setWaresPrice(ws.getWaresPrice());
eo.setAmountPrice(eo.getWaresPrice().multiply(new BigDecimal(eo.getQuantity())));
eo.setSpecialArea(ws.getSpecialArea());
eo.setSpecialAreaStr(ESpecialArea.getESpecialArea(ws.getSpecialArea()));
eo.setSpecialAreaStr(ESpecialArea.getLabelByValue(ws.getSpecialArea()));
eo.setIsSingle(ws.getIsSingle());
eo.setProductName(ws.getProductName());
LambdaQueryWrapper<BdWaresSpecsRelation> qer = new LambdaQueryWrapper<>();
@ -1303,7 +1299,7 @@ public class BdWaresController extends BaseController {
*
* @return
*/
@GetMapping("find-all")
@GetMapping("/find-all")
public AjaxResult findAll(WaresParams waresParams) {
LambdaQueryWrapper<BdWares> queryWrapper = new LambdaQueryWrapper<>();
if (waresParams.getSpecialArea() != null) {
@ -1320,7 +1316,7 @@ public class BdWaresController extends BaseController {
/**
* 计算商品业绩
*/
@PostMapping("compute-wares-price")
@PostMapping("/compute-wares-price")
public AjaxResult computeWaresPrice(@RequestBody ComputhParams computhParams) {
for (ComputeWaresPrice computeWaresPrice : computhParams.getComputeWaresPriceList()) {
computeWaresPrice.setPkWares(computhParams.getPkWares());

17
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresParams.java
View File

@ -407,4 +407,21 @@ public class WaresParams implements Serializable {
*/
private Integer waresStatus;
/**
* 库存数量
*/
private Integer inventory;
/**
* 库存倒计时比例
*/
private Integer inventoryRatio;
/**
* 会员总限购
*/
private Integer memberLimit;
/**
* 会员月限购
*/
private Integer memberMonthLimit;
}

52
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java
View File

@ -35,8 +35,6 @@ import com.hzs.sale.wares.param.WaresDetailParams;
import com.hzs.sale.wares.mapper.BdWaresMapper;
import com.hzs.sale.wares.service.*;
import com.hzs.sale.wares.vo.*;
import com.hzs.system.base.ICurrencyServiceApi;
import com.hzs.system.base.dto.CurrencyDTO;
import com.hzs.system.config.IAwardsServiceApi;
import com.hzs.system.config.ILabelServiceApi;
import com.hzs.system.config.IRangeServiceApi;
@ -98,8 +96,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
@DubboReference
IMemberServiceApi iMemberServiceApi;
@DubboReference
ICurrencyServiceApi iCurrencyServiceApi;
@DubboReference
IMenuDetailServiceApi iMenuDetailServiceApi;
@DubboReference
IAwardsServiceApi iAwardsServiceApi;
@ -134,14 +130,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
this.save(wares);
// 商品拓展表
BdWaresExtend waresExtend = BeanUtil.copyProperties(waresParams, BdWaresExtend.class);
// 存入要转化美金
if (!waresParams.getSpecialArea().equals(ESpecialArea.REPURCHASE_AREA.getValue())) {
waresParams.setMakerIncome(BigDecimal.ZERO);
}
if (null != waresParams.getMakerIncome()) {
R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(user.getDataCountry());
waresExtend.setMakerIncome(waresParams.getMakerIncome().divide(currencyDto.getData().getInExchangeRate(), 6, BigDecimal.ROUND_HALF_UP));
}
waresExtend.setSystemType(ESystemType.DEFAULT.getValue());
waresExtend.setPkWares(wares.getPkId());
waresExtend.setPkCreator(user.getUserId());
@ -559,14 +547,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
// 商品拓展表
BdWaresExtend waresExtend = BeanUtil.copyProperties(waresParams, BdWaresExtend.class);
// 存入要转化美金
if (!waresParams.getSpecialArea().equals(ESpecialArea.REPURCHASE_AREA.getValue())) {
waresParams.setMakerIncome(BigDecimal.ZERO);
}
if (null != waresParams.getMakerIncome()) {
R<CurrencyDTO> currencyDto = iCurrencyServiceApi.getCurrency(user.getDataCountry());
waresExtend.setMakerIncome(waresParams.getMakerIncome().divide(currencyDto.getData().getInExchangeRate(), 6, BigDecimal.ROUND_HALF_UP));
}
waresExtend.setSystemType(ESystemType.DEFAULT.getValue());
waresExtend.setPkWares(wares.getPkId());
waresExtend.setPkModified(user.getUserId());
@ -1032,10 +1012,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
expireFlag = DateUtils.addMonths(new Date(), 3).compareTo(loginMember.getExpireDate()) > 0;
}
// 注册专区权限
boolean isLexRegister = ERegistrationAuthority.DECLARATION.getValue() == loginMember.getRegisterAuthority()
|| ERegistrationAuthority.SERVICE.getValue() == loginMember.getRegisterAuthority();
// 查询配置菜单列表
// 结算等级
int pkGrade = loginMember.getPkSettleGrade();
@ -1071,14 +1047,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
if (sArea != null) {
if (StringUtils.isNotBlank(sArea.getLabel())) {
RecommendSpecialAreaVo recommendSpecialAreaVo = new RecommendSpecialAreaVo();
if (specialArea.equals(ESpecialArea.SPECIAL_REGISTER_AREA.getValue())
|| specialArea.equals(ESpecialArea.SPECIAL_UPGRADE_AREA.getValue())) {
// 乐学注册权限判断
if (!isLexRegister) {
continue;
}
}
if (specialArea.equals(ESpecialArea.RENEWAL_AREA.getValue())) {
// 续约专区，只有有效期小于3个月的能看到
if (!expireFlag) {
@ -1200,14 +1168,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
if (isShow == null || isShow) {
// 商品信息填充
WaresVo waresVo = new WaresVo();
if (bdWares.getSpecialArea().equals(ESpecialArea.SPECIAL_REGISTER_AREA.getValue())
|| bdWares.getSpecialArea().equals(ESpecialArea.SPECIAL_UPGRADE_AREA.getValue())) {
// 乐学注册权限判断
if (!isLexRegister) {
continue;
}
}
if (bdWares.getSpecialArea().equals(ESpecialArea.RENEWAL_AREA.getValue())) {
// 续约专区，只有有效期小于3个月的能看到
if (!expireFlag) {
@ -1255,10 +1215,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
expireFlag = DateUtils.addMonths(new Date(), 3).compareTo(loginMember.getExpireDate()) > 0;
}
// 注册专区权限
boolean isLexRegister = ERegistrationAuthority.DECLARATION.getValue() == loginMember.getRegisterAuthority()
|| ERegistrationAuthority.SERVICE.getValue() == loginMember.getRegisterAuthority();
// 结算等级
int pkGrade = loginMember.getPkSettleGrade();
// 真实奖衔
@ -1293,14 +1249,6 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
if (sArea != null) {
if (StringUtils.isNotBlank(sArea.getLabel())) {
RecommendSpecialAreaVo recommendSpecialAreaVo = new RecommendSpecialAreaVo();
if (specialArea.equals(ESpecialArea.SPECIAL_REGISTER_AREA.getValue())
|| specialArea.equals(ESpecialArea.SPECIAL_UPGRADE_AREA.getValue())) {
// 乐学注册权限判断
if (!isLexRegister) {
continue;
}
}
if (specialArea.equals(ESpecialArea.RENEWAL_AREA.getValue())) {
// 续约专区，只有有效期小于3个月的能看到
if (!expireFlag) {

1
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java
View File

@ -158,7 +158,6 @@ public class WaresVo {
/**
* 供应方式（经营范围）
*/
private Integer operateScope;
/**
* 供应方式（经营范围）

15
bd-business/bd-business-sale/src/main/resources/mapper/activity/pick/AcPickMapper.xml
View File

@ -301,19 +301,4 @@
order by creation_time
</select>
<!-- 撤单扣减乐学代金券 -->
<update id="deductionsCouponByOrder">
update ac_pick ap
set ap.usable_quantity = ap.usable_quantity -
nvl((select sum(soi.quantity)
from sa_order_items soi
where soi.pk_order = #{pkOrder}
and soi.is_gift = 0
and soi.pk_product = ap.pk_data_id),
0)
where ap.del_flag = 0
and ap.pk_member = #{pkMember}
and ap.pick_type = 8
</update>
</mapper>

7
bd-business/bd-business-system/src/main/java/com/hzs/system/base/param/BdCubasdocParam.java
View File

@ -9,12 +9,7 @@ import java.io.Serializable;
import java.util.List;
/**
* @description: 供应商参数
* @author: sui q
* @time: 2023/11/20 10:55
* @classname: BdCubasdocParam
* @package_name: com.hzs.system.base.param
* version 1.0.0
* 供应商参数
*/
@Data
@Builder

48
bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/CurrencyServiceProvider.java
View File

@ -1,20 +1,13 @@
package com.hzs.system.base.provider;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.hzs.common.core.domain.R;
import com.hzs.common.domain.system.base.BdCurrency;
import com.hzs.common.domain.system.base.BdStorehouse;
import com.hzs.common.domain.system.base.ext.BdCubasdocExt;
import com.hzs.common.domain.system.sys.SysCorp;
import com.hzs.system.base.ICurrencyServiceApi;
import com.hzs.system.base.dto.CurrencyDTO;
import com.hzs.system.base.param.BdCubasdocParam;
import com.hzs.system.base.service.IBdCubasdocService;
import com.hzs.system.base.service.IBdCurrencyService;
import com.hzs.system.base.service.IBdStorehouseAreaMiddleService;
import com.hzs.system.base.service.IBdStorehouseService;
import com.hzs.system.sys.service.ISysCorpService;
import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.beans.factory.annotation.Autowired;
@ -28,12 +21,6 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
private IBdCurrencyService iBdCurrencyService;
@Autowired
private IBdStorehouseAreaMiddleService iBdStorehouseAreaMiddleService;
@Autowired
private IBdCubasdocService iBdCubasdocService;
@Autowired
private ISysCorpService iSysCorpService;
@Autowired
private IBdStorehouseService iBdStorehouseService;
@Override
public R<CurrencyDTO> getCurrency(Integer pkCountry) {
@ -97,39 +84,4 @@ public class CurrencyServiceProvider implements ICurrencyServiceApi {
return R.ok(currencyDtoList);
}
@Override
public R<BdCubasdocExt> queryBdCubasdocById(Integer pkId, Integer pkCountry) {
BdCubasdocParam cubasdocParam = BdCubasdocParam.builder()
.pkCountry(pkCountry)
.pkId(pkId)
.build();
List<BdCubasdocExt> bdCubasdocList = iBdCubasdocService.querySupplierByCondition(cubasdocParam);
if (CollectionUtil.isNotEmpty(bdCubasdocList)) {
return R.ok(bdCubasdocList.get(0));
}
return R.ok(null);
}
@Override
public R<BdCubasdocExt> queryBdCustomerById(Integer pkId, Integer pkCountry) {
BdCubasdocParam customerParam = BdCubasdocParam.builder()
.pkCountry(pkCountry)
.pkId(pkId)
.build();
List<BdCubasdocExt> bdCubasdocList = iBdCubasdocService.queryCustomerByCondition(customerParam);
if (CollectionUtil.isNotEmpty(bdCubasdocList)) {
return R.ok(bdCubasdocList.get(0));
}
return R.ok(null);
}
@Override
public R<SysCorp> querySysCorp(Integer pkId, Integer pkCountry) {
return R.ok(iSysCorpService.getSysCorp(pkId, pkCountry));
}
@Override
public R<List<BdStorehouse>> queryStorehouseByIds(Set<Integer> storehouseIdSet, Integer pkCountry, Integer pkCorp) {
return R.ok(iBdStorehouseService.queryStorehouseByIds(storehouseIdSet, pkCountry, pkCorp));
}
}

14
bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdCubasdocService.java
View File

@ -13,37 +13,37 @@ import java.util.List;
public interface IBdCubasdocService extends IService<BdCubasdoc> {
/*
* @description: 根据条件查询供应商
* 根据条件查询供应商
**/
List<BdCubasdocExt> querySupplierByCondition(BdCubasdocParam cubasdocParam);
/*
* @description: 根据条件查询供应商(业务领用专用)
* 根据条件查询供应商(业务领用专用)
**/
List<BdCubasdocExt> querySupplierByProduct(BdCubasdocParam cubasdocParam);
/*
* @description: 根据条件查询客户
* 根据条件查询客户
**/
List<BdCubasdocExt> queryCustomerByCondition(BdCubasdocParam cubasdocParam);
/*
* @description: 根据条件查询客商
* 根据条件查询客商
**/
List<BdCubasdocExt> queryCubasdocByCondition(BdCubasdocParam cubasdocParam);
/*
* @description: 保存供应商
* 保存供应商
**/
void saveCubasdoc(BdCubasdocParam cubasdocParam, Long pkMember);
/*
* @description: 删除客商
* 删除客商
**/
void deleteCuBasdoc(Integer pkId, Long pkMember);
/**
* @description: 查询登录管理员是否为供应商
* 查询登录管理员是否为供应商
**/
Integer queryThSupplierApplyUserList(Long userId);
}

29
bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdStorehouseAreaMiddleService.java
View File

@ -1,6 +1,5 @@
package com.hzs.system.base.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.hzs.common.domain.system.base.BdStorehouse;
import com.hzs.common.domain.system.base.BdStorehouseAreaMiddle;
@ -10,47 +9,27 @@ import java.util.Collection;
import java.util.List;
/**
* <p>
* 仓库地区中间表 服务类
* </p>
*
* @author hzs
* @since 2023-05-05
*/
public interface IBdStorehouseAreaMiddleService extends IService<BdStorehouseAreaMiddle> {
/**
* @description: 查询地区绑定仓库列表
* @author: zhang jing
* @date: 2023/5/5 20:09
* @param: [storehouseAreaMiddleVO]
* @return: java.util.List<com.hzs.system.base.vo.BdStorehouseAreaMiddleVO>
* 查询地区绑定仓库列表
**/
List<BdStorehouseAreaMiddleVO> getBdStorehouseAreaMiddleList(BdStorehouseAreaMiddleVO storehouseAreaMiddleVO);
/**
* @description: 新增地区仓库
* @author: zhang jing
* @date: 2023/5/5 20:28
* @param: [storehouseAreaMiddleVO]
* @return: boolean
* 新增地区仓库
**/
boolean intStoArMiddle(BdStorehouseAreaMiddleVO storehouseAreaMiddleVO);
/**
* @description: 修改地区仓库
* @author: zhang jing
* @date: 2023/5/5 20:28
* @param: [storehouseAreaMiddleVO]
* @return: boolean
* 修改地区仓库
**/
boolean upStoArMiddle(BdStorehouseAreaMiddleVO storehouseAreaMiddleVO);
/*
* @description: 根据省查询对应的发货仓库
* @author: sui q
* @date: 2023/5/8 14:22
* @param: null null
* 根据省查询对应的发货仓库
**/
BdStorehouse queryBdStorehouseByProvince(Integer province, Integer type);

6
bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/IBdStorehouseService.java
View File

@ -5,7 +5,6 @@ import com.hzs.common.domain.system.base.BdStorehouse;
import com.hzs.system.base.vo.BdStorehouseVO;
import java.util.List;
import java.util.Set;
/**
* 仓库服务类
@ -36,11 +35,6 @@ public interface IBdStorehouseService extends IService<BdStorehouse> {
*/
BdStorehouse checkBdStorehouse(BdStorehouse bdStorehouse);
/*
* 根据主键查询仓库
**/
List<BdStorehouse> queryStorehouseByIds(Set<Integer> storehouseIds, Integer pkCountry, Integer pkCorp);
/**
* 新增仓库信息
*

14
bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdStorehouseServiceImpl.java
View File

@ -2,12 +2,9 @@ package com.hzs.system.base.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.constant.SystemFieldConstants;
import com.hzs.common.core.enums.EDelFlag;
import com.hzs.common.core.enums.EYesNo;
import com.hzs.common.domain.system.base.BdStorehouse;
import com.hzs.common.domain.system.base.BdStorehouseAreaMiddle;
import com.hzs.system.base.mapper.BdStorehouseMapper;
@ -20,7 +17,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Set;
/**
* 仓库信息服务实现类
@ -59,16 +55,6 @@ public class BdStorehouseServiceImpl extends ServiceImpl<BdStorehouseMapper, BdS
return baseMapper.checkBdStorehouse(bdStorehouse);
}
@Override
public List<BdStorehouse> queryStorehouseByIds(Set<Integer> storehouseIds, Integer pkCountry, Integer pkCorp) {
QueryWrapper<BdStorehouse> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(SystemFieldConstants.ENABLE_STATE, EYesNo.YES.getIntValue());
queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry);
queryWrapper.eq(SystemFieldConstants.PK_CORP, pkCorp);
queryWrapper.in(SystemFieldConstants.PK_ID, storehouseIds);
return baseMapper.selectList(queryWrapper);
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean updateBdStorehouse(BdStorehouseVO bdStorehouse) {

4
bd-business/bd-business-system/src/main/java/com/hzs/system/config/vo/BdAreaCurrencyListsVO.java
View File

@ -1,12 +1,8 @@
package com.hzs.system.config.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.hzs.common.core.annotation.Excel;
import com.hzs.common.core.annotation.Transaction;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import com.hzs.common.core.web.domain.BaseEntity;
import lombok.Data;
import java.util.Date;

8
bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java
View File

@ -436,7 +436,7 @@ public class EnumsController extends BaseController {
List<EnumEntity> enumEntityList = new ArrayList<>();
for (ESpecialArea value : ESpecialArea.values()) {
if (value.getEnable() == EnableStatus.ENABLE.getValue()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.SPECIAL_AREA));
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
}
}
return AjaxResult.success(enumEntityList);
@ -475,7 +475,9 @@ public class EnumsController extends BaseController {
public AjaxResult specialAreaConsume() {
List<EnumEntity> enumEntityList = new ArrayList<>();
for (ESpecialArea value : ESpecialArea.values()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.SPECIAL_AREA));
if (EYesNo.YES.getIntValue() == value.getEnable()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
}
}
return AjaxResult.success(enumEntityList);
}
@ -832,7 +834,7 @@ public class EnumsController extends BaseController {
public AjaxResult supplyWay() {
List<EnumEntity> enumEntityList = new ArrayList<>();
for (ESupplyWay value : ESupplyWay.values()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.SUPPLY_WAY));
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
}
return AjaxResult.success(enumEntityList);
}

8
bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java
View File

@ -343,14 +343,6 @@ public class EnumsInitController {
initList.add(this.createData(value.getKey(), value.getLabel()));
}
/**
* 供应方式
*/
for (ESupplyWay value : ESupplyWay.values()) {
initList.add(this.createData(value.getKey(), value.getLabel()));
}
/**
* 订单状态
*/

10
bd-business/bd-business-system/src/main/java/com/hzs/system/sys/mapper/SysCorpMapper.java
View File

@ -8,20 +8,12 @@ import com.hzs.system.sys.param.SysCorpParam;
import java.util.List;
/**
* <p>
* 组织(公司)设置 Mapper 接口
* </p>
*
* @author hzs
* @since 2023-11-20
*/
public interface SysCorpMapper extends BaseMapper<SysCorp> {
/*
* @description: 根据条件查询公司
* @author: sui q
* @date: 2023/11/20 9:29
* @param: null null
* 根据条件查询公司
**/
List<SysCorpExt> querySysCorpByCondition(SysCorpParam sysCorpParam);
}

28
bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/ISysCorpService.java
View File

@ -8,44 +8,22 @@ import com.hzs.system.sys.param.SysCorpParam;
import java.util.List;
/**
* <p>
* 组织(公司)设置 服务类
* </p>
*
* @author hzs
* @since 2023-11-20
*/
public interface ISysCorpService extends IService<SysCorp> {
/*
* @description: 保存系统公司
* @author: sui q
* @date: 2023/11/20 9:19
* @param: null null
* 保存系统公司
**/
void saveSysCorp(SysCorpParam sysCorpParam, Long pkMember);
/*
* @description: 根据条件查询公司
* @author: sui q
* @date: 2023/11/20 9:29
* @param: null null
* 根据条件查询公司
**/
List<SysCorpExt> querySysCorpByCondition(SysCorpParam sysCorpParam);
/*
* @description: 根据主键删除公司，需要验证公司是否使用
* @author: sui q
* @date: 2023/11/20 9:45
* @param: null null
* 根据主键删除公司，需要验证公司是否使用
**/
void deleteSysCorpByPk(Integer pkId, Long pkMember);
/*
* @description: 查询采购组织
* @author: sui q
* @date: 2023/11/20 17:48
* @param: null null
**/
SysCorp getSysCorp(Integer pkId, Integer pkCountry);
}

33
bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/SysCorpServiceImpl.java
View File

@ -1,14 +1,10 @@
package com.hzs.system.sys.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.constant.SystemFieldConstants;
import com.hzs.common.core.enums.EYesNo;
import com.hzs.common.core.utils.DateUtils;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.domain.system.sys.SysCorp;
import com.hzs.common.domain.system.sys.ext.SysCorpExt;
import com.hzs.system.sys.mapper.SysCorpMapper;
@ -19,23 +15,18 @@ import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 组织(公司)设置 服务实现类
* </p>
*
* @author hzs
* @since 2023-11-20
*/
@Service
public class SysCorpServiceImpl extends ServiceImpl<SysCorpMapper, SysCorp> implements ISysCorpService {
@Override
public void saveSysCorp(SysCorpParam sysCorpParam, Long pkMember) {
if(sysCorpParam.getPkId() == null){
if (sysCorpParam.getPkId() == null) {
SysCorp sysCorp = BeanUtil.copyProperties(sysCorpParam, SysCorp.class);
sysCorp.setPkCreator(pkMember);
baseMapper.insert(sysCorp);
}else{
} else {
SysCorp sysCorp = baseMapper.selectById(sysCorpParam.getPkId());
sysCorp.setPkFatherOrg(sysCorpParam.getPkFatherOrg());
sysCorp.setCorpName(sysCorpParam.getCorpName());
@ -56,20 +47,12 @@ public class SysCorpServiceImpl extends ServiceImpl<SysCorpMapper, SysCorp> impl
@Override
public void deleteSysCorpByPk(Integer pkId, Long pkMember) {
// 验证公司是否使用
UpdateWrapper<SysCorp> updateWrapper = new UpdateWrapper<>();
updateWrapper.set(SystemFieldConstants.DEL_FLAG, EYesNo.NO.getIntValue());
updateWrapper.set(SystemFieldConstants.PK_MODIFIED, pkMember);
updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, DateUtils.currentDateTime());
updateWrapper.eq(SystemFieldConstants.PK_ID, pkId);
LambdaUpdateWrapper<SysCorp> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(SysCorp::getDelFlag, EYesNo.NO.getIntValue());
updateWrapper.set(SysCorp::getPkModified, pkMember);
updateWrapper.set(SysCorp::getModifiedTime, DateUtils.currentDateTime());
updateWrapper.eq(SysCorp::getPkId, pkId);
baseMapper.delete(updateWrapper);
}
@Override
public SysCorp getSysCorp(Integer pkId, Integer pkCountry) {
QueryWrapper<SysCorp> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry);
queryWrapper.eq(SystemFieldConstants.ENABLE_STATE, EYesNo.YES.getIntValue());
queryWrapper.eq(SystemFieldConstants.PK_ID, pkId);
return baseMapper.selectOne(queryWrapper);
}
}

5
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java
View File

@ -637,11 +637,6 @@ public class EnumsPrefixConstants {
*/
public static final String DEDUCT = "ENU_BONUS_DEDUCT_";
/**
* 供应方式
*/
public static final String SUPPLY_WAY = "ENU_SUPPLY_W_";
/**
* 预售状态
*/

2
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMenuDetail.java
View File

@ -40,7 +40,7 @@ public enum EMenuDetail {
SELF_SUPPORT(331, "自营专区", "自营专区(复购)", EnumsPrefixConstants.E_MENU + "331", "self", 30),
COOPERATE(332, "复购合作", "", EnumsPrefixConstants.E_MENU + "332", "cooperation", 30),
// CLOUD(333, "工具流", "", EnumsPrefixConstants.E_MENU + "333", "gongju", 30),
// LIVE(334, "直播专区", "", EnumsPrefixConstants.E_MENU + "334", "live", 30),
LIVE(334, "秒杀专区", "", EnumsPrefixConstants.E_MENU + "334", "live", 30),
REPURCHASE_LXYK(335, "乐学甄选", "乐学易考(复购)", EnumsPrefixConstants.E_MENU + "335", "ezLearnRep", 30),
WELFARE_AREA(340, "福利专区", "", EnumsPrefixConstants.E_MENU + "340", "welfare", 30),

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

@ -39,6 +39,11 @@ public enum EOrderType {
*/
CONSUME_ORDER(10, "重消订单", 0, EnumsPrefixConstants.ORDER_TYPE + 10),
/**
* 秒杀订单
*/
MALL_ORDER(14, "秒杀订单", 0, EnumsPrefixConstants.ORDER_TYPE + 14),
/**
* 虚拟订单（空单使用）
*/

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

@ -36,6 +36,11 @@ public enum ESpecialArea {
*/
RESCISSION_AREA(10, "重消专区", 0, EnumsPrefixConstants.SPECIAL_AREA + "10", 8, EMenuDetail.REPEATED_CONSUMPTION.getValue()),
/**
* 秒杀专区
*/
LIVE_BROADCAST(14, "秒杀专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 14, 14, EMenuDetail.LIVE.getValue()),
/**
* 注册专区
*/
@ -90,13 +95,16 @@ public enum ESpecialArea {
*/
private final int menuDetailValue;
public static String getESpecialArea(int value) {
public static String getLabelByValue(Integer value) {
if (null == value) {
return "";
}
for (ESpecialArea eSpecialArea : ESpecialArea.values()) {
if (eSpecialArea.getValue() == value) {
return eSpecialArea.getLabel();
}
}
return null;
return "";
}
public static ESpecialArea getESpecialAreaEnum(int value) {

31
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESupplyWay.java
View File

@ -1,15 +1,10 @@
package com.hzs.common.core.enums;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Description: 供应方式
* @Author: jiang chao
* @Time: 2022/11/4 11:58
* @Classname: ESupplyWay
* @PackageName: com.hzs.common.core.enums
* 供应方式
*/
@AllArgsConstructor
@Getter
@ -18,12 +13,12 @@ public enum ESupplyWay {
/**
* 自营
*/
SELF(0, "自营", 0, EnumsPrefixConstants.SUPPLY_WAY + "0"),
SELF(0, "自营", 0),
/**
* 非自营
*/
NO_SELF(1, "非自营", 0, EnumsPrefixConstants.SUPPLY_WAY + "1"),
NO_SELF(1, "非自营", 0),
;
@ -39,18 +34,26 @@ public enum ESupplyWay {
* 是否启用（0=是,1=否） -- 来源EYesNo
*/
private final int enable;
/**
* 国际化翻译key值
*/
private final String key;
public static ESupplyWay getESupplyWay(int value){
public static ESupplyWay getESupplyWay(int value) {
for (ESupplyWay eSupplyWay : ESupplyWay.values()) {
if (eSupplyWay.value == value){
if (eSupplyWay.value == value) {
return eSupplyWay;
}
}
return null;
}
public static String getLabelByVal(Integer value) {
if (null == value) {
return "";
}
for (ESupplyWay eSupplyWay : ESupplyWay.values()) {
if (eSupplyWay.getValue() == value) {
return eSupplyWay.getLabel();
}
}
return "";
}
}

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberAccountExt.java
View File

@ -154,11 +154,6 @@ public class CuMemberAccountExt extends CuMemberAccount {
*/
private BigDecimal payAccount12;
/**
* 乐学易考
*/
private List<AcPickExt> pickExtList;
/**
* 海豆
*/

21
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java
View File

@ -180,4 +180,25 @@ public class BdWaresExtend extends BaseEntity {
@TableField("SYSTEM_TYPE")
private Integer systemType;
/**
* 库存数量
*/
@TableField("INVENTORY")
private Integer inventory;
/**
* 库存倒计时比例
*/
@TableField("INVENTORY_RATIO")
private Integer inventoryRatio;
/**
* 会员总限购
*/
@TableField("MEMBER_LIMIT")
private Integer memberLimit;
/**
* 会员月限购
*/
@TableField("MEMBER_MONTH_LIMIT")
private Integer memberMonthLimit;
}

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/BdCubasdoc.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 供应商设置
* </p>
*
* @author hzs
* @since 2023-11-20
*/
@Data
@EqualsAndHashCode(callSuper = true)

8
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/base/ext/BdCubasdocExt.java
View File

@ -4,14 +4,6 @@ import com.hzs.common.domain.system.base.BdCubasdoc;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @description: TODO
* @author: sui q
* @time: 2024/1/10 11:40
* @classname: BdCubasdocExt
* @package_name: com.hzs.common.domain.system.base.ext
* version 1.0.0
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class BdCubasdocExt extends BdCubasdoc {

3
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdAreaCurrency.java
View File

@ -17,9 +17,6 @@ import java.util.Date;
/**
* 消费配置表
*
* @author zhangjing
* @since 2022-08-26
*/
@Data
@EqualsAndHashCode(callSuper = false)

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/sys/SysCorp.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 组织(公司)设置
* </p>
*
* @author hzs
* @since 2023-11-20
*/
@Data
@EqualsAndHashCode(callSuper = true)