diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWalletController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWalletController.java index a840b4b6..2ad745e0 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWalletController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberWalletController.java @@ -1,7 +1,6 @@ package com.hzs.member.account.controller.api; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.enums.EOrderType; +import cn.hutool.core.collection.CollectionUtil; import com.hzs.common.core.enums.ETradeType; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; @@ -10,34 +9,24 @@ import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.account.service.ICuMemberAccountService; import com.hzs.member.account.service.ICuMemberTradeService; -import com.hzs.member.account.vo.CuMemberAccountVO; import com.hzs.member.account.vo.CuMemberTradeVO; -import com.hzs.member.account.vo.CuMemberWalletBalanceVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; /** * 我的钱包 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/8 11:19 - * @Classname: CuMemberWalletControllerApi - * @Package_name: com.hzs.member.account.controller.api */ @RestController @RequestMapping("/api/wallet") public class ApiCuMemberWalletController extends BaseController { @Autowired - ICuMemberAccountService memberAccountService; - + private ICuMemberAccountService iCuMemberAccountService; @Autowired - ICuMemberTradeService memberTradeService; + private ICuMemberTradeService iCuMemberTradeService; /** @@ -49,7 +38,7 @@ public class ApiCuMemberWalletController extends BaseController { public AjaxResult getWalletBalance() { Long pkMember = SecurityUtils.getUserId(); Integer pkCountry = SecurityUtils.getPkCountry(); - return AjaxResult.success(memberAccountService.queryWalletBalanceByPkMember(pkMember, pkCountry)); + return AjaxResult.success(iCuMemberAccountService.queryWalletBalanceByPkMember(pkMember, pkCountry)); } @@ -61,11 +50,11 @@ public class ApiCuMemberWalletController extends BaseController { @GetMapping("/trade-type") public AjaxResult tradeType() { // 查询交易类型 - List tradeTypes = memberTradeService.selectTradeType(SecurityUtils.getUserId(), SecurityUtils.getPkCountry()); + List tradeTypes = iCuMemberTradeService.selectTradeType(SecurityUtils.getUserId(), SecurityUtils.getPkCountry()); List enumEntityList = new ArrayList<>(); for (ETradeType value : ETradeType.values()) { if (tradeTypes.contains(value.getValue())) { - enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.TRADE_TYPE)); + enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel())); } } return AjaxResult.success(enumEntityList); @@ -83,7 +72,12 @@ public class ApiCuMemberWalletController extends BaseController { cuMemberTradeVO.setPkCountry(SecurityUtils.getPkCountry()); cuMemberTradeVO.setPkMember(SecurityUtils.getUserId()); startPage(); - List cuMemberTradeVOList = memberTradeService.selectWattleDetail(cuMemberTradeVO); + List cuMemberTradeVOList = iCuMemberTradeService.selectWattleDetail(cuMemberTradeVO); + if (CollectionUtil.isNotEmpty(cuMemberTradeVOList)) { + for (CuMemberTradeVO memberTradeVO : cuMemberTradeVOList) { + memberTradeVO.setTradeTypeVal(ETradeType.getTradeLabel(memberTradeVO.getTradeType())); + } + } return getDataTable(cuMemberTradeVOList); } } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java index 2d7c7922..c4b22802 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETradeType.java @@ -19,10 +19,10 @@ public enum ETradeType { MALL_ORDER(114, 0, "商城订单", 0, EnumsPrefixConstants.TRADE_TYPE + 114, EOrderType.MALL_ORDER.getValue()), FICTITIOUS_ORDER(120, 0, "虚拟订单", 0, EnumsPrefixConstants.TRADE_TYPE + 120, EOrderType.FICTITIOUS_ORDER.getValue()), - RETAIL_REGISTER_ORDER(141, 0, "注册订单", 0, EnumsPrefixConstants.TRADE_TYPE + 141, EOrderType.RETAIL_REGISTER.getValue()), - RETAIL_UPGRADE_ORDER(142, 0, "甄选订单", 0, EnumsPrefixConstants.TRADE_TYPE + 142, EOrderType.RETAIL_UPGRADE.getValue()), - RETAIL_REPURCHASE_ORDER(143, 0, "复购订单", 0, EnumsPrefixConstants.TRADE_TYPE + 143, EOrderType.RETAIL_REPURCHASE.getValue()), - RETAIL_CONSUME_ORDER(144, 0, "赠品订单", 0, EnumsPrefixConstants.TRADE_TYPE + 144, EOrderType.RETAIL_CONSUME.getValue()), + RETAIL_REGISTER_ORDER(141, 0, "精品专区订单", 0, EnumsPrefixConstants.TRADE_TYPE + 141, EOrderType.RETAIL_REGISTER.getValue()), + RETAIL_UPGRADE_ORDER(142, 0, "复购专区订单", 0, EnumsPrefixConstants.TRADE_TYPE + 142, EOrderType.RETAIL_UPGRADE.getValue()), + RETAIL_REPURCHASE_ORDER(143, 0, "北大甄选订单", 0, EnumsPrefixConstants.TRADE_TYPE + 143, EOrderType.RETAIL_REPURCHASE.getValue()), + RETAIL_CONSUME_ORDER(144, 0, "赠品专区订单", 0, EnumsPrefixConstants.TRADE_TYPE + 144, EOrderType.RETAIL_CONSUME.getValue()), RETAIL_TICKET_ORDER(145, 0, "自主购票", 0, EnumsPrefixConstants.TRADE_TYPE + 145, EOrderType.RETAIL_TICKET.getValue()), RETAIL_DISCOUNT_ORDER(147, 0, "五折订单", 0, EnumsPrefixConstants.TRADE_TYPE + 147, EOrderType.DISCOUNT_ORDER.getValue()), @@ -69,14 +69,12 @@ public enum ETradeType { REVOKE_MALL_ORDER(615, 0, "商城订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 615, -EOrderType.MALL_ORDER.getValue()), REVOKE_FICTITIOUS_ORDER(618, 0, "虚拟订单撤单返钱", 0, EnumsPrefixConstants.TRADE_TYPE + 618, -EOrderType.FICTITIOUS_ORDER.getValue()), - REVOKE_RETAIL_REGISTER_ORDER(641, 0, "注册订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 641, -EOrderType.RETAIL_REGISTER.getValue()), - REVOKE_RETAIL_REPURCHASE_ORDER(643, 0, "复购订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 643, -EOrderType.RETAIL_REPURCHASE.getValue()), - REVOKE_RETAIL_CONSUME_ORDER(644, 0, "赠品订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 644, -EOrderType.RETAIL_CONSUME.getValue()), + REVOKE_RETAIL_REGISTER_ORDER(641, 0, "精品专区订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 641, -EOrderType.RETAIL_REGISTER.getValue()), + REVOKE_RETAIL_UPGRADE(642, 0, "复购专区订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 642, -EOrderType.RETAIL_UPGRADE.getValue()), + REVOKE_RETAIL_REPURCHASE_ORDER(643, 0, "北大甄选订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 643, -EOrderType.RETAIL_REPURCHASE.getValue()), + REVOKE_RETAIL_CONSUME_ORDER(644, 0, "赠品专区订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 644, -EOrderType.RETAIL_CONSUME.getValue()), REVOKE_RETAIL_TICKET_ORDER(645, 0, "自主购票撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 645, -EOrderType.RETAIL_TICKET.getValue()), - - REVOKE_RETAIL_UPGRADE(642, 0, "甄选订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 642, -EOrderType.RETAIL_UPGRADE.getValue()), - REVOKE_DISCOUNT_ORDER(647, 0, "五折订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 647, -EOrderType.DISCOUNT_ORDER.getValue()), - + REVOKE_DISCOUNT_ORDER(647, 0, "五折专区订单撤单", 0, EnumsPrefixConstants.TRADE_TYPE + 647, -EOrderType.DISCOUNT_ORDER.getValue()), ORDER_SELF_DELIVER(680, 0, "自提返还邮费", 0, EnumsPrefixConstants.TRADE_TYPE + 680, -99), ORDER_REFUND_ADJUST(690, 0, "退单金额补差", 0, EnumsPrefixConstants.TRADE_TYPE + 690, -99), @@ -177,7 +175,10 @@ public enum ETradeType { * @param value * @return String */ - public static String getTradeLabel(int value) { + public static String getTradeLabel(Integer value) { + if (null == value) { + return ""; + } for (ETradeType type : ETradeType.values()) { if (type.getValue() == value) { return type.getLabel();