From 628087d26c7c5c27e426ca854746bcbf2de184c4 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 26 Sep 2025 14:44:34 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B5=84=E9=87=91=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E4=B8=AD?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=A2=AB=E5=88=A0=E9=99=A4=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=9B2=E3=80=81=E7=BB=84=E7=BB=87=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=A5=E5=85=85=E5=85=85=E5=80=BC=E8=B5=A0=E9=80=81?= =?UTF-8?q?=E9=87=91=EF=BC=9B3=E3=80=81=E5=BB=B6=E6=9C=9F=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0=EF=BC=9B4?= =?UTF-8?q?=E3=80=81=E5=B8=A6=E9=A6=96=E6=AC=A1=E8=B4=AD=E4=B9=B0=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E7=BB=84=E7=BB=87=E5=9C=A8=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E6=97=B6=E7=BB=AD=E8=AE=A2=EF=BC=8C=E5=AE=9A?= =?UTF-8?q?=E4=BB=B7=E5=8E=9F=E5=88=99=E7=9A=84=E5=8E=9F=E4=BB=B7=E7=94=B1?= =?UTF-8?q?=E5=8D=95=E4=BB=B7=E8=AE=A1=E7=AE=97=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../funds/balancedetails/vo/BalanceDetailsRespVO.java | 4 ++++ .../admin/funds/delay/vo/ProductDelayPageReqVO.java | 2 +- .../dal/mysql/funds/delay/ProductDelayRecordMapper.java | 2 +- .../imes/module/system/dal/mysql/organ/OrganMapper.java | 9 +++++++++ .../funds/incomeandexpense/IncomeExpenseServiceImpl.java | 3 ++- .../ManualAdjustAccountBalanceServiceImpl.java | 2 +- .../service/funds/purchase/PurchaseServiceImpl.java | 5 +++-- .../imes/module/system/service/organ/OrganService.java | 8 ++++++++ .../module/system/service/organ/OrganServiceImpl.java | 5 +++++ 9 files changed, 34 insertions(+), 6 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java index 1b32bed0e..389b9bf81 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/balancedetails/vo/BalanceDetailsRespVO.java @@ -41,6 +41,10 @@ public class BalanceDetailsRespVO { @ExcelProperty("充值金额") private BigDecimal rechargeAmount; + @Schema(description = "充值赠送金金额") + @ExcelProperty("充值赠送金金额") + private BigDecimal rechargeGiftAmount; + @Schema(description = "产品金额") @ExcelProperty("产品金额") private BigDecimal productPrice; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelayPageReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelayPageReqVO.java index 7c8cdf2f8..c2489d54c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelayPageReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelayPageReqVO.java @@ -19,7 +19,7 @@ import java.time.LocalDate; @ToString(callSuper = true) public class ProductDelayPageReqVO extends PageParam { @Schema(description = "组织编号") - private Long organId; + private Long organName; @Schema(description = "产品名称") @Size(max = 64, message = "产品名称长度不能超过64个字符") diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/delay/ProductDelayRecordMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/delay/ProductDelayRecordMapper.java index 6eb823453..cb998275d 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/delay/ProductDelayRecordMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/funds/delay/ProductDelayRecordMapper.java @@ -22,7 +22,7 @@ public interface ProductDelayRecordMapper extends BaseMapperX selectPage(ProductDelayPageReqVO pageReqVO) { return selectPage(pageReqVO, new LambdaQueryWrapperX() - .eqIfPresent(ProductDelayRecordDO::getOrganId, pageReqVO.getOrganId()) + .eqIfPresent(ProductDelayRecordDO::getOrganName, pageReqVO.getOrganName()) .eqIfPresent(ProductDelayRecordDO::getProductName, pageReqVO.getProductName()) .eqIfPresent(ProductDelayRecordDO::getDelayDuration, pageReqVO.getDelayDuration()) .betweenIfPresent(ProductDelayRecordDO::getCreateTime, pageReqVO.getCreateTime()) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java index 3a1cbbb67..4cdc98f16 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/organ/OrganMapper.java @@ -11,6 +11,7 @@ import com.cf.imes.module.system.controller.admin.organ.vo.organ.OrganPageReqVO; import com.cf.imes.module.system.dal.dataobject.organ.OrganizationDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.time.LocalDate; import java.time.LocalDateTime; @@ -25,6 +26,14 @@ import java.util.List; @Mapper public interface OrganMapper extends BaseMapperX { + /** + * 忽略逻辑删除查询组织 + * @param id + * @return + */ + @Select("SELECT * FROM system_organization WHERE id = #{id}") + OrganizationDO selectByIdWithDeleted(@Param("id") Long id); + default PageResult selectPage(OrganPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(OrganizationDO::getContactName, reqVO.getContactName()) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java index b843fd4b3..422391aec 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java @@ -63,6 +63,7 @@ public class IncomeExpenseServiceImpl implements IncomeExpenseService { respVO.setTradeType(tradeType); if (TradeTypeEnum.RECHARGE.getCode().equals(tradeType)) { respVO.setRechargeAmount(i.getCashAmountChange()); + respVO.setRechargeGiftAmount(i.getGiftAmountChange()); } else if (TradeTypeEnum.PRODUCT.getCode().equals(tradeType)) { Long purchaseId = i.getPurchaseId(); if (ObjectUtil.isNotNull(purchaseId)) { @@ -79,7 +80,7 @@ public class IncomeExpenseServiceImpl implements IncomeExpenseService { respVO.setTradeType(TradeTypeEnum.RECHARGE.getCode()); } // 查询操作组织名 - OrganizationDO organ = organService.getOrgan(i.getOrganId()); + OrganizationDO organ = organService.getOrganWithDeleted(i.getOrganId()); if (ObjectUtil.isNotNull(organ)) { respVO.setOrganName(organ.getName()); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/manualadjust/ManualAdjustAccountBalanceServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/manualadjust/ManualAdjustAccountBalanceServiceImpl.java index 665a39282..55137f846 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/manualadjust/ManualAdjustAccountBalanceServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/manualadjust/ManualAdjustAccountBalanceServiceImpl.java @@ -213,7 +213,7 @@ public class ManualAdjustAccountBalanceServiceImpl implements ManualAdjustAccoun // 从收支类型转调账类型 respVO.setAdjustType(IncomeExpenseTypeEnum.getAdjustType(detailsDO.getIncomeExpenseType())); // 查询操作组织名 - OrganizationDO organ = organService.getOrgan(detailsDO.getOrganId()); + OrganizationDO organ = organService.getOrganWithDeleted(detailsDO.getOrganId()); if (ObjectUtil.isNotNull(organ)) { respVO.setOrganName(organ.getName()); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java index 79fb523d4..d8170ae4a 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java @@ -102,7 +102,7 @@ public class PurchaseServiceImpl implements PurchaseService { } List respVOS = BeanUtils.toBean(resultList, PurchaseRecordRespVO.class); respVOS.forEach(respVO -> { - OrganizationDO organ = organService.getOrgan(respVO.getOrganId()); + OrganizationDO organ = organService.getOrganWithDeleted(respVO.getOrganId()); if (ObjectUtil.isNotNull(organ)) { respVO.setOrganName(organ.getName()); } @@ -238,7 +238,7 @@ public class PurchaseServiceImpl implements PurchaseService { // 充值支付=支付宝/微信 respVO.setRechargeSpent(detailDO.getAlipaySpent().add(detailDO.getWechatSpent())); // 查询组织名称 - OrganizationDO organ = organService.getOrgan(detailDO.getOrganId()); + OrganizationDO organ = organService.getOrganWithDeleted(detailDO.getOrganId()); if (ObjectUtil.isNotNull(organ)) { respVO.setOrganName(organ.getName()); } @@ -332,6 +332,7 @@ public class PurchaseServiceImpl implements PurchaseService { default -> throw new ServiceException(PRODUCTS_DETAIL_DURATION_UNIT_NOT_SUPPORT); } newDetailDO.setCurrentPrice(totalAmount); + newDetailDO.setOriginalPrice(totalAmount); resultList.add(newDetailDO); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java index c293d6887..a53af2b55 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganService.java @@ -63,6 +63,14 @@ public interface OrganService { */ OrganizationDO getOrgan(Long id); + /** + * 获取组织，包括被逻辑删除的 + * + * @param id + * @return + */ + OrganizationDO getOrganWithDeleted(Long id); + /** * 获得组织分页 * diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java index a516363a5..373653217 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/organ/OrganServiceImpl.java @@ -444,6 +444,11 @@ public class OrganServiceImpl implements OrganService { return organMapper.selectById(id); } + @Override + public OrganizationDO getOrganWithDeleted(Long id) { + return organMapper.selectByIdWithDeleted(id); + } + @Override public PageResult getOrganPage(OrganPageReqVO pageReqVO) { if(CharSequenceUtil.isNotBlank(pageReqVO.getName())) {