Skip to content

G
gic-platform-finance
Commit 34457bdf by guojuxing
Options

pmd

parent 6696f2a1
Showing with 698 additions and 234 deletions
gic-platform-finance-api/src/main/java/com/gic/finance/constant/BasicServiceStatusEnum.java 0 → 100644
package com.gic.finance.constant;
/**
* 商户基础服务开通状态
* @ClassName: BasicServiceStatusEnum

* @Description: 

* @author guojuxing

* @date 2020/9/11 2:11 PM

*/
public enum BasicServiceStatusEnum {
/**
* 服务开通
*/
SERVICE_OPEN(1, "服务开通"),
/**
* 服务续费
*/
SERVICE_RENEWAL(2, "服务续费"),
/**
* 版本升级
*/
VERSION_UPGRADE(3, "版本升级"),
/**
* license扩容
*/
LICENSE_EXPAN(4, "license扩容");
private Integer status;
private String description;
BasicServiceStatusEnum(Integer status, String description) {
this.status = status;
this.description = description;
}
public static BasicServiceStatusEnum getByStatus(Integer status) {
for (BasicServiceStatusEnum basicServiceStatusEnum : values()) {
if (basicServiceStatusEnum.getStatus().equals(status)) {
return basicServiceStatusEnum;
}
}
return null;
}
public Integer getStatus() {
return status;
}
public BasicServiceStatusEnum setStatus(Integer status) {
this.status = status;
return this;
}
public String getDescription() {
return description;
}
public BasicServiceStatusEnum setDescription(String description) {
this.description = description;
return this;
}
}
gic-platform-finance-api/src/main/java/com/gic/finance/constant/EnterprisePlatformTypeEnum.java
......@@ -8,7 +8,13 @@ package com.gic.finance.constant;
*/
public enum EnterprisePlatformTypeEnum {
/**
* GIC
*/
GIC(1, "GIC"),
/**
* 好办
*/
HAO_BAN(2, "好办");
private int code;
......
gic-platform-finance-api/src/main/java/com/gic/finance/constant/InitiatorTypeEnum.java
......@@ -7,7 +7,13 @@ package com.gic.finance.constant;
* @date 2019/8/13 10:56 AM

*/
public enum InitiatorTypeEnum {
/**
* 商户
*/
ENTERPRISE(1, "商户"),
/**
* 运维后台
*/
OPERATION(2, "运维后台");
private int code;
......@@ -18,6 +24,18 @@ public enum InitiatorTypeEnum {
this.message = message;
}
public static InitiatorTypeEnum getByCode(Integer code) {
if (code == null) {
return null;
}
for (InitiatorTypeEnum typeEnum : values()) {
if (code.intValue() == typeEnum.getCode()) {
return typeEnum;
}
}
return null;
}
public static String getMessageByCode(Integer code) {
if (code == null) {
return "--";
......
gic-platform-finance-api/src/main/java/com/gic/finance/constant/InvoiceStatusEnum.java
......@@ -7,12 +7,33 @@ package com.gic.finance.constant;
* @date 2019/8/14 2:30 PM

*/
public enum InvoiceStatusEnum {
/**
* 待审核
*/
TO_BE_ISSUED(1, "待审核"),
/**
* 待邮寄
*/
TO_BE_MAILED(2, "待邮寄"),
/**
* 已邮寄
*/
MAILED(3, "已邮寄"),
/**
* 已驳回
*/
REJECT(4, "已驳回"),
/**
* 已取消
*/
CANCEL(5, "已取消"),
/**
* 待发送
*/
TO_BE_SEND(6, "待发送"),
/**
* 已发送
*/
SEND(7, "已发送");
private int code;
......
gic-platform-finance-api/src/main/java/com/gic/finance/constant/InvoiceTypeEnum.java
......@@ -7,7 +7,13 @@ package com.gic.finance.constant;
* @date 2019/8/14 2:35 PM

*/
public enum InvoiceTypeEnum {
/**
* 电子普通发票
*/
NORMAL(1, "电子普通发票"),
/**
* 纸质增值税专用发票
*/
VAT_INVOICE(2, "纸质增值税专用发票");
private int code;
......
gic-platform-finance-api/src/main/java/com/gic/finance/constant/InvoiceUseStatusEnum.java
......@@ -7,8 +7,17 @@ package com.gic.finance.constant;
* @date 2019/8/13 10:56 AM

*/
public enum InvoiceUseStatusEnum {
/**
* 启用
*/
ENABLE(1, "启用"),
/**
* 停用
*/
DISABLE(2, "停用"),
/**
* 删除
*/
DELETE(3, "删除");
private int code;
......
gic-platform-finance-api/src/main/java/com/gic/finance/constant/OrderTypeEnum.java
......@@ -8,10 +8,25 @@ package com.gic.finance.constant;
* @date 2019/8/9 1:41 PM

*/
public enum OrderTypeEnum {
/**
* 充值
*/
RECHARGE(1, "充值"),
/**
* 短信套餐
*/
SHORT_MESSAGE_PACKAGE(2, "短信套餐"),
/**
* 服务
*/
SERVICE(3, "服务"),
/**
* 拓展包
*/
EXTENSION_PACKAGE(4, "拓展包"),
/**
* 套餐包
*/
PACKAGE(5, "套餐包");
private int code;
......
gic-platform-finance-api/src/main/java/com/gic/finance/constant/PayEnum.java 0 → 100644
package com.gic.finance.constant;
/**
* 支付渠道
* @ClassName: PayEnum

* @Description: 

* @author guojuxing

* @date 2020/9/11 2:21 PM

*/
public enum PayEnum {
}
gic-platform-finance-api/src/main/java/com/gic/finance/constant/TransferAccountApprovalStatusEnum.java
......@@ -8,9 +8,21 @@ package com.gic.finance.constant;
* @date 2019/8/9 1:37 PM

*/
public enum TransferAccountApprovalStatusEnum {
/**
* 待审批
*/
TO_BE_APPROVED(1, "待审批"),
/**
* 已取消
*/
CANCEL(2, "已取消"),
/**
* 已驳回
*/
REJECT(3, "已驳回"),
/**
* 审批通过
*/
AGREE(4, "审批通过");
private int code;
......
gic-platform-finance-api/src/main/java/com/gic/finance/constant/WithdrawalApplyTypeEnum.java
......@@ -7,7 +7,13 @@ package com.gic.finance.constant;
* @date 2019/8/14 2:35 PM

*/
public enum WithdrawalApplyTypeEnum {
/**
* 服务商
*/
SERVICE_PROVIDER(1, "服务商"),
/**
* 供应商
*/
SUPPLIER(2, "供应商");
private int code;
......
gic-platform-finance-api/src/main/java/com/gic/finance/constant/WithdrawalStatusEnum.java
......@@ -7,10 +7,25 @@ package com.gic.finance.constant;
* @date 2019/8/14 2:30 PM

*/
public enum WithdrawalStatusEnum {
/**
* 待审核
*/
TO_BE_EXAMINE(1, "待审核"),
/**
* 审核通过
*/
PASS(2, "审核通过"),
/**
* 已完成
*/
COMPLETE(3, "已完成"),
/**
* 已驳回
*/
REJECT(5, "已驳回"),
/**
* 已取消
*/
CANCEL(4, "已取消");
private int code;
......
gic-platform-finance-api/src/main/java/com/gic/finance/dto/CashWithdrawalDTO.java
......@@ -381,4 +381,9 @@ public class CashWithdrawalDTO implements Serializable{
public void setCashProvider(String cashProvider) {
this.cashProvider = cashProvider;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-api/src/main/java/com/gic/finance/dto/InvoiceAccountDTO.java
......@@ -157,4 +157,9 @@ public class InvoiceAccountDTO implements Serializable{
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-api/src/main/java/com/gic/finance/dto/InvoiceManageDTO.java
......@@ -476,4 +476,9 @@ public class InvoiceManageDTO implements Serializable {
this.businessLicense = businessLicense;
return this;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-api/src/main/java/com/gic/finance/dto/OperationUserInfoDTO.java
......@@ -13,11 +13,17 @@ public class OperationUserInfoDTO implements Serializable{
private static final long serialVersionUID = -570322634465207981L;
private Integer id;
// 用户登录名（账号）
/**
* 用户登录名（账号）
*/
private String loginName;
// 用户真实姓名
/**
* 用户真实姓名
*/
private String realName;
// 用户手机号',
/**
* 用户手机号',
*/
private String userMobile;
public Integer getId() {
......@@ -51,4 +57,9 @@ public class OperationUserInfoDTO implements Serializable{
public void setUserMobile(String userMobile) {
this.userMobile = userMobile;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-api/src/main/java/com/gic/finance/dto/PayAccountDTO.java
......@@ -154,4 +154,9 @@ public class PayAccountDTO implements Serializable{
public void setSeq(Integer seq) {
this.seq = seq;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-api/src/main/java/com/gic/finance/dto/TransferAccountsApprovalDTO.java
......@@ -331,4 +331,8 @@ public class TransferAccountsApprovalDTO implements Serializable{
this.orderType = orderType;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-api/src/main/java/com/gic/finance/dto/callback/InvoiceCallbackDTO.java
......@@ -248,4 +248,9 @@ public class InvoiceCallbackDTO implements Serializable{
this.businessLicense = businessLicense;
return this;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-api/src/main/java/com/gic/finance/service/CashWithdrawalApiService.java
......@@ -52,6 +52,7 @@ public interface CashWithdrawalApiService {
* @Description:

 * @author guojuxing
* @param id

* @param dto
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


 */
ServiceResponse<Void> approval(Integer id, OperationUserInfoDTO dto);
......@@ -73,6 +74,7 @@ public interface CashWithdrawalApiService {

 * @author guojuxing
* @param id 主键
* @param rejectReason
 驳回理由
* @param dto
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


 */
ServiceResponse<Void> reject(Integer id, String rejectReason, OperationUserInfoDTO dto);
......
gic-platform-finance-api/src/main/java/com/gic/finance/service/InvoiceManageApiService.java
......@@ -45,6 +45,7 @@ public interface InvoiceManageApiService {
* @param invoiceManageId
* @param expressMailName
* @param expressMailNumber

* @param dto
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


 */
ServiceResponse<Void> invoice(Integer invoiceManageId, String expressMailName, String expressMailNumber, OperationUserInfoDTO dto);
......@@ -65,6 +66,7 @@ public interface InvoiceManageApiService {

 * @author guojuxing
* @param invoiceManageId
* @param rejectReason
 驳回理由
* @param dto
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


 */
ServiceResponse<Void> rejectInvoice(Integer invoiceManageId, String rejectReason, OperationUserInfoDTO dto);
......
gic-platform-finance-api/src/main/java/com/gic/finance/service/TransferAccountsApprovalApiService.java
......@@ -104,6 +104,7 @@ public interface TransferAccountsApprovalApiService {

 * @author guojuxing
* @param transferApprovalId
* @param accountAmount

* @param userInfoDTO
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


 */
ServiceResponse<Void> agreeApproval(Integer transferApprovalId, Double accountAmount, OperationUserInfoDTO userInfoDTO);
......@@ -114,6 +115,7 @@ public interface TransferAccountsApprovalApiService {
* @Description:

 * @author guojuxing
* @param transferApprovalId
 转账审批主键
* @param userInfoDTO
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


 */
ServiceResponse<Void> rejectApproval(Integer transferApprovalId, OperationUserInfoDTO userInfoDTO);
......
gic-platform-finance-service/src/main/java/com/gic/finance/dao/mapper/TabCashWithdrawalMapper.java
......@@ -4,7 +4,13 @@ import com.gic.finance.entity.TabCashWithdrawal;
import com.gic.finance.qo.CashWithdrawalQueryListQO;
import java.util.List;
/**
* 提现
* @ClassName: TabCashWithdrawalMapper

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:36 AM

*/
public interface TabCashWithdrawalMapper {
/**
* 根据主键删除
......@@ -64,5 +70,13 @@ public interface TabCashWithdrawalMapper {

 */
List<TabCashWithdrawal> listCashWithdrawal(CashWithdrawalQueryListQO params);
/**
* 根据流水号查询
* @Title: getBySerialNumber

* @Description:

* @author guojuxing
* @param serialNumber

* @return com.gic.finance.entity.TabCashWithdrawal


*/
TabCashWithdrawal getBySerialNumber(String serialNumber);
}
\ No newline at end of file
gic-platform-finance-service/src/main/java/com/gic/finance/dao/mapper/TabInvoiceAccountMapper.java
......@@ -3,7 +3,13 @@ package com.gic.finance.dao.mapper;
import com.gic.finance.entity.TabInvoiceAccount;
import java.util.List;
/**
* 发票账号管理
* @ClassName: TabInvoiceAccountMapper

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:35 AM

*/
public interface TabInvoiceAccountMapper {
/**
* 根据主键删除
......
gic-platform-finance-service/src/main/java/com/gic/finance/dao/mapper/TabInvoiceManageMapper.java
......@@ -5,7 +5,13 @@ import com.gic.finance.qo.InvoiceManageListQueryQO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 发票
* @ClassName: TabInvoiceManageMapper

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:35 AM

*/
public interface TabInvoiceManageMapper {
/**
* 根据主键删除
......
gic-platform-finance-service/src/main/java/com/gic/finance/dao/mapper/TabPayAccountMapper.java
......@@ -4,7 +4,13 @@ import com.gic.finance.entity.TabPayAccount;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 开户
* @ClassName: TabPayAccountMapper

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:36 AM

*/
public interface TabPayAccountMapper {
/**
* 根据主键删除
......@@ -72,6 +78,13 @@ public interface TabPayAccountMapper {

 */
int getMaxSort();
/**
* 查询排序之最小的值
* @Title: getMinSort

* @Description:

* @author guojuxing 

* @return int


*/
int getMinSort();
/**
......
gic-platform-finance-service/src/main/java/com/gic/finance/dao/mapper/TabTransferAccountsApprovalMapper.java
......@@ -6,7 +6,13 @@ import org.apache.ibatis.annotations.Param;
import com.gic.finance.entity.TabTransferAccountsApproval;
import java.util.List;
/**
* 转账审批
* @ClassName: TabTransferAccountsApprovalMapper

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:33 AM

*/
public interface TabTransferAccountsApprovalMapper {
/**
* 根据主键删除
......@@ -76,5 +82,13 @@ public interface TabTransferAccountsApprovalMapper {

 */
List<TabTransferAccountsApproval> listTransferAccountsApproval(TransferListQueryQO params);
/**
* 根据订单流水号查询转账审批记录
* @Title: listByOrderSerialNumber

* @Description:

* @author guojuxing
* @param orderSerialNumberList

* @return java.util.List<com.gic.finance.entity.TabTransferAccountsApproval>


*/
List<TabTransferAccountsApproval> listByOrderSerialNumber(@Param("list") List<String> orderSerialNumberList);
}
\ No newline at end of file
gic-platform-finance-service/src/main/java/com/gic/finance/entity/TabCashWithdrawal.java
......@@ -3,7 +3,11 @@ package com.gic.finance.entity;
import java.util.Date;
/**
* tab_cash_withdrawal
* 提现
* @ClassName: TabCashWithdrawal

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:36 AM

*/
public class TabCashWithdrawal {
/**
......
gic-platform-finance-service/src/main/java/com/gic/finance/entity/TabInvoiceAccount.java
......@@ -3,7 +3,11 @@ package com.gic.finance.entity;
import java.util.Date;
/**
* tab_invoice_account
* 发票管理
* @ClassName: TabInvoiceAccount

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:34 AM

*/
public class TabInvoiceAccount {
/**
......
gic-platform-finance-service/src/main/java/com/gic/finance/entity/TabInvoiceManage.java
......@@ -3,7 +3,11 @@ package com.gic.finance.entity;
import java.util.Date;
/**
* tab_invoice_manage
* 发票管理
* @ClassName: TabInvoiceManage

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:34 AM

*/
public class TabInvoiceManage {
/**
......
gic-platform-finance-service/src/main/java/com/gic/finance/entity/TabPayAccount.java
......@@ -3,7 +3,11 @@ package com.gic.finance.entity;
import java.util.Date;
/**
* tab_pay_account
* 开户
* @ClassName: TabPayAccount

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:36 AM

*/
public class TabPayAccount {
/**
......
gic-platform-finance-service/src/main/java/com/gic/finance/entity/TabTransferAccountsApproval.java
......@@ -3,7 +3,11 @@ package com.gic.finance.entity;
import java.util.Date;
/**
* tab_transfer_accounts_approval
* 转账审批
* @ClassName: TabTransferAccountsApproval

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:33 AM

*/
public class TabTransferAccountsApproval {
/**
......@@ -304,4 +308,9 @@ public class TabTransferAccountsApproval {
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
@Override
public String toString() {
return super.toString();
}
}
\ No newline at end of file
gic-platform-finance-service/src/main/java/com/gic/finance/service/CashWithdrawalService.java
......@@ -44,7 +44,14 @@ public interface CashWithdrawalService {

 */
Page<TabCashWithdrawal> pageCashWithdrawal(CashWithdrawalQueryListQO params);
/**
* 查询
* @Title: getById

* @Description:

* @author guojuxing
* @param id

* @return com.gic.finance.entity.TabCashWithdrawal


*/
TabCashWithdrawal getById(Integer id);
/**
......
gic-platform-finance-service/src/main/java/com/gic/finance/service/InvoiceAccountService.java
......@@ -33,6 +33,14 @@ public interface InvoiceAccountService {

 */
TabInvoiceAccount getEnable();
/**
* 查询
* @Title: getById

* @Description:

* @author guojuxing
* @param id

* @return com.gic.finance.entity.TabInvoiceAccount


*/
TabInvoiceAccount getById(Integer id);
/**
* 更新
......
gic-platform-finance-service/src/main/java/com/gic/finance/service/PayAccountService.java
......@@ -23,6 +23,14 @@ public interface PayAccountService {

 */
int save(PayAccountDTO dto);
/**
* 编辑
* @Title: update

* @Description:

* @author guojuxing
* @param dto

* @return int


*/
int update(PayAccountDTO dto);
/**
......@@ -64,6 +72,13 @@ public interface PayAccountService {

 */
int getTheMaxSort();
/**
* 查询排序值最小的值
* @Title: getMinSort

* @Description:

* @author guojuxing 

* @return int


*/
int getMinSort();
/**
......
gic-platform-finance-service/src/main/java/com/gic/finance/service/impl/CashWithdrawalServiceImpl.java
......@@ -13,7 +13,13 @@ import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* 提现
* @ClassName: CashWithdrawalServiceImpl

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:37 AM

*/
@Service("cashWithdrawalService")
public class CashWithdrawalServiceImpl implements CashWithdrawalService {
@Autowired
......
gic-platform-finance-service/src/main/java/com/gic/finance/service/impl/InvoiceAccountServiceImpl.java
......@@ -10,7 +10,13 @@ import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* 发票账号
* @ClassName: InvoiceAccountServiceImpl

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:36 AM

*/
@Service("invoiceAccountService")
public class InvoiceAccountServiceImpl implements InvoiceAccountService{
@Autowired
......
gic-platform-finance-service/src/main/java/com/gic/finance/service/impl/InvoiceManageServiceImpl.java
......@@ -14,7 +14,13 @@ import com.gic.finance.service.InvoiceManageService;
import java.util.Date;
import java.util.List;
/**
* 发票
* @ClassName: InvoiceManageServiceImpl

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:35 AM

*/
@Service("invoiceManageService")
public class InvoiceManageServiceImpl implements InvoiceManageService{
@Autowired
......
gic-platform-finance-service/src/main/java/com/gic/finance/service/impl/PayAccountServiceImpl.java
......@@ -11,7 +11,13 @@ import com.gic.finance.dao.mapper.TabPayAccountMapper;
import com.gic.finance.dto.PayAccountDTO;
import com.gic.finance.entity.TabPayAccount;
import com.gic.finance.service.PayAccountService;
/**
* 开户
* @ClassName: PayAccountServiceImpl

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:37 AM

*/
@Service("payAccountService")
public class PayAccountServiceImpl implements PayAccountService {
@Autowired
......
gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/CashWithdrawalApiServiceImpl.java
......@@ -24,7 +24,13 @@ import com.gic.finance.qo.CashWithdrawalQueryListQO;
import com.gic.finance.service.CashWithdrawalApiService;
import com.gic.finance.service.CashWithdrawalService;
import com.gic.finance.service.PayAccountService;
/**
* 提现
* @ClassName: CashWithdrawalApiServiceImpl

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:37 AM

*/
@Service("cashWithdrawalApiService")
public class CashWithdrawalApiServiceImpl implements CashWithdrawalApiService{
@Autowired
......
gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/InvoiceAccountApiServiceImpl.java
......@@ -17,7 +17,13 @@ import com.gic.finance.dto.InvoiceAccountDTO;
import com.gic.finance.entity.TabInvoiceAccount;
import com.gic.finance.service.InvoiceAccountApiService;
import com.gic.finance.service.InvoiceAccountService;
/**
* 发票账号
* @ClassName: InvoiceAccountApiServiceImpl

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:35 AM

*/
@Service("invoiceAccountApiService")
public class InvoiceAccountApiServiceImpl implements InvoiceAccountApiService {
@Autowired
......
gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/InvoiceManageApiServiceImpl.java
......@@ -31,7 +31,13 @@ import com.gic.finance.qo.InvoiceManageListQueryQO;
import com.gic.finance.service.InvoiceAccountService;
import com.gic.finance.service.InvoiceManageApiService;
import com.gic.finance.service.InvoiceManageService;
/**
* 发票
* @ClassName: InvoiceManageApiServiceImpl

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:35 AM

*/
@Service("invoiceManageApiService")
public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
private static final Logger LOGGER = LogManager.getLogger(InvoiceManageApiServiceImpl.class);
......@@ -44,13 +50,17 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
@Autowired
private UserApiService userApiService;
private static final Integer LEAST_INVOICE_MONEY = 1000;
private static final String INVOICE_SMS_CODE = "GICJFZX010";
private static final String INVOICE_REJECT_SMS_CODE = "GICJFZX011";
public ServiceResponse<String> applyInvoiceInit(InvoiceManageDTO invoiceManageDTO) {
ServiceResponse paramResponse = ValidParamsUtils.allCheckValidate(invoiceManageDTO,
InvoiceManageDTO.ApplyInvoiceValid.class);
if (!paramResponse.isSuccess()) {
return paramResponse;
}
if (invoiceManageDTO.getBillingAmount() < 1000) {
if (invoiceManageDTO.getBillingAmount() < LEAST_INVOICE_MONEY) {
//如果开票金额小于1000，则不允许开票
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "开票金额小于1000");
}
......@@ -123,12 +133,6 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
}
getOperationUserInfo(invoiceManageDTO, dto);
//开票户信息插入
// TabInvoiceAccount account = invoiceAccountService.getEnable();
// if (account == null) {
// return ServiceResponse.failure(ErrorCode.SYSTEM_ERROR.getCode(), "没有启用的开票户信息，请启用");
// }
// invoiceManageDTO.setInvoicerId(account.getInvoiceAccountId());
invoiceManageService.update(invoiceManageDTO);
//回调
......@@ -138,7 +142,7 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
"invoiceCallback");
}
sendSms(tabInvoiceManage, "GICJFZX010");
sendSms(tabInvoiceManage, INVOICE_SMS_CODE);
return ServiceResponse.success();
}
......@@ -194,7 +198,7 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
"invoiceCallback");
}
sendSms(tabInvoiceManage, "GICJFZX011");
sendSms(tabInvoiceManage, INVOICE_REJECT_SMS_CODE);
return ServiceResponse.success();
}
......@@ -265,12 +269,12 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
UserDTO userDTO = userResponse.getResult();
String[] smsArr = null;
if ("GICJFZX010".equals(smsSceneId)) {
if (INVOICE_SMS_CODE.equals(smsSceneId)) {
smsArr= new String[]{tabInvoiceManage.getEnterpriseName(),
tabInvoiceManage.getInvoiceApplySerial(),
tabInvoiceManage.getExpressMailName(),
tabInvoiceManage.getExpressMailNumber()};
} else if ("GICJFZX011".equals(smsSceneId)) {
} else if (INVOICE_REJECT_SMS_CODE.equals(smsSceneId)) {
smsArr = new String[]{tabInvoiceManage.getEnterpriseName(),
tabInvoiceManage.getInvoiceApplySerial(), tabInvoiceManage.getRejectReason()};
}
......
gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/PayAccountApiServiceImpl.java
......@@ -16,7 +16,13 @@ import com.gic.finance.dto.PayAccountDTO;
import com.gic.finance.entity.TabPayAccount;
import com.gic.finance.service.PayAccountApiService;
import com.gic.finance.service.PayAccountService;
/**
* 开户账号
* @ClassName: PayAccountApiServiceImpl

* @Description: 

* @author guojuxing

* @date 2020/9/11 11:37 AM

*/
@Service("payAccountApiService")
public class PayAccountApiServiceImpl implements PayAccountApiService {
@Autowired
......
gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/TransferAccountsApprovalApiServiceImpl.java
......@@ -139,9 +139,6 @@ public class TransferAccountsApprovalApiServiceImpl implements TransferAccountsA
@Override
public ServiceResponse<TransferAccountsApprovalDTO> getByOrderNumber(String orderNumber) {
TabTransferAccountsApproval tab = transferAccountsApprovalService.getByOrderNumber(orderNumber);
// if (tab == null) {
// return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "订单流水号有误，查询不到数据");
// }
return ServiceResponse.success(EntityUtil.changeEntityNew(TransferAccountsApprovalDTO.class, tab));
}
......@@ -190,7 +187,8 @@ public class TransferAccountsApprovalApiServiceImpl implements TransferAccountsA
if (!applicationResult.isSuccess()) {
LOGGER.warn("财务审批通过-应用信息结果:{}, {}", applicationResult.getCode(), applicationResult.getMessage());
}
if ("gic".equals(applicationResult.getResult().getModuleCode())) {
String gicModuleCode = "gic";
if (gicModuleCode.equals(applicationResult.getResult().getModuleCode())) {
//是基础服务
ServiceResponse<UserDTO> userResult = userApiService.getUserByEnterpriseId(tab.getEnterpriseId());
UserDTO userDTO = userResult.getResult();
......
gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/EnterpriseWhiteListController.java
......@@ -12,7 +12,13 @@ import org.springframework.web.bind.annotation.RestController;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.service.EnterpriseWhiteListApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
/**
* 白名单
* @ClassName: EnterpriseWhiteListController

* @Description: 

* @author guojuxing

* @date 2020/9/11 2:28 PM

*/
@RestController
@RequestMapping("/white-list")
public class EnterpriseWhiteListController {
......
gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/InvoiceManageController.java
......@@ -152,24 +152,6 @@ public class InvoiceManageController {
if (invoiceResult.isSuccess()) {
InvoiceManageDTO invoice = invoiceResult.getResult();
InvoiceManagerDetailVO vo = EntityUtil.changeEntityNew(InvoiceManagerDetailVO.class, invoice);
//不再去去开票户数据，而是gic后台填写的数据
// ServiceResponse<InvoiceAccountDTO> accountResult;
// if (invoice.getInvoicerId() != null) {
// accountResult = invoiceAccountApiService.getById(invoice.getInvoicerId());
// } else {
// accountResult = invoiceAccountApiService.getEnable();
// }
// if (accountResult.isSuccess()) {
// InvoiceAccountDTO account = accountResult.getResult();
// vo.setAccountName(account.getAccountName());
// vo.setAccountPhone(account.getAccountPhone());
// vo.setAddress(account.getAddress());
// vo.setBank(account.getBank());
// vo.setBankAccount(account.getBankAccount());
// vo.setTaxNumberOfInvoice(account.getTaxNumber());
// } else {
// return EnterpriseRestResponse.failure(accountResult);
// }
return RestResponse.success(vo);
} else {
return EnterpriseRestResponse.failure(invoiceResult);
......
gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/TransferAccountsApprovalController.java
......@@ -66,150 +66,11 @@ public class TransferAccountsApprovalController {
TransferAccountsApprovalDTO transfer = transferResult.getResult();
//短信套餐包
if (transfer.getOrderType().intValue() == OrderTypeEnum.SHORT_MESSAGE_PACKAGE.getCode()) {
ServiceResponse<BillingOrderDTO> orderDetail = billingOrderApiService
.getOrderBySerialNumber(transfer.getOrderNumber());
TransferApprovalSmsVO vo = EntityUtil.changeEntityNew(TransferApprovalSmsVO.class, transfer);
if (orderDetail.isSuccess()) {
BillingOrderDTO order = orderDetail.getResult();
//订单详情
vo.setOrderItemJson(order.getItemJson());
vo.setPayInfoSerialNumber(order.getPayInfoSerialNumber());
vo.setCouponCardContent(order.getCouponCardContent());
vo.setCouponCardName(order.getCouponCardName());
vo.setTotalFeePaid(order.getTotalFeePaid());
vo.setTotalFee(order.getTotalFee());
//总计费用：计划金额 - 优惠券
if (order.getCouponCardContent() == null) {
order.setCouponCardContent(0D);
}
vo.setTotalCountFee(transfer.getPlannedAmount() - order.getCouponCardContent());
return RestResponse.success(vo);
} else {
return EnterpriseRestResponse.failure(orderDetail);
}
return shortMessagePackage(transfer);
} else if (transfer.getOrderType().intValue() == OrderTypeEnum.RECHARGE.getCode()) {
TransferApprovalRechargeVO vo = EntityUtil.changeEntityNew(TransferApprovalRechargeVO.class, transfer);
ServiceResponse<BillingRechargeRecordDTO> rechargeResult = billingRechargeRecordApiService
.getRechargeRecordForApproval(transfer.getOrderNumber());
if (rechargeResult.isSuccess()) {
BillingRechargeRecordDTO recharge = rechargeResult.getResult();
//支付流水号
vo.setPayInfoSerialNumber(recharge.getPayInfoSerialNumber());
vo.setTotalCountFee(transfer.getPlannedAmount());
return RestResponse.success(vo);
} else {
return EnterpriseRestResponse.failure(rechargeResult);
}
return recharge(transfer);
} else {
TransferApprovalServiceVO vo = EntityUtil.changeEntityNew(TransferApprovalServiceVO.class, transfer);
ServiceResponse<OrderDTO> orderResult = orderApiService.getOrderForFinance(transfer.getOrderNumber());
if (orderResult.isSuccess()) {
OrderDTO orderDTO = orderResult.getResult();
vo.setOrderCreateTime(orderDTO.getCreateTime());
//支付类型
vo.setPayType(orderDTO.getPayType());
//支付流水号
vo.setPayInfoSerialNumber(orderDTO.getPayNumber());
vo.setTotalCountFee(transfer.getPlannedAmount());
vo.setRelationOrderType(orderDTO.getOrderType());
vo.setOperType(orderDTO.getOperType());
vo.setOperName(orderDTO.getOperName());
vo.setPayDetail(orderDTO.getPayDetail());
String couponName = orderDTO.getCouponName();
if (!StringUtils.isBlank(couponName)) {
ServiceDiscountVO discountVO = new ServiceDiscountVO();
discountVO.setDiscountDetail(orderDTO.getDiscountDetail());
discountVO.setDiscountName(couponName);
vo.setServiceDiscountVO(discountVO);
}
if (orderDTO.getOrderItemList() != null) {
List<ServiceInfoVO> serviceInfoVOList = new ArrayList<>();
List<ExpandPackageVO> expandPackageVOList = new ArrayList<>();
List<LicenseVO> licenseVOList = new ArrayList<>();
for (OrderItemDTO itemDTO : orderDTO.getOrderItemList()) {
if (itemDTO.getServeType() == 1) {
//服务
ServiceInfoVO serviceInfoVO = new ServiceInfoVO();
serviceInfoVO.setServeName(itemDTO.getServeName());
serviceInfoVO.setSkuInfo(itemDTO.getSkuInfo());
//销售价
serviceInfoVO.setTotalAmount(itemDTO.getSaleAmount());
serviceInfoVO.setServeInfo(itemDTO.getServeInfo());
serviceInfoVO.setApplicationId(itemDTO.getApplicationId());
serviceInfoVO.setPayDetail(itemDTO.getPayDetail());
serviceInfoVOList.add(serviceInfoVO);
} else if (itemDTO.getServeType() == 2) {
//license
LicenseVO licenseVO = new LicenseVO();
licenseVO.setLicenseUnit(itemDTO.getLicenseUnit());
licenseVO.setServeName(itemDTO.getServeName());
//销售价
licenseVO.setTotalAmount(itemDTO.getSaleAmount());
licenseVO.setServeQuantity(itemDTO.getServeQuantity());
licenseVO.setServeInfo(itemDTO.getServeInfo());
licenseVO.setApplicationId(itemDTO.getApplicationId());
licenseVO.setPayDetail(itemDTO.getPayDetail());
licenseVOList.add(licenseVO);
} else if (itemDTO.getServeType() == 3) {
//拓展包
ExpandPackageVO expandPackageVO = new ExpandPackageVO();
expandPackageVO.setImageUrl(itemDTO.getImageUrl());
expandPackageVO.setServeName(itemDTO.getServeName());
expandPackageVO.setServeQuantity(itemDTO.getServeQuantity());
//销售价
expandPackageVO.setTotalAmount(itemDTO.getSaleAmount());
expandPackageVO.setPayDetail(itemDTO.getPayDetail());
expandPackageVO.setServeInfo(itemDTO.getServeInfo());
expandPackageVOList.add(expandPackageVO);
}
}
Map<Long, List<LicenseVO>> licenseMap;
if (licenseVOList.size() > 0) {
//license是在服务下面，进行匹配
licenseMap = CollectionUtil.group(licenseVOList, "applicationId");
vo.setLicenseVOList(licenseVOList);
} else {
licenseMap = new HashMap<>(2);
}
if (serviceInfoVOList.size() > 0) {
for (ServiceInfoVO serviceInfoVO : serviceInfoVOList) {
if (licenseMap.containsKey(serviceInfoVO.getApplicationId())) {
serviceInfoVO.setLicenseVOList(licenseMap.get(serviceInfoVO.getApplicationId()));
}
}
vo.setServiceInfoVOList(serviceInfoVOList);
} else if (licenseVOList.size() > 0) {
//没有服务，只有license数据，比如扩容
ServiceInfoVO temp = new ServiceInfoVO();
boolean isGicEnterprise = transfer.getPlatformType() != null && transfer.getPlatformType()
.intValue() == EnterprisePlatformTypeEnum.GIC.getCode();
if (isGicEnterprise) {
ServiceResponse<EnterpriseDTO> tempResult = enterpriseApiService
.getEnterpriseById(transfer.getEnterpriseId());
if (tempResult.isSuccess()) {
temp.setVersionName(orderDTO.getServeName() + "-" + tempResult.getResult().getVersionName());
} else {
LOGGER.warn(tempResult.getMessage());
}
} else {
temp.setVersionName(orderDTO.getServeName());
}
temp.setLicenseVOList(licenseVOList);
serviceInfoVOList.add(temp);
vo.setServiceInfoVOList(serviceInfoVOList);
}
if (expandPackageVOList.size() > 0) {
vo.setExpandPackageVOList(expandPackageVOList);
}
}
return RestResponse.success(vo);
} else {
return EnterpriseRestResponse.failure(orderResult);
}
return serviceOrder(transfer);
}
} else {
return EnterpriseRestResponse.failure(transferResult);
......@@ -238,4 +99,160 @@ public class TransferAccountsApprovalController {
return ResultControllerUtils.commonPageResult(
transferAccountsApprovalApiService.listTransferAccountsApproval(params), TransferApprovalListVO.class);
}
/**
* 充值处理
* @param transfer
* @return
*/
private RestResponse recharge(TransferAccountsApprovalDTO transfer) {
TransferApprovalRechargeVO vo = EntityUtil.changeEntityNew(TransferApprovalRechargeVO.class, transfer);
ServiceResponse<BillingRechargeRecordDTO> rechargeResult = billingRechargeRecordApiService
.getRechargeRecordForApproval(transfer.getOrderNumber());
if (rechargeResult.isSuccess()) {
BillingRechargeRecordDTO recharge = rechargeResult.getResult();
//支付流水号
vo.setPayInfoSerialNumber(recharge.getPayInfoSerialNumber());
vo.setTotalCountFee(transfer.getPlannedAmount());
return RestResponse.success(vo);
} else {
return EnterpriseRestResponse.failure(rechargeResult);
}
}
private RestResponse shortMessagePackage(TransferAccountsApprovalDTO transfer) {
ServiceResponse<BillingOrderDTO> orderDetail = billingOrderApiService
.getOrderBySerialNumber(transfer.getOrderNumber());
TransferApprovalSmsVO vo = EntityUtil.changeEntityNew(TransferApprovalSmsVO.class, transfer);
if (orderDetail.isSuccess()) {
BillingOrderDTO order = orderDetail.getResult();
//订单详情
vo.setOrderItemJson(order.getItemJson());
vo.setPayInfoSerialNumber(order.getPayInfoSerialNumber());
vo.setCouponCardContent(order.getCouponCardContent());
vo.setCouponCardName(order.getCouponCardName());
vo.setTotalFeePaid(order.getTotalFeePaid());
vo.setTotalFee(order.getTotalFee());
//总计费用：计划金额 - 优惠券
if (order.getCouponCardContent() == null) {
order.setCouponCardContent(0D);
}
vo.setTotalCountFee(transfer.getPlannedAmount() - order.getCouponCardContent());
return RestResponse.success(vo);
} else {
return EnterpriseRestResponse.failure(orderDetail);
}
}
private RestResponse serviceOrder(TransferAccountsApprovalDTO transfer) {
TransferApprovalServiceVO vo = EntityUtil.changeEntityNew(TransferApprovalServiceVO.class, transfer);
ServiceResponse<OrderDTO> orderResult = orderApiService.getOrderForFinance(transfer.getOrderNumber());
if (orderResult.isSuccess()) {
OrderDTO orderDTO = orderResult.getResult();
vo.setOrderCreateTime(orderDTO.getCreateTime());
//支付类型
vo.setPayType(orderDTO.getPayType());
//支付流水号
vo.setPayInfoSerialNumber(orderDTO.getPayNumber());
vo.setTotalCountFee(transfer.getPlannedAmount());
vo.setRelationOrderType(orderDTO.getOrderType());
vo.setOperType(orderDTO.getOperType());
vo.setOperName(orderDTO.getOperName());
vo.setPayDetail(orderDTO.getPayDetail());
String couponName = orderDTO.getCouponName();
if (!StringUtils.isBlank(couponName)) {
ServiceDiscountVO discountVO = new ServiceDiscountVO();
discountVO.setDiscountDetail(orderDTO.getDiscountDetail());
discountVO.setDiscountName(couponName);
vo.setServiceDiscountVO(discountVO);
}
if (orderDTO.getOrderItemList() != null) {
List<ServiceInfoVO> serviceInfoVOList = new ArrayList<>();
List<ExpandPackageVO> expandPackageVOList = new ArrayList<>();
List<LicenseVO> licenseVOList = new ArrayList<>();
for (OrderItemDTO itemDTO : orderDTO.getOrderItemList()) {
if (itemDTO.getServeType() == 1) {
//服务
ServiceInfoVO serviceInfoVO = new ServiceInfoVO();
serviceInfoVO.setServeName(itemDTO.getServeName());
serviceInfoVO.setSkuInfo(itemDTO.getSkuInfo());
//销售价
serviceInfoVO.setTotalAmount(itemDTO.getSaleAmount());
serviceInfoVO.setServeInfo(itemDTO.getServeInfo());
serviceInfoVO.setApplicationId(itemDTO.getApplicationId());
serviceInfoVO.setPayDetail(itemDTO.getPayDetail());
serviceInfoVOList.add(serviceInfoVO);
} else if (itemDTO.getServeType() == 2) {
//license
LicenseVO licenseVO = new LicenseVO();
licenseVO.setLicenseUnit(itemDTO.getLicenseUnit());
licenseVO.setServeName(itemDTO.getServeName());
//销售价
licenseVO.setTotalAmount(itemDTO.getSaleAmount());
licenseVO.setServeQuantity(itemDTO.getServeQuantity());
licenseVO.setServeInfo(itemDTO.getServeInfo());
licenseVO.setApplicationId(itemDTO.getApplicationId());
licenseVO.setPayDetail(itemDTO.getPayDetail());
licenseVOList.add(licenseVO);
} else if (itemDTO.getServeType() == 3) {
//拓展包
ExpandPackageVO expandPackageVO = new ExpandPackageVO();
expandPackageVO.setImageUrl(itemDTO.getImageUrl());
expandPackageVO.setServeName(itemDTO.getServeName());
expandPackageVO.setServeQuantity(itemDTO.getServeQuantity());
//销售价
expandPackageVO.setTotalAmount(itemDTO.getSaleAmount());
expandPackageVO.setPayDetail(itemDTO.getPayDetail());
expandPackageVO.setServeInfo(itemDTO.getServeInfo());
expandPackageVOList.add(expandPackageVO);
}
}
Map<Long, List<LicenseVO>> licenseMap;
if (licenseVOList.size() > 0) {
//license是在服务下面，进行匹配
licenseMap = CollectionUtil.group(licenseVOList, "applicationId");
vo.setLicenseVOList(licenseVOList);
} else {
licenseMap = new HashMap<>(2);
}
if (serviceInfoVOList.size() > 0) {
for (ServiceInfoVO serviceInfoVO : serviceInfoVOList) {
if (licenseMap.containsKey(serviceInfoVO.getApplicationId())) {
serviceInfoVO.setLicenseVOList(licenseMap.get(serviceInfoVO.getApplicationId()));
}
}
vo.setServiceInfoVOList(serviceInfoVOList);
} else if (licenseVOList.size() > 0) {
//没有服务，只有license数据，比如扩容
ServiceInfoVO temp = new ServiceInfoVO();
boolean isGicEnterprise = transfer.getPlatformType() != null && transfer.getPlatformType()
.intValue() == EnterprisePlatformTypeEnum.GIC.getCode();
if (isGicEnterprise) {
ServiceResponse<EnterpriseDTO> tempResult = enterpriseApiService
.getEnterpriseById(transfer.getEnterpriseId());
if (tempResult.isSuccess()) {
temp.setVersionName(orderDTO.getServeName() + "-" + tempResult.getResult().getVersionName());
} else {
LOGGER.warn(tempResult.getMessage());
}
} else {
temp.setVersionName(orderDTO.getServeName());
}
temp.setLicenseVOList(licenseVOList);
serviceInfoVOList.add(temp);
vo.setServiceInfoVOList(serviceInfoVOList);
}
if (expandPackageVOList.size() > 0) {
vo.setExpandPackageVOList(expandPackageVOList);
}
}
return RestResponse.success(vo);
} else {
return EnterpriseRestResponse.failure(orderResult);
}
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/UserController.java
......@@ -4,7 +4,13 @@ import com.gic.authcenter.security.core.util.UserUtils;
import com.gic.commons.webapi.reponse.RestResponse;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 运维后台用户
* @ClassName: UserController

* @Description: 

* @author guojuxing

* @date 2020/9/11 2:27 PM

*/
@RestController
@RequestMapping("/user")
public class UserController {
......
gic-platform-finance-web/src/main/java/com/gic/finance/web/utils/UserInfoUtils.java
......@@ -4,7 +4,13 @@ import com.gic.authcenter.security.core.dto.UserDetailsVO;
import com.gic.authcenter.security.core.util.UserUtils;
import com.gic.commons.util.EntityUtil;
import com.gic.finance.dto.OperationUserInfoDTO;
/**
* 运维后台session信息工具
* @ClassName: UserInfoUtils

* @Description: 

* @author guojuxing

* @date 2020/9/11 2:28 PM

*/
public class UserInfoUtils {
public static OperationUserInfoDTO getOpertaionUserInfo() {
......
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/CashWithdrawalDetailVO.java
......@@ -310,4 +310,9 @@ public class CashWithdrawalDetailVO implements Serializable{
public void setBankSerialNumber(String bankSerialNumber) {
this.bankSerialNumber = bankSerialNumber;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/CashWithdrawalListVO.java
......@@ -129,4 +129,9 @@ public class CashWithdrawalListVO implements Serializable{
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/EnterpriseInfoOfSelectVO.java
package com.gic.finance.web.vo;
import java.io.Serializable;
/**
* 商户下拉列表
* @ClassName: EnterpriseInfoOfSelectVO

* @Description: 

* @author guojuxing

* @date 2020/9/11 2:28 PM

*/
public class EnterpriseInfoOfSelectVO implements Serializable{
private static final long serialVersionUID = -1757627270407759229L;
......@@ -35,4 +41,8 @@ public class EnterpriseInfoOfSelectVO implements Serializable{
this.companyName = companyName;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/ExpandPackageVO.java
......@@ -24,7 +24,9 @@ public class ExpandPackageVO implements Serializable{
private BigDecimal totalAmount;
// 购买数量
/**
* 购买数量
*/
private Integer serveQuantity;
/**
......@@ -90,4 +92,9 @@ public class ExpandPackageVO implements Serializable{
public void setPayDetail(String payDetail) {
this.payDetail = payDetail;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/InvoiceManageListVO.java
......@@ -192,4 +192,9 @@ public class InvoiceManageListVO implements Serializable{
this.invoiceType = invoiceType;
return this;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/InvoiceManagerDetailVO.java
......@@ -376,4 +376,9 @@ public class InvoiceManagerDetailVO implements Serializable{
this.businessLicense = businessLicense;
return this;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/LicenseVO.java
......@@ -29,7 +29,9 @@ public class LicenseVO implements Serializable{
private BigDecimal totalAmount;
// 购买数量
/**
* 购买数量
*/
private Integer serveQuantity;
private String licenseUnit;
......@@ -99,4 +101,9 @@ public class LicenseVO implements Serializable{
public void setPayDetail(String payDetail) {
this.payDetail = payDetail;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/ServiceDiscountVO.java
......@@ -32,13 +32,15 @@ public class ServiceDiscountVO implements Serializable{
*/
private String discountDetail;
private static final String COUPON_CODE = "200";
public String getDiscountTypeStr() {
if (StringUtils.isBlank(discountDetail)) {
return "--";
}
JSONObject jsonObject = JSONObject.parseObject(discountDetail);
if (jsonObject.containsKey("200")) {
if (jsonObject.containsKey(COUPON_CODE)) {
return "卡券";
}
return "--";
......@@ -57,8 +59,8 @@ public class ServiceDiscountVO implements Serializable{
return "--";
}
JSONObject jsonObject = JSONObject.parseObject(discountDetail);
if (jsonObject.containsKey("200")) {
return jsonObject.getString("200");
if (jsonObject.containsKey(COUPON_CODE)) {
return jsonObject.getString(COUPON_CODE);
}
return "--";
}
......@@ -66,4 +68,9 @@ public class ServiceDiscountVO implements Serializable{
public void setDiscountDetail(String discountDetail) {
this.discountDetail = discountDetail;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/ServiceInfoVO.java
......@@ -95,9 +95,11 @@ public class ServiceInfoVO implements Serializable{
if (unitNum != null) {
unit = unitNum.toString();
}
if ("3".equals(unit)) {
String yearCode = "3";
String monthCode = "2";
if (yearCode.equals(unit)) {
unit = "年";
} else if("2".equals(unit)) {
} else if(monthCode.equals(unit)) {
unit = "月";
} else {
unit = "天";
......@@ -140,4 +142,9 @@ public class ServiceInfoVO implements Serializable{
public void setVersionName(String versionName) {
this.versionName = versionName;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/TransferApprovalDetailVO.java
......@@ -272,4 +272,9 @@ public class TransferApprovalDetailVO implements Serializable{
public void setOrderItemJson(String orderItemJson) {
this.orderItemJson = orderItemJson;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/TransferApprovalListVO.java
......@@ -232,4 +232,9 @@ public class TransferApprovalListVO implements Serializable{
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/TransferApprovalRechargeVO.java
......@@ -253,4 +253,9 @@ public class TransferApprovalRechargeVO implements Serializable{
this.orderNumber = orderNumber;
return this;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/TransferApprovalServiceVO.java
......@@ -4,9 +4,7 @@ import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.gic.finance.constant.EnterprisePlatformTypeEnum;
import com.gic.finance.constant.OrderTypeEnum;
import com.gic.finance.constant.TransferAccountApprovalStatusEnum;
import com.gic.finance.constant.*;
import com.gic.finance.web.utils.DateUtils;
/**
......@@ -335,16 +333,11 @@ public class TransferApprovalServiceVO implements Serializable{
if (relationOrderType == null) {
return "--";
}
if (relationOrderType.intValue() == 1) {
return "服务开通";
} else if (relationOrderType.intValue() == 2) {
return "服务续费";
} else if (relationOrderType.intValue() == 3) {
return "版本升级";
} else if (relationOrderType.intValue() == 4) {
return "license扩容";
BasicServiceStatusEnum statusEnum = BasicServiceStatusEnum.getByStatus(relationOrderType);
if (statusEnum == null) {
return "未知";
}
return "未知";
return statusEnum.getDescription();
}
public Integer getPayType() {
......@@ -415,13 +408,11 @@ public class TransferApprovalServiceVO implements Serializable{
if (operType == null) {
return "--";
}
if (operType == 1) {
return "商户";
}
if (operType == 2) {
return "运维";
InitiatorTypeEnum initiatorTypeEnum = InitiatorTypeEnum.getByCode(orderType);
if (initiatorTypeEnum == null) {
return "--";
}
return "--";
return initiatorTypeEnum.getMessage();
}
public String getOperName() {
......@@ -447,4 +438,9 @@ public class TransferApprovalServiceVO implements Serializable{
public void setPayDetail(String payDetail) {
this.payDetail = payDetail;
}
@Override
public String toString() {
return super.toString();
}
}
gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/TransferApprovalSmsVO.java
......@@ -317,4 +317,9 @@ public class TransferApprovalSmsVO implements Serializable{
this.orderNumber = orderNumber;
return this;
}
@Override
public String toString() {
return super.toString();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment