diff --git a/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseAccountBill.java b/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseAccountBill.java index c76ab93..508ed40 100644 --- a/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseAccountBill.java +++ b/nxhs-service/src/main/java/cc/yunxi/domain/po/EnterpriseAccountBill.java @@ -42,9 +42,9 @@ public class EnterpriseAccountBill { @TableField("order_number") private String orderNumber; -// @ApiModelProperty("订单类型id") -// @TableField("order_type_id") -// private String orderTypeId; + @ApiModelProperty("订单类型id") + @TableField("order_type_id") + private String orderTypeId; // @ApiModelProperty("单据状态id") // @TableField("bill_status_id") diff --git a/nxhs-service/src/main/java/cc/yunxi/enums/OrderTypeEnum.java b/nxhs-service/src/main/java/cc/yunxi/enums/OrderTypeEnum.java index de49bd4..82b6c01 100644 --- a/nxhs-service/src/main/java/cc/yunxi/enums/OrderTypeEnum.java +++ b/nxhs-service/src/main/java/cc/yunxi/enums/OrderTypeEnum.java @@ -20,7 +20,9 @@ public enum OrderTypeEnum implements BaseEnum { DZ_RECOVERY("520193532170867013", "到站回收"), - ADM_ORDER("521999177572425477", "人工下单"); + ADM_ORDER("521999177572425477", "人工下单"), + CZ_ORDER("585052745690520133", "商户充值"), + TD_ORDER("585052836950186565", "投递订单"); @EnumValue private final String code; diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java b/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java index fe7274b..a5e3209 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/IClientService.java @@ -9,6 +9,7 @@ import cc.yunxi.domain.query.ClientQuery; import cc.yunxi.domain.query.RecyclerQuery; import cc.yunxi.domain.vo.client.ClientUpdateVO; import cc.yunxi.enums.BalanceChangeTypeEnum; +import cc.yunxi.enums.OrderTypeEnum; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -113,7 +114,7 @@ public interface IClientService extends IService { * @param orderNo * @param enterpriseId */ - void addBalance(String clientId, BigDecimal amount, String orderNo, String enterpriseId); + void addBalance(String clientId, BigDecimal amount, String orderNo, String enterpriseId, String orderType); /** diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java index efa4eb2..ab9f168 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/ClientServiceImpl.java @@ -14,6 +14,7 @@ import cc.yunxi.domain.query.RecyclerQuery; import cc.yunxi.domain.vo.client.ClientUpdateVO; import cc.yunxi.enums.BalanceChangeTypeEnum; import cc.yunxi.enums.BusinessCodeEnum; +import cc.yunxi.enums.OrderTypeEnum; import cc.yunxi.mapper.ClientAccountDetailMapper; import cc.yunxi.mapper.ClientMapper; import cc.yunxi.mapper.EnterpriseAccountBillMapper; @@ -191,14 +192,14 @@ public class ClientServiceImpl extends ServiceImpl impleme @Override - public void addBalance(String clientId, BigDecimal amount, String orderNo, String enterpriseId) { - this.changeBalance(clientId, amount, orderNo, enterpriseId, BalanceChangeTypeEnum.INCOME); + public void addBalance(String clientId, BigDecimal amount, String orderNo, String enterpriseId, String orderType) { + this.changeBalance(clientId, amount, orderNo, enterpriseId, BalanceChangeTypeEnum.INCOME,orderType); } @Override public void reduceBalance(String clientId, BigDecimal amount, String orderNo, String enterpriseId) { - this.changeBalance(clientId, amount, orderNo, enterpriseId, BalanceChangeTypeEnum.REFUND); + this.changeBalance(clientId, amount, orderNo, enterpriseId, BalanceChangeTypeEnum.REFUND,""); } @Override @@ -212,7 +213,7 @@ public class ClientServiceImpl extends ServiceImpl impleme @Override @Transactional(rollbackFor = Exception.class) public void cashBalance(String openId, Integer amount) throws Exception { - this.changeBalance(openId, new BigDecimal(amount), null, null, BalanceChangeTypeEnum.CASH_OUT); + this.changeBalance(openId, new BigDecimal(amount), null, null, BalanceChangeTypeEnum.CASH_OUT,""); // 微信提现(单位:分) amount = amount * 100; BatchTransferModel batchTransferModel = new BatchTransferModel() @@ -291,7 +292,8 @@ public class ClientServiceImpl extends ServiceImpl impleme // 统一金额交易 private void changeBalance(String keyId, BigDecimal amount, String orderNo, - String enterpriseId, BalanceChangeTypeEnum changeTypeEnum) { + String enterpriseId, BalanceChangeTypeEnum changeTypeEnum, + String orderType) { Client client = this.getClientByKeyId(keyId); BigDecimal balance = client.getBanlance(); String remark; @@ -320,6 +322,7 @@ public class ClientServiceImpl extends ServiceImpl impleme accountBill.setAccountBalance(fund); accountBill.setPayoutAmount(amount); accountBill.setOrderNumber(orderNo); + accountBill.setOrderTypeId(orderType); accountBill.setRemark("支付给散户" + amountStr + "元"); accountBill.setCreatorTime(now); accountBillMapper.insert(accountBill); @@ -345,6 +348,7 @@ public class ClientServiceImpl extends ServiceImpl impleme accountBill1.setAccountBalance(fund1); accountBill1.setIncomeAmount(amount); accountBill1.setOrderNumber(orderNo); + accountBill1.setOrderTypeId(orderType); accountBill1.setRemark("散户退款到商户" + amountStr + "元"); accountBill1.setCreatorTime(now); accountBillMapper.insert(accountBill1); diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java index 4b979c8..400c1c3 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/EnterpriseServiceImpl.java @@ -10,6 +10,7 @@ import cc.yunxi.domain.vo.client.ClientRespVO; import cc.yunxi.domain.vo.enterprise.WalletVO; import cc.yunxi.enums.BusinessCodeEnum; import cc.yunxi.enums.GlobalStatusEnum; +import cc.yunxi.enums.OrderTypeEnum; import cc.yunxi.mapper.EnterpriseAccountBillMapper; import cc.yunxi.mapper.EnterpriseMapper; import cc.yunxi.mapper.WalletMapper; @@ -60,9 +61,10 @@ public class EnterpriseServiceImpl extends ServiceImpl