From 37a88b1d532a0fb6a2a3e91b8538cf7145601d5d Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 9 Jan 2025 13:02:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:h5=E9=80=80=E6=AC=BE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/constant/refund/HardSaleTypeEnum.java | 16 +++ .../hard/api/dto/order/HardOrderDto.java | 5 + .../hard/api/vo/order/HardOrderVo.java | 8 +- .../order/HardAfterSaleController.java | 33 +++++ .../controller/order/HardOrderController.java | 1 + .../mapper/order/HardAfterSaleLogMapper.java | 13 ++ .../hard/service/HardAfterSaleService.java | 15 ++ .../impl/order/HardAfterSaleServiceImpl.java | 76 ++++++++++ .../impl/order/HardwareOrderServiceImpl.java | 12 +- .../src/main/resources/application.yml | 2 +- .../api/entity/WalletSettingEntity.java | 133 +++++++++--------- .../controller/WalletSettingController.java | 20 +-- .../impl/WalletSettingServiceImpl.java | 1 + 13 files changed, 254 insertions(+), 81 deletions(-) create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardSaleTypeEnum.java diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardSaleTypeEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardSaleTypeEnum.java new file mode 100644 index 000000000..b0b0bb727 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/refund/HardSaleTypeEnum.java @@ -0,0 +1,16 @@ +package com.bsd.pjcloud.hard.api.constant.refund; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum HardSaleTypeEnum { + + IN_SALE("10", "售中退款"), + AFTER_SALE("20", "售后退款"), + ; + + private final String type; + private final String name; +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java index 3bcf940d5..975b823c0 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java @@ -13,4 +13,9 @@ public class HardOrderDto extends HardOrderEntity { */ private List userIds; + /** + * 是否查询购物车列表 + */ + private Boolean isFindCarList = false; + } diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderVo.java index 362513d1e..8d3767a09 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderVo.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderVo.java @@ -6,6 +6,8 @@ import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface; import lombok.Data; +import java.util.List; + @Data public class HardOrderVo extends HardOrderEntity implements BaseUserInterface, BaseDeptInterface, BaseMchInterface { /** @@ -25,7 +27,6 @@ public class HardOrderVo extends HardOrderEntity implements BaseUserInterface, B /** * 商户相关 */ - private String merchantName; private String logoPic; @@ -36,4 +37,9 @@ public class HardOrderVo extends HardOrderEntity implements BaseUserInterface, B private String hardName; private String hardType; + + /** + * 购物车 + */ + private List carList; } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardAfterSaleController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardAfterSaleController.java index a4be792ee..fa1bafbb8 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardAfterSaleController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardAfterSaleController.java @@ -44,6 +44,39 @@ public class HardAfterSaleController { private final HardAfterSaleService hardAfterSaleService; + /* ************************************* start app start ************************************* */ + @PostMapping(value = "/app/create") + @Operation(summary = "app申请售后") + @Idempotent(expireTime = 10, info = "正在申请中，请勿重复操作") + public R appCreate(@RequestBody HardAfterSaleDto dto) { + PjcloudUser user = SecurityUtils.getUser(); + dto.setUserId(user.getId()); + return R.ok(hardAfterSaleService.create(dto)); + } + + @GetMapping(value = "/app/cancel") + @Operation(summary = "app取消售后") + @Idempotent(expireTime = 10, info = "正在取消中，请勿重复操作") + public R appCancel(@RequestParam Long id) { + PjcloudUser user = SecurityUtils.getUser(); + return R.ok(hardAfterSaleService.cancelAfterSale(user.getId(), id)); + } + + @GetMapping(value = "/app/history") + @Operation(summary = "app查询售后进度") + public R> appHistory(@RequestParam Long id) { + return R.ok(hardAfterSaleService.getHistory(id)); + } + + @GetMapping(value = "/app/detail-by-order-id") + @Operation(summary = "app查询退款详情") + public R appDetail(@RequestParam Long orderId) { + HardAfterSaleDto dto = new HardAfterSaleDto(); + dto.setOrderId(orderId); + return R.ok(hardAfterSaleService.join(dto)); + } + /* ************************************* end app end ************************************* */ + @GetMapping(value = "/history") @Operation(summary = "查询售后进度") public R> history(@RequestParam Long id) { diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java index 6b47184c9..c4d4bfac2 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java @@ -50,6 +50,7 @@ public class HardOrderController { public R appPageJoin(@ParameterObject Page page, @ParameterObject HardOrderDto dto) { PjcloudUser user = SecurityUtils.getUser(); dto.setUserId(user.getId()); + dto.setIsFindCarList(true); return R.ok(hardwareOrderService.pageJoin(page, dto)); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardAfterSaleLogMapper.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardAfterSaleLogMapper.java index c375f3ce5..cddab1e9b 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardAfterSaleLogMapper.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardAfterSaleLogMapper.java @@ -1,5 +1,7 @@ package com.bsd.pjcloud.hard.mapper.order; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper; import com.bsd.pjcloud.hard.api.dto.order.HardAfterSaleLogDto; @@ -8,6 +10,8 @@ import com.bsd.pjcloud.hard.api.vo.order.HardAfterSaleLogVo; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface HardAfterSaleLogMapper extends PjcloudBaseMapper { @@ -16,4 +20,13 @@ public interface HardAfterSaleLogMapper extends PjcloudBaseMapper list = selectList(new LambdaQueryWrapper() + .eq(HardAfterSaleLogEntity::getAfterSaleId, id) + .orderByAsc(HardAfterSaleLogEntity::getId) + ); + if (ObjectUtil.isEmpty(list)) return null; + return list.stream().findFirst().get(); + } } \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardAfterSaleService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardAfterSaleService.java index e19b6b890..ebed93271 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardAfterSaleService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardAfterSaleService.java @@ -16,6 +16,21 @@ public interface HardAfterSaleService extends IService { HardAfterSaleVo join(HardAfterSaleDto dto); + /** + * 申请售后 + * @param dto + * @return + */ + Long create(HardAfterSaleDto dto); + + /** + * 取消售后 + * @param userId 用户id + * @param afterSaleId 售后id + * @return + */ + Boolean cancelAfterSale(Long userId, Long afterSaleId); + /** * 获取售后进度 * diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java index 75106236c..18a1566b4 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java @@ -3,6 +3,7 @@ package com.bsd.pjcloud.hard.service.impl.order; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.spring.SpringUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bsd.pjcloud.admin.api.dto.UserInfo; @@ -19,6 +20,7 @@ import com.bsd.pjcloud.hard.api.constant.order.HardOrderTypeEnum; import com.bsd.pjcloud.hard.api.constant.refund.HardAfterSaleOperateTypeEnum; import com.bsd.pjcloud.hard.api.constant.refund.HardRefundStatusEnum; import com.bsd.pjcloud.hard.api.constant.refund.HardSaleStatusEnum; +import com.bsd.pjcloud.hard.api.constant.refund.HardSaleTypeEnum; import com.bsd.pjcloud.hard.api.dto.order.HardAfterSaleDto; import com.bsd.pjcloud.hard.api.dto.order.HardDisagreeDto; import com.bsd.pjcloud.hard.api.entity.order.HardAfterSaleEntity; @@ -86,6 +88,45 @@ public class HardAfterSaleServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(HardOrderEntity::getApplyCancelTime, null) + .set(HardOrderEntity::getOrderStatus, HardOrderStatusEnum.REFUND.getType()) + .set(HardOrderEntity::getRefundStatus, HardRefundStatusEnum.NONE.getStatus()) + .eq(HardOrderEntity::getId, order.getId()); + hardOrderService.update(updateWrapper); + return saveObj; + } + private HardAfterSaleServiceImpl getSelf() { return SpringUtil.getBean(getClass()); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardwareOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardwareOrderServiceImpl.java index d003b7655..6b710c4f9 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardwareOrderServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardwareOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.bsd.pjcloud.admin.api.feign.RemoteDeptService; import com.bsd.pjcloud.admin.api.feign.RemoteUserService; import com.bsd.pjcloud.admin.api.utils.DataUtil; import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum; +import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.CollectionUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.hard.api.constant.HardTypeEnum; @@ -26,6 +27,7 @@ import com.bsd.pjcloud.hard.api.entity.HardManagerEntity; import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity; import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity; import com.bsd.pjcloud.hard.api.entity.order.HardParentCarEntity; +import com.bsd.pjcloud.hard.api.vo.order.HardCarVo; import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo; import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper; import com.bsd.pjcloud.hard.service.HardCarService; @@ -72,6 +74,7 @@ public class HardwareOrderServiceImpl extends ServiceImpl pageJoin(Page page, HardOrderDto dto) { @@ -110,6 +112,14 @@ public class HardwareOrderServiceImpl extends ServiceImpl carList = hardCarService.getByParentCarId(v.getParentCarId()); + List carVoList = BeanUtils.toBean(carList, HardCarVo.class); + v.setCarList(carVoList); + } + } } return list; } diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml index 8914641d5..54c28d3b0 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml +++ b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: username: @nacos.username@ password: @nacos.password@ discovery: - server-addr: pjcloud-register:8848 + server-addr: ${NACOS_HOST:pjcloud-register}:${NACOS_PORT:8848} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} config: diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletSettingEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletSettingEntity.java index 202db7a12..fc3095b1e 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletSettingEntity.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletSettingEntity.java @@ -2,12 +2,15 @@ package com.bsd.pjcloud.wallet.api.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import com.bsd.pjcloud.common.core.util.TenantTable; + import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; /** * 支付设置 @@ -23,100 +26,100 @@ import java.time.LocalDateTime; public class WalletSettingEntity extends Model { - /** - * 编号 - */ + /** + * 编号 + */ @TableId(type = IdType.ASSIGN_ID) - @Schema(description="编号") + @Schema(description = "编号") private Long id; - /** - * 每一餐的上限(分) - */ - @Schema(description="每一餐的上限(分)") + /** + * 每一餐的上限(分) + */ + @Schema(description = "每一餐的上限(分)") private Integer payAmountMealLimit; - /** - * 每一餐的倍数 - */ - @Schema(description="每一餐的倍数") + /** + * 每一餐的倍数 + */ + @Schema(description = "每一餐的倍数") private BigDecimal payAmountMealTimes; - /** - * 是否开启每一餐的额外缴费 - */ - @Schema(description="是否开启每一餐的额外缴费") + /** + * 是否开启每一餐的额外缴费 + */ + @Schema(description = "是否开启每一餐的额外缴费") private String payAmountEnable; - /** - * 是否开启钱包二维码刷新 - */ - @Schema(description="是否开启钱包二维码刷新") + /** + * 是否开启钱包二维码刷新 + */ + @Schema(description = "是否开启钱包二维码刷新") private String refreshQrCodeEnable; - /** - * 二维码刷新频率 - */ - @Schema(description="二维码刷新频率") + /** + * 二维码刷新频率 + */ + @Schema(description = "二维码刷新频率") private Integer refreshQrCodeFre; - /** - * 是否开启离线订单的审批 - */ - @Schema(description="是否开启离线订单的审批") + /** + * 是否开启离线订单的审批 + */ + @Schema(description = "是否开启离线订单的审批") private String offLineOrderApplyEnable; - /** - * 退款理由 - */ - @Schema(description="退款理由") + /** + * 退款理由 + */ + @Schema(description = "退款理由") private String afterSaleRefundReasons; - /** - * 退货理由 - */ - @Schema(description="退货理由") + /** + * 退货理由 + */ + @Schema(description = "退货理由") private String afterSaleReturnReasons; - /** - * 创建人 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="创建人") + /** + * 创建人 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建人") private String createBy; - /** - * 创建时间 - */ - @TableField(fill = FieldFill.INSERT) - @Schema(description="创建时间") + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @Schema(description = "创建时间") private LocalDateTime createTime; - /** - * 修改人 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description="修改人") + /** + * 修改人 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description = "修改人") private String updateBy; - /** - * 修改时间 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - @Schema(description="修改时间") + /** + * 修改时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @Schema(description = "修改时间") private LocalDateTime updateTime; - /** - * 删除标记 - */ + /** + * 删除标记 + */ @TableLogic - @TableField(fill = FieldFill.INSERT) - @Schema(description="删除标记") + @TableField(fill = FieldFill.INSERT) + @Schema(description = "删除标记") private String delFlag; - /** - * 租户ID - */ - @Schema(description="租户ID") + /** + * 租户ID + */ + @Schema(description = "租户ID") private Long tenantId; } \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletSettingController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletSettingController.java index abeb8dd7b..2aed7a84a 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletSettingController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletSettingController.java @@ -1,30 +1,18 @@ package com.bsd.pjcloud.wallet.controller; -import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.annotation.Inner; import com.bsd.pjcloud.wallet.api.dto.WalletSettingDto; -import com.bsd.pjcloud.wallet.api.entity.WalletSettingEntity; import com.bsd.pjcloud.wallet.api.vo.WalletSettingVo; import com.bsd.pjcloud.wallet.service.WalletSettingService; -import org.springframework.security.access.prepost.PreAuthorize; -import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.List; -import java.util.Objects; - /** * 支付设置 * @@ -46,8 +34,14 @@ public class WalletSettingController { public R get() { return R.ok(walletSettingService.getSetting()); } - /* ************************************* start 远程调用 start ************************************* */ + /* ************************************* end 远程调用 end ************************************* */ + /* ************************************* start app start ************************************* */ + @GetMapping("/app/get-setting") + public R appGet() { + return R.ok(walletSettingService.getSetting()); + } + /* ************************************* end app end ************************************* */ @Operation(summary = "获取支付配置", description = "获取支付配置") @GetMapping("") diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletSettingServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletSettingServiceImpl.java index 19bb2bef1..f8067d48f 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletSettingServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletSettingServiceImpl.java @@ -18,6 +18,7 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.List; /** * 支付设置