hbyt/cloud-battery-manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

分账字段调整

Browse Source
This commit is contained in:
andy 2025-04-25 10:14:59 +08:00
parent 534ac97440
commit d7043d53f8
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/IndependentAccount.java
View File

@ -28,15 +28,15 @@ public class IndependentAccount {
/*** /***
* 运营商id * 运营商id
*/ */
private Integer porxyId; private Integer proxyId;
/*** /***
* 运营商Code * 运营商Code
*/ */
private String porxyCode; private String proxyCode;
/*** /***
* 运营商名称 * 运营商名称
*/ */
private String porxyName; private String proxyName;
/*** /***
* 订单数量 * 订单数量
*/ */

2
cloud-manage-server/src/main/java/com/evotech/hd/cloud/entity/request/IndependentAccountRequest.java
View File

@ -23,5 +23,5 @@ public class IndependentAccountRequest extends BasePageRequest {
private Integer status; private Integer status;
@Schema(description = "运营商ID") @Schema(description = "运营商ID")
private Integer porxyId; private Integer proxyId;
} }

8
cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/IndependentAccountServiceImpl.java
View File

@ -63,16 +63,16 @@ public class IndependentAccountServiceImpl implements IndependentAccountService
return; return;
} }
IndependentAccount independentAccount = independentAccountDao.selectOne(new LambdaQueryWrapper<IndependentAccount>().eq(IndependentAccount::getPorxyId, proxyOperater.getPkId()).eq(IndependentAccount::getStatus, 0), false); IndependentAccount independentAccount = independentAccountDao.selectOne(new LambdaQueryWrapper<IndependentAccount>().eq(IndependentAccount::getProxyId, proxyOperater.getPkId()).eq(IndependentAccount::getStatus, 0), false);
if(ObjectUtils.isEmpty(proxyOperater)){ if(ObjectUtils.isEmpty(proxyOperater)){
independentAccount = new IndependentAccount(); independentAccount = new IndependentAccount();
independentAccount.setIndependentAccountBegin(new Date()); independentAccount.setIndependentAccountBegin(new Date());
independentAccount.setStatus(0); independentAccount.setStatus(0);
} }
//更新信息 //更新信息
independentAccount.setPorxyId(proxyOperater.getPkId()); independentAccount.setProxyId(proxyOperater.getPkId());
independentAccount.setPorxyCode(proxyOperater.getPocode()); independentAccount.setProxyCode(proxyOperater.getPocode());
independentAccount.setPorxyName(proxyOperater.getPoname()); independentAccount.setProxyName(proxyOperater.getPoname());
independentAccount.setOrderCount(calculate(independentAccount.getOrderCount(), 1)); independentAccount.setOrderCount(calculate(independentAccount.getOrderCount(), 1));
independentAccount.setOrderTotalAmount(calculate(independentAccount.getOrderTotalAmount(), taxPoint.getOrderAmount())); independentAccount.setOrderTotalAmount(calculate(independentAccount.getOrderTotalAmount(), taxPoint.getOrderAmount()));
independentAccount.setTaxPointTotalAmount(calculate(independentAccount.getTaxPointTotalAmount(), taxPoint.getTaxPoint())); independentAccount.setTaxPointTotalAmount(calculate(independentAccount.getTaxPointTotalAmount(), taxPoint.getTaxPoint()));

4
cloud-manage-server/src/main/resources/mapper/IndependentAccountMapper.xml
View File

@ -6,8 +6,8 @@
<resultMap id="BaseResultMap" type="com.evotech.hd.common.core.entity.cloud.IndependentAccount"> <resultMap id="BaseResultMap" type="com.evotech.hd.common.core.entity.cloud.IndependentAccount">
<id column="pk_id" property="pkId" /> <id column="pk_id" property="pkId" />
<result column="proxy_id" property="proxyId" /> <result column="proxy_id" property="proxyId" />
<result column="porxy_code" property="porxyCode" /> <result column="proxy_code" property="proxyCode" />
<result column="porxy_name" property="porxyName" /> <result column="proxy_name" property="proxyName" />
<result column="order_count" property="orderCount" /> <result column="order_count" property="orderCount" />
<result column="account_total_amount" property="accountTotalAmount" /> <result column="account_total_amount" property="accountTotalAmount" />
<result column="order_total_amount" property="orderTotalAmount" /> <result column="order_total_amount" property="orderTotalAmount" />