diff --git a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/IndependentAccount.java b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/IndependentAccount.java index 84c4b14..db39b52 100644 --- a/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/IndependentAccount.java +++ b/base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/IndependentAccount.java @@ -28,15 +28,15 @@ public class IndependentAccount { /*** * 运营商id */ - private Integer porxyId; + private Integer proxyId; /*** * 运营商Code */ - private String porxyCode; + private String proxyCode; /*** * 运营商名称 */ - private String porxyName; + private String proxyName; /*** * 订单数量 */ diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/IndependentAccountRequest.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/IndependentAccountRequest.java index 6ec6324..ee03094 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/IndependentAccountRequest.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/IndependentAccountRequest.java @@ -23,5 +23,5 @@ public class IndependentAccountRequest extends BasePageRequest { private Integer status; @Schema(description = "运营商ID") - private Integer porxyId; + private Integer proxyId; } diff --git a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/IndependentAccountServiceImpl.java b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/IndependentAccountServiceImpl.java index a9285e9..4be0c9a 100644 --- a/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/IndependentAccountServiceImpl.java +++ b/cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/IndependentAccountServiceImpl.java @@ -63,16 +63,16 @@ public class IndependentAccountServiceImpl implements IndependentAccountService return; } - IndependentAccount independentAccount = independentAccountDao.selectOne(new LambdaQueryWrapper().eq(IndependentAccount::getPorxyId, proxyOperater.getPkId()).eq(IndependentAccount::getStatus, 0), false); + IndependentAccount independentAccount = independentAccountDao.selectOne(new LambdaQueryWrapper().eq(IndependentAccount::getProxyId, proxyOperater.getPkId()).eq(IndependentAccount::getStatus, 0), false); if(ObjectUtils.isEmpty(proxyOperater)){ independentAccount = new IndependentAccount(); independentAccount.setIndependentAccountBegin(new Date()); independentAccount.setStatus(0); } //更新信息 - independentAccount.setPorxyId(proxyOperater.getPkId()); - independentAccount.setPorxyCode(proxyOperater.getPocode()); - independentAccount.setPorxyName(proxyOperater.getPoname()); + independentAccount.setProxyId(proxyOperater.getPkId()); + independentAccount.setProxyCode(proxyOperater.getPocode()); + independentAccount.setProxyName(proxyOperater.getPoname()); independentAccount.setOrderCount(calculate(independentAccount.getOrderCount(), 1)); independentAccount.setOrderTotalAmount(calculate(independentAccount.getOrderTotalAmount(), taxPoint.getOrderAmount())); independentAccount.setTaxPointTotalAmount(calculate(independentAccount.getTaxPointTotalAmount(), taxPoint.getTaxPoint())); diff --git a/cloud-manage-server/src/main/resources/mapper/IndependentAccountMapper.xml b/cloud-manage-server/src/main/resources/mapper/IndependentAccountMapper.xml index 6dad239..5765c90 100644 --- a/cloud-manage-server/src/main/resources/mapper/IndependentAccountMapper.xml +++ b/cloud-manage-server/src/main/resources/mapper/IndependentAccountMapper.xml @@ -6,8 +6,8 @@ - - + +