diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusHiPinkDTO.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusHiPinkDTO.java index 1c8a98f9..4275ab40 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusHiPinkDTO.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/dto/BonusHiPinkDTO.java @@ -6,11 +6,7 @@ import java.io.Serializable; import java.math.BigDecimal; /** - * @Description: 嗨粉直推奖励配置 - * @Author: sui q - * @Time: 2022/11/14 16:31 - * @Classname: BonusHiPinkDTO - * @PackageName: com.hzs.system.config.dto + * 嗨粉直推奖励配置 */ @Data public class BonusHiPinkDTO implements Serializable { diff --git a/bd-api/bd-api-third/src/main/java/com/hzs/third/share/IShareServiceApi.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/share/IShareServiceApi.java index 4cad8c9e..f3f4fad1 100644 --- a/bd-api/bd-api-third/src/main/java/com/hzs/third/share/IShareServiceApi.java +++ b/bd-api/bd-api-third/src/main/java/com/hzs/third/share/IShareServiceApi.java @@ -4,11 +4,7 @@ import com.hzs.common.core.domain.R; import com.hzs.third.share.dto.ShareServiceDTO; /** - * @Description: 分享码服务 - * @Author: jiang chao - * @Time: 2023/3/15 11:31 - * @Classname: IShareServiceApi - * @PackageName: com.hzs.third.share + * 分享码服务 */ public interface IShareServiceApi { diff --git a/bd-api/bd-api-third/src/main/java/com/hzs/third/share/dto/ShareServiceDTO.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/share/dto/ShareServiceDTO.java index 894f52da..3eb04f03 100644 --- a/bd-api/bd-api-third/src/main/java/com/hzs/third/share/dto/ShareServiceDTO.java +++ b/bd-api/bd-api-third/src/main/java/com/hzs/third/share/dto/ShareServiceDTO.java @@ -9,11 +9,7 @@ import lombok.NoArgsConstructor; import java.io.Serializable; /** - * @Description: 分享码DTO - * @Author: jiang chao - * @Time: 2023/3/15 18:19 - * @Classname: ShareServiceParam - * @PackageName: com.hzs.third.share.dto + * 分享码DTO */ @AllArgsConstructor @NoArgsConstructor diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java index 93d50608..bc6592c8 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusGrantServiceImpl.java @@ -177,7 +177,7 @@ public class BonusGrantServiceImpl implements IBonusGrantService { List cuMemberTradeList = new ArrayList<>(); cuMemberBonusList.forEach(cuMemberBonus -> { CurrencyDTO currencyDTO = iCurrencyServiceApi.getCurrency(cuMemberBonus.getPkCountry()).getData(); - // 奖金币（首购+复购+云代+海粉+嗨粉+店铺） + // 奖金币（首购+复购+店铺） packAccountTrade(cuMemberTradeList, bdAccountValueMap, EAccount.BONUS.getValue(), currentDateTime, cuMemberBonus, ComputeUtil.computeMultiply(cuMemberBonus.getRealIncomeTotal(), currencyDTO.getOutExchangeRate()), settleDate); // 重销币（商城重消+平台服务费） // BigDecimal repeat = ComputeUtil.computeAdd(cuMemberBonus.getBackPoints(), cuMemberBonus.getServiceSpend()); @@ -239,7 +239,7 @@ public class BonusGrantServiceImpl implements IBonusGrantService { List cuMemberTradeList = new ArrayList<>(); cuMemberBonusList.forEach(cuMemberBonus -> { CurrencyDTO currencyDTO = iCurrencyServiceApi.getCurrency(cuMemberBonus.getPkCountry()).getData(); - // 奖金币（首购+复购+云代+海粉+嗨粉+店铺） + // 奖金币（首购+复购+店铺） packAccountTrade(cuMemberTradeList, bdAccountValueMap, EAccount.BONUS.getValue(), currentDateTime, cuMemberBonus, ComputeUtil.computeMultiply(cuMemberBonus.getRealIncomeTotal(), currencyDTO.getOutExchangeRate()), settleDate); // 重销币（商城重消+平台服务费） // BigDecimal repeat = ComputeUtil.computeAdd(cuMemberBonus.getBackPoints(), cuMemberBonus.getServiceSpend()); diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java index 21c1e860..ecf953e9 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleFirstPurchaseHandle.java @@ -451,7 +451,7 @@ public class BonusSettleFirstPurchaseHandle extends BonusSettleHandle { if (bdGrade.getFirstCalculate() != null && EYesNo.NO.getIntValue() == bdGrade.getFirstCalculate()) { continue; } - // 嗨粉、海粉没有量奖 + // 没有量奖 if (EPlaceDept.LEFT_DEPT.getValue() == cuMemberSettleExt.getPlaceDept()) { // 左区 // K值设置 diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java index 5266f78a..e6e6b5de 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java @@ -390,7 +390,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl cuMemberBonusDetailList = cuMemberBonusDetailMapper.queryMemberBonusDetailByBonusItems(bonusParam); dataTable = getDataTable(cuMemberBonusDetailList); @@ -422,7 +422,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl memberBonusDetailVOList = new ArrayList<>(); BdBonusItems bonusItems = iBonusItemsServiceApi.queryBonusItemsByBonusValue(bonusParam.getPkCountry(), bonusParam.getBonusValue()).getData(); bonusParam.setPkBonusItems(bonusItems.getPkId()); - // 其他收益 服务补贴、分红收益、嗨粉直推 + // 其他收益 服务补贴、分红收益 // 拓展收益、复购拓展收益 List cuMemberBonusDetailList = cuMemberBonusDetailMapper.queryMemberBonusDetailByBonusItems(bonusParam); CurrencyDTO currency = iCurrencyServiceApi.getCurrency(bonusParam.getPkCountry()).getData(); @@ -500,7 +500,7 @@ public class CuMemberBonusServiceImpl extends ServiceImpl cuMemberBonusDetailList = cuMemberBonusDetailMapper.queryMemberBonusDetailByBonusItemsForServer(bonusParam); dataTable = getDataTable(cuMemberBonusDetailList); cuMemberBonusDetailList.forEach(cuMemberBonusDetail -> { diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusPubVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusPubVO.java index 18cc93cc..47824dc7 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusPubVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusPubVO.java @@ -106,11 +106,6 @@ public class BonusPubVO implements Serializable { @Excel(name = "店铺收益", scale = 2) private BigDecimal storeIncomeOri; - /** - * 嗨粉推荐收益 - */ - private BigDecimal hiFunIncomeOri; - /** * 首购实发小计 */ @@ -236,11 +231,6 @@ public class BonusPubVO implements Serializable { @Excel(name = "店铺收益($)", scale = 2) private BigDecimal storeIncome; - /** - * 嗨粉推荐收益 - */ - private BigDecimal hiFunIncome; - /** * 首购实发小计 */ diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java index f6334dfe..b28e0d17 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/BonusTotalVO.java @@ -134,12 +134,6 @@ public class BonusTotalVO implements Serializable { @Excel(name = "店铺收益", scale = 2) private BigDecimal storeIncomeOri; - /** - * 嗨粉推荐收益 - */ - @Excel(name = "嗨粉推荐收益", scale = 2) - private BigDecimal hiFunIncomeOri; - /** * 首购实发小计 */ @@ -267,12 +261,6 @@ public class BonusTotalVO implements Serializable { @Excel(name = "店铺收益($)", scale = 2) private BigDecimal storeIncome; - /** - * 嗨粉推荐收益 - */ - @Excel(name = "嗨粉推荐收益($)", scale = 2) - private BigDecimal hiFunIncome; - /** * 首购实发小计 */ diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java index 81d28c14..c0d6a2cc 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/CuMemberBonusVO.java @@ -293,16 +293,6 @@ public class CuMemberBonusVO implements Serializable { */ private BigDecimal storeIncome; - /** - * 嗨粉推荐收益 - */ - private BigDecimal hiFunIncomeOri; - - /** - * 嗨粉推荐收益 - */ - private BigDecimal hiFunIncome; - /** * 首购实发小计 */ diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHaiFunVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHaiFunVO.java index 27e79578..bfa6ede9 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHaiFunVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHaiFunVO.java @@ -8,12 +8,7 @@ import lombok.NoArgsConstructor; import java.math.BigDecimal; /** - * @description: 会员端海粉收益 - * @author: sui q - * @time: 2023/4/28 10:36 - * @classname: MemberBonusPurchaseVO - * @package_name: com.hzs.member.bonus.vo - * version 1.0.0 + * 会员端海粉收益 */ @Data @Builder diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHiFunVO.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHiFunVO.java index 15bda60a..023235fa 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHiFunVO.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusHiFunVO.java @@ -8,12 +8,7 @@ import lombok.NoArgsConstructor; import java.math.BigDecimal; /** - * @description: 会员端嗨粉收益 - * @author: sui q - * @time: 2023/4/28 10:36 - * @classname: MemberBonusPurchaseVO - * @package_name: com.hzs.member.bonus.vo - * version 1.0.0 + * 会员端嗨粉收益 */ @Data @Builder diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/MemberParam.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/MemberParam.java index b684db20..89bd7c3e 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/MemberParam.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/param/MemberParam.java @@ -9,11 +9,7 @@ import java.util.Date; import java.util.List; /** - * @Description: 后台查询会员的统一入口参数 - * @Author: sui q - * @Time: 2022/10/13 9:41 - * @Classname: QueryMemberParam - * @PackageName: com.hzs.member.param + * 后台查询会员的统一入口参数 */ @Data public class MemberParam implements Serializable { @@ -31,11 +27,11 @@ public class MemberParam implements Serializable { private String memberName; /** - * 用户类型分类（0=正常（正常 空单 嗨粉） 1=死点（死点）） + * 用户类型分类（0=正常（正常 空单） 1=死点（死点）） */ private Integer category; /** - * 会员类型（0.正常 1.空单 2.死点 4.嗨粉 5.商城小程序游客） + * 会员类型（0.正常 1.空单 2.死点 5.商城小程序游客） */ private Integer customerType; @@ -185,7 +181,7 @@ public class MemberParam implements Serializable { private String code; @JsonIgnore - public List getValidConfirmField(){ + public List getValidConfirmField() { List fieldList = new ArrayList<>(); fieldList.add("memberCode"); fieldList.add("memberName"); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeDetailVO.java index 031d816d..36ca8164 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeDetailVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeDetailVO.java @@ -15,12 +15,7 @@ import java.util.Date; import java.util.List; /** - *

* 会员交易明细 - *

- * - * @author hzs - * @since 2022-09-06 */ @EqualsAndHashCode(callSuper = true) @Data @@ -56,7 +51,7 @@ public class CuMemberTradeDetailVO extends CuMemberBaseVO { private String pkAccountVal; /** - * 交易类型: (101: 注册订单,102: 升级订单,103: 复购订单,104: 圣宝云代注册,105: 圣宝云代升级,106: 圣宝云代复购,107: 嗨粉订单,108: 提货订单,109: 礼包订单,110: 消费订单,111: 兑换订单,200: 提现,201: 提现充正,300: 转账,400: 后台充值,401: 线上充值,500: 收益发放,600: 撤单返钱,601: 返还本金) + * 交易类型: (101: 注册订单,102: 升级订单,103: 复购订单,108: 提货订单,109: 礼包订单,110: 消费订单,111: 兑换订单,200: 提现,201: 提现充正,300: 转账,400: 后台充值,401: 线上充值,500: 收益发放,600: 撤单返钱,601: 返还本金) */ @Transaction(transactionKey = EnumsPrefixConstants.TRADE_TYPE) private Integer tradeType; diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java index fd31460f..f6e3082d 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/vo/CuMemberTradeVO.java @@ -13,12 +13,7 @@ import java.util.Date; import java.util.List; /** - *

* 会员交易明细 - *

- * - * @author hzs - * @since 2022-09-06 */ @EqualsAndHashCode(callSuper = true) @Data @@ -42,7 +37,7 @@ public class CuMemberTradeVO extends CuMemberBaseVO { private String pkAccountVal; /** - * 交易类型: (101: 注册订单,102: 升级订单,103: 复购订单,104: 圣宝云代注册,105: 圣宝云代升级,106: 圣宝云代复购,107: 嗨粉订单,108: 提货订单,109: 礼包订单,110: 消费订单,111: 兑换订单,200: 提现,201: 提现充正,300: 转账,400: 后台充值,401: 线上充值,500: 收益发放,600: 撤单返钱,601: 返还本金) + * 交易类型: (101: 注册订单,102: 升级订单,103: 复购订单,108: 提货订单,109: 礼包订单,110: 消费订单,111: 兑换订单,200: 提现,201: 提现充正,300: 转账,400: 后台充值,401: 线上充值,500: 收益发放,600: 撤单返钱,601: 返还本金) */ @Transaction(transactionKey = EnumsPrefixConstants.TRADE_TYPE) private Integer tradeType; diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java index a5c40357..53ca4905 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -1509,8 +1509,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl placementDataVOList = new ArrayList<>(); Integer pkSettleCountry = param.getPkSettleCountry(); @@ -81,7 +75,7 @@ public class SettleCenterController extends BaseController { * @return TableDataInfo */ @AccessPermissions("recommendData") - @PostMapping("show-recommend") + @PostMapping("/show-recommend") public TableDataInfo showRecommend(@RequestBody PlacementDataParam param) { List placementDataVOList = new ArrayList<>(); Integer pkSettleCountry = param.getPkSettleCountry(); @@ -323,8 +317,6 @@ public class SettleCenterController extends BaseController { exportDataVO.setFirstAchieve(detailVO.getFirstAchieve()); exportDataVO.setRepeatAmount(detailVO.getRepeatAmount()); exportDataVO.setRepeatAchieve(detailVO.getRepeatAchieve()); - exportDataVO.setHiFunAmount(detailVO.getHiFunAmount()); - exportDataVO.setHiFunAchieve(detailVO.getHiFunAchieve()); exportDataVO.setSystemRatio(detailVO.getSystemRatio()); exportDataVO.setMarketRatio(detailVO.getMarketRatio()); @@ -334,8 +326,6 @@ public class SettleCenterController extends BaseController { exportDataVO.setSettleFirstAchieve(detailVO.getSettleFirstAchieve()); exportDataVO.setSettleRepeatAmount(detailVO.getSettleRepeatAmount()); exportDataVO.setSettleRepeatAchieve(detailVO.getSettleRepeatAchieve()); - exportDataVO.setSettleHiFunAmount(detailVO.getSettleHiFunAmount()); - exportDataVO.setSettleHiFunAchieve(detailVO.getSettleHiFunAchieve()); exportDataVO.setSettleSystemRatio(detailVO.getSettleSystemRatio()); exportDataVO.setSettleMarketRatio(detailVO.getSettleMarketRatio()); return exportDataVO; @@ -356,8 +346,6 @@ public class SettleCenterController extends BaseController { exportDataVO.setReplyFirstAchieve(detailVO.getFirstAchieve()); exportDataVO.setReplyRepeatAmount(detailVO.getRepeatAmount()); exportDataVO.setReplyRepeatAchieve(detailVO.getRepeatAchieve()); - exportDataVO.setReplyHiFunAmount(detailVO.getHiFunAmount()); - exportDataVO.setReplyHiFunAchieve(detailVO.getHiFunAchieve()); exportDataVO.setReplySystemRatio(detailVO.getSystemRatio()); exportDataVO.setReplyMarketRatio(detailVO.getMarketRatio()); @@ -367,8 +355,6 @@ public class SettleCenterController extends BaseController { exportDataVO.setReplySettleFirstAchieve(detailVO.getSettleFirstAchieve()); exportDataVO.setReplySettleRepeatAmount(detailVO.getSettleRepeatAmount()); exportDataVO.setReplySettleRepeatAchieve(detailVO.getSettleRepeatAchieve()); - exportDataVO.setReplySettleHiFunAmount(detailVO.getSettleHiFunAmount()); - exportDataVO.setReplySettleHiFunAchieve(detailVO.getSettleHiFunAchieve()); exportDataVO.setReplySettleSystemRatio(detailVO.getSettleSystemRatio()); exportDataVO.setReplySettleMarketRatio(detailVO.getSettleMarketRatio()); return exportDataVO; diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataBaseVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataBaseVO.java index 139785aa..53f9ad56 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataBaseVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataBaseVO.java @@ -13,12 +13,6 @@ import java.util.Date; /** * 推荐数据数据查询VO - * - * @Description: - * @Author: ljc - * @Time: 2023/5/30 16:38 - * @Classname: PlacementDataBaseVO - * @Package_name: com.hzs.member.settlecenter.vo */ @Data @Builder @@ -99,19 +93,6 @@ public class RecommendDataBaseVO implements Serializable { @BigDecimalFormat() private BigDecimal repeatAchieve; - - /** - * 嗨粉金额 - */ - @BigDecimalFormat() - private BigDecimal hiFunAmount; - - /** - * 嗨粉业绩 - */ - @BigDecimalFormat() - private BigDecimal hiFunAchieve; - /** * 体系占比 */ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataDetailVO.java index edd0d9ae..51e7a480 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataDetailVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendDataDetailVO.java @@ -13,12 +13,6 @@ import java.math.BigDecimal; /** * 推荐数据详情 - * - * @Description: - * @Author: ljc - * @Time: 2023/6/1 17:33 - * @Classname: RecommendDataDetailVO - * @Package_name: com.hzs.member.settlecenter.vo */ @Data @Builder @@ -66,19 +60,6 @@ public class RecommendDataDetailVO implements Serializable { @BigDecimalFormat() private BigDecimal repeatAchieve; - - /** - * 嗨粉金额 - */ - @BigDecimalFormat() - private BigDecimal hiFunAmount; - - /** - * 嗨粉业绩 - */ - @BigDecimalFormat() - private BigDecimal hiFunAchieve; - /** * 体系占比 */ @@ -133,19 +114,6 @@ public class RecommendDataDetailVO implements Serializable { @BigDecimalFormat() private BigDecimal settleRepeatAchieve; - - /** - * 嗨粉金额（本币） - */ - @BigDecimalFormat() - private BigDecimal settleHiFunAmount; - - /** - * 嗨粉业绩（本币） - */ - @BigDecimalFormat() - private BigDecimal settleHiFunAchieve; - /** * 体系占比（本币） */ @@ -169,7 +137,7 @@ public class RecommendDataDetailVO implements Serializable { /** * 数据类型 */ - private String dataTypeVal; + private String dataTypeVal; /** * 体系 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendExportDataVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendExportDataVO.java index 06d160cb..244d129b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendExportDataVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/settlecenter/vo/RecommendExportDataVO.java @@ -2,8 +2,6 @@ package com.hzs.member.settlecenter.vo; import com.hzs.common.core.annotation.BigDecimalFormat; import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,13 +10,6 @@ import lombok.NoArgsConstructor; import java.io.Serializable; import java.math.BigDecimal; -/** - * @Description: - * @Author: ljc - * @Time: 2023/6/3 15:05 - * @Classname: RecommendExportDataVO - * @Package_name: com.hzs.member.settlecenter.vo - */ @Data @Builder @AllArgsConstructor @@ -113,21 +104,6 @@ public class RecommendExportDataVO implements Serializable { @Excel(name = "复购业绩($)", scale = 2) private BigDecimal repeatAchieve; - - /** - * 嗨粉金额 - */ - @BigDecimalFormat() - @Excel(name = "嗨粉金额($)", scale = 2) - private BigDecimal hiFunAmount; - - /** - * 嗨粉业绩 - */ - @BigDecimalFormat() - @Excel(name = "嗨粉业绩($)", scale = 2) - private BigDecimal hiFunAchieve; - /** * 体系占比 */ @@ -191,21 +167,6 @@ public class RecommendExportDataVO implements Serializable { private BigDecimal settleRepeatAchieve; - /** - * 嗨粉金额（本币） - */ - @BigDecimalFormat() - @Excel(name = "嗨粉金额(¥)", scale = 2) - private BigDecimal settleHiFunAmount; - - /** - * 嗨粉业绩（本币） - */ - @BigDecimalFormat() - @Excel(name = "嗨粉业绩(¥)", scale = 2) - private BigDecimal settleHiFunAchieve; - - /** * 体系占比 */ @@ -232,7 +193,7 @@ public class RecommendExportDataVO implements Serializable { */ @BigDecimalFormat() @Excel(name = "去重真实金额($)", scale = 2) - private BigDecimal replyRealAmount; + private BigDecimal replyRealAmount; /** @@ -273,21 +234,6 @@ public class RecommendExportDataVO implements Serializable { @Excel(name = "去重复购业绩($)", scale = 2) private BigDecimal replyRepeatAchieve; - - /** - * 嗨粉金额 - */ - @BigDecimalFormat() - @Excel(name = "去重嗨粉金额($)", scale = 2) - private BigDecimal replyHiFunAmount; - - /** - * 嗨粉业绩 - */ - @BigDecimalFormat() - @Excel(name = "去重嗨粉业绩($)", scale = 2) - private BigDecimal replyHiFunAchieve; - /** * 体系占比 */ @@ -351,21 +297,6 @@ public class RecommendExportDataVO implements Serializable { private BigDecimal replySettleRepeatAchieve; - /** - * 嗨粉金额（本币） - */ - @BigDecimalFormat() - @Excel(name = "去重嗨粉金额(¥)", scale = 2) - private BigDecimal replySettleHiFunAmount; - - /** - * 嗨粉业绩（本币） - */ - @BigDecimalFormat() - @Excel(name = "去重嗨粉业绩(¥)", scale = 2) - private BigDecimal replySettleHiFunAchieve; - - /** * 体系占比 */ @@ -382,5 +313,4 @@ public class RecommendExportDataVO implements Serializable { private BigDecimal replySettleMarketRatio; - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java index 667adb1d..729bde9e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java @@ -1,9 +1,6 @@ package com.hzs.member.share.controller.api; -import com.hzs.common.core.config.BdConfig; -import com.hzs.common.core.constant.SysConstants; import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EEnv; import com.hzs.common.core.enums.EShareType; import com.hzs.common.core.utils.sign.Base64Util; import com.hzs.common.core.web.domain.AjaxResult; @@ -16,16 +13,11 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; import java.util.HashMap; import java.util.Map; /** - * @Description: 会员分享相关控制器 - * @Author: jiang chao - * @Time: 2023/3/15 10:03 - * @Classname: ShareController - * @PackageName: com.hzs.member.share.controller + * 会员分享相关控制器 */ @Slf4j @RestController @@ -35,36 +27,36 @@ public class ApiShareController { @DubboReference IShareServiceApi iShareServiceApi; - /** - * 获取海粉分享码 - * - * @return - */ - @GetMapping("/fans-code") - public AjaxResult fansCode() { - Long userId = SecurityUtils.getUserId(); - // 海粉注册分享人就是自己 - R resultR = iShareServiceApi.queryShareCode(ShareServiceDTO.builder() - .eShareType(EShareType.FANS) - .pkBusiness(userId) - .pkCountry(SecurityUtils.getPkCountry()) - .userId(userId) - .build()); - if (resultR.isSuccess()) { - return AjaxResult.success("", resultR.getData()); - } - return AjaxResult.error(); - } +// /** +// * 获取海粉分享码 +// * +// * @return +// */ +// @GetMapping("/fans-code") +// public AjaxResult fansCode() { +// Long userId = SecurityUtils.getUserId(); +// // 海粉注册分享人就是自己 +// R resultR = iShareServiceApi.queryShareCode(ShareServiceDTO.builder() +// .eShareType(EShareType.FANS) +// .pkBusiness(userId) +// .pkCountry(SecurityUtils.getPkCountry()) +// .userId(userId) +// .build()); +// if (resultR.isSuccess()) { +// return AjaxResult.success("", resultR.getData()); +// } +// return AjaxResult.error(); +// } /** - * 获取海粉分享码（H5） + * 获取188分享码（H5） * * @return */ @GetMapping("/fans-code-h5") public AjaxResult fansCodeH5() { Long userId = SecurityUtils.getUserId(); - // 海粉注册分享人就是自己 + // 188注册分享人就是自己 R resultR = iShareServiceApi.queryShareCode(ShareServiceDTO.builder() .eShareType(EShareType.FANS) .pkBusiness(userId) @@ -81,86 +73,50 @@ public class ApiShareController { return AjaxResult.error(); } - /** - * 获取分享专区分享码 - * - * @return - */ - @GetMapping("/share-code") - public AjaxResult shareCode() { - // 2024.01.29 添加需求，自2024年2月1日起，0元注册功能取消 - if (checkShare()) { - return AjaxResult.error("二维码已停用，请联系相应亲友协助办理注册"); - } - - Long userId = SecurityUtils.getUserId(); - // 分享专区分享人就是自己 - R resultR = iShareServiceApi.queryShareCode(ShareServiceDTO.builder() - .eShareType(EShareType.SHARE) - .pkBusiness(userId) - .pkCountry(SecurityUtils.getPkCountry()) - .userId(userId) - .build()); - if (resultR.isSuccess()) { - return AjaxResult.success("", resultR.getData()); - } - return AjaxResult.error(); - } - - /** - * 获取分享专区分享码（H5） - * - * @return - */ - @GetMapping("/share-code-h5") - public AjaxResult shareCodeH5() { - // 2024.01.29 添加需求，自2024年2月1日起，0元注册功能取消 - if (checkShare()) { - return AjaxResult.error("二维码已停用，请联系相应亲友协助办理注册"); - } - - Long userId = SecurityUtils.getUserId(); - // 分享专区分享人就是自己 - R resultR = iShareServiceApi.queryShareCode(ShareServiceDTO.builder() - .eShareType(EShareType.SHARE) - .pkBusiness(userId) - .pkCountry(SecurityUtils.getPkCountry()) - .userId(userId) - .build()); - if (resultR.isSuccess()) { - Map resultMap = new HashMap<>(); - resultMap.put("dataUrl", resultR.getData()); - // 前端无法根据URL生成海报，此处需要转一下base64 - resultMap.put("dataStr", Base64Util.toUrlBase64(resultR.getData())); - return AjaxResult.success(resultMap); - } - return AjaxResult.error(); - } - - /** - * 校验是否能注册 - * - * @return - */ - @GetMapping("/check-share-code") - public AjaxResult checkShareCode() { - if (checkShare()) { - return AjaxResult.error("二维码已停用，请联系相应亲友协助办理注册"); - } - return AjaxResult.success(); - } - - /** - * 校验是否可以注册 -- 自2024年2月1日起，0元注册功能取消 - * - * @return - */ - private boolean checkShare() { - if (EEnv.TEST.getValue().equals(BdConfig.getEnv())) { - return new Date().getTime() >= SysConstants.CLOSE_ZERO_DATE_TEST; - } else { - return new Date().getTime() >= SysConstants.CLOSE_ZERO_DATE_ONLINE; - } - } +// /** +// * 获取分享专区分享码 +// * +// * @return +// */ +// @GetMapping("/share-code") +// public AjaxResult shareCode() { +// Long userId = SecurityUtils.getUserId(); +// // 分享专区分享人就是自己 +// R resultR = iShareServiceApi.queryShareCode(ShareServiceDTO.builder() +// .eShareType(EShareType.SHARE) +// .pkBusiness(userId) +// .pkCountry(SecurityUtils.getPkCountry()) +// .userId(userId) +// .build()); +// if (resultR.isSuccess()) { +// return AjaxResult.success("", resultR.getData()); +// } +// return AjaxResult.error(); +// } +// +// /** +// * 获取分享专区分享码（H5） +// * +// * @return +// */ +// @GetMapping("/share-code-h5") +// public AjaxResult shareCodeH5() { +// Long userId = SecurityUtils.getUserId(); +// // 分享专区分享人就是自己 +// R resultR = iShareServiceApi.queryShareCode(ShareServiceDTO.builder() +// .eShareType(EShareType.SHARE) +// .pkBusiness(userId) +// .pkCountry(SecurityUtils.getPkCountry()) +// .userId(userId) +// .build()); +// if (resultR.isSuccess()) { +// Map resultMap = new HashMap<>(); +// resultMap.put("dataUrl", resultR.getData()); +// // 前端无法根据URL生成海报，此处需要转一下base64 +// resultMap.put("dataStr", Base64Util.toUrlBase64(resultR.getData())); +// return AjaxResult.success(resultMap); +// } +// return AjaxResult.error(); +// } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java index d9771640..bf5e62f6 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java @@ -341,7 +341,6 @@ public class CuBonusStatisServiceImpl extends ServiceImpl bdWaresExtList = iBdWaresService.queryWaresByCondition(cuWaresParams.getSpecialArea(), cuWaresParams.getPkAreaClassify(), cuWaresParams.getWaresName(), null, null, pkCountry); if (CollectionUtil.isNotEmpty(bdWaresExtList)) { - // 等级 - R> gradeDTO = iGradeServiceApi.queryGradeList(pkCountry); - List gradeList = gradeDTO.getData(); - Map gradeMap = gradeList.stream().collect(Collectors.toMap(GradeDTO::getGradeValue, Function.identity())); - // 当前会员ID Long userId = SecurityUtils.getUserId(); CuMember cuMember = iSaOrderService.getCuMemberByKey(userId); @@ -745,4 +735,132 @@ public class ApiBdWaresController extends BaseController { return AjaxResult.success(waresInfoVo); } + /** + * 188分享专区商品列表 + */ + @GetMapping("/list-wares-share") + public AjaxResult listWaresShare(@RequestBody WaresShareParam param) { + param.setSpecialArea(ESpecialArea.REGISTER_AREA.getValue()); + param.setIsMakerGift(EWaresType.PRODUCT_188.getValue()); + param.setPkCountry(CountryConstants.CHINA_COUNTRY); + + // 返回数据 + List waresParamsList = new ArrayList<>(); + + // 查询商品列表 + List bdWaresExtList = iBdWaresService.listWaresShare(param.getSpecialArea(), param.getIsMakerGift(), param.getPkCountry()); + + if (CollectionUtil.isNotEmpty(bdWaresExtList)) { + // 商品主键列表 + List waresIdList = bdWaresExtList.stream().map(BdWares::getPkId).collect(Collectors.toList()); + + if (StringUtils.isNotEmpty(param.getShareMemberCode())) { + // 分享人ID + Long pkMember = Long.parseLong(new String(Base64Decoder.decode(param.getShareMemberCode()))); + CuMember cuMember = iSaOrderService.getCuMemberByKey(pkMember); + // 当前会员编号 + String memberCode = cuMember.getMemberCode(); + + // 检验商品团队信息 + Map> waresAuthorityMap = iBdWaresService.getWaresAuthority(waresIdList); + List showWaresList = bdWaresExtList.stream().map(we -> getShowWares(we.getPkId(), pkMember, memberCode, waresAuthorityMap)).collect(Collectors.toList()); + R> waresShowMapDto = iMemberServiceApi.checkIsShowWares(showWaresList); + Map waresShowMap = waresShowMapDto.getData(); + + // 商品标签列表 + BdWaresLabel waresLabel = new BdWaresLabel(); + waresLabel.setPkIdList(waresIdList); + List list = iBdWaresLabelService.selectByList(waresLabel); + // 标签 + for (BdWaresExt bdWaresExt : bdWaresExtList) { + // 保证标签 + List ensureLabelList = new ArrayList<>(); + // 卖点标签 + List sellingLabelList = new ArrayList<>(); + + for (BdLabelExt bdLabel : list) { + if (ELabelType.PREFIX.getValue() == bdLabel.getLabelType() && bdLabel.getPkWares().equals(bdWaresExt.getPkId())) { + // 前缀标签 + bdWaresExt.setPrefixLabelTarget(bdLabel); + } + if (ELabelType.COOL.getValue() == bdLabel.getLabelType() && bdLabel.getPkWares().equals(bdWaresExt.getPkId())) { + // 酷炫标签 + bdWaresExt.setCoolLabelTarget(bdLabel); + } + if (ELabelType.ENSURE.getValue() == bdLabel.getLabelType() && bdLabel.getPkWares().equals(bdWaresExt.getPkId())) { + // 保证标签 + ensureLabelList.add(bdLabel); + } + if (ELabelType.SELLING.getValue() == bdLabel.getLabelType() && bdLabel.getPkWares().equals(bdWaresExt.getPkId())) { + // 卖点标签 + sellingLabelList.add(bdLabel); + } + } + bdWaresExt.setEnsureLabelList(ensureLabelList.stream().filter(DistinctByKeyUtil.distinctByKey(BdLabel::getPkId)).collect(Collectors.toList())); + bdWaresExt.setSellingLabelList(sellingLabelList.stream().filter(DistinctByKeyUtil.distinctByKey(BdLabel::getPkId)).collect(Collectors.toList())); + } + + // 查询商品sku 最小值 和数量 + List waresSpecsSkuArray = iBdWaresSpecsSkuService.selectByMinWaresSpecsSkuByPkWaresList(waresIdList); + Map> waresSpecsSkuMap = waresSpecsSkuArray.stream().collect(Collectors.groupingBy(BdWaresSpecsSkuExt::getPkWares)); + + // 查询默认规格 + List waresSpecsSkuList = iBdWaresSpecsSkuService.selectByWaresSpecsSku(waresIdList); + + for (BdWaresExt waresExt : bdWaresExtList) { + // 校验团队信息 + Boolean isShowWares = waresShowMap.get(waresExt.getPkId()); + if (null == isShowWares || !isShowWares) { + continue; + } + + CuWaresParams waresParams = BeanUtil.copyProperties(waresExt, CuWaresParams.class); + // 价格 + BigDecimal waresPrice = BigDecimal.ZERO; + // 业绩 + BigDecimal waresAchieve = BigDecimal.ZERO; + + List waresSpecsSku = waresSpecsSkuMap.get(waresExt.getPkId()); + waresSpecsSku = waresSpecsSku.stream().peek(a -> a.setProductGift(a.getPkProduct() + "" + a.getIsGift())).collect(Collectors.toList()); + Map> col = waresSpecsSku.stream().collect(Collectors.groupingBy(BdWaresSpecsSkuExt::getProductGift)); + for (Map.Entry> integerListEntry : col.entrySet()) { + // 取得每一个商品价格最小值 + Optional minBdWaresSpecsSkuExt = integerListEntry.getValue().stream().filter(Objects::nonNull).min(Comparator.comparing(BdWaresSpecsSkuExt::getPrice)); + BdWaresSpecsSkuExt bdWaresSpecsSkuExt = minBdWaresSpecsSkuExt.get(); + waresPrice = waresPrice.add(bdWaresSpecsSkuExt.getPrice().multiply(new BigDecimal(bdWaresSpecsSkuExt.getQuantity()))); + waresAchieve = waresAchieve.add(bdWaresSpecsSkuExt.getAchieve().multiply(new BigDecimal(bdWaresSpecsSkuExt.getQuantity()))); + } + + // 计算商品列表价格和业绩最小值 + waresParams.setWaresPrice(waresPrice); + waresParams.setWaresAchieve(waresAchieve); + // 商品业绩计算汇率 + if (waresParams.getWaresAchieve() != null) { + waresParams.setWaresAchieve(waresParams.getWaresAchieve()); + waresParams.setWaresPrice(waresParams.getWaresPrice()); + } else { + waresParams.setWaresAchieve(BigDecimal.ZERO); + waresParams.setWaresPrice(BigDecimal.ZERO); + } + + // 查询默认规格 + JSONArray jsonArray = new JSONArray(); + List collect = waresSpecsSkuList.stream().filter(DistinctByKeyUtil.distinctByKey(BdWaresSpecsSku::getPkWaresDetail)).collect(Collectors.toList()); + for (BdWaresSpecsSkuExt bdWaresSpecsSku : collect) { + if (bdWaresSpecsSku.getPkWares().equals(waresExt.getPkId())) { + JSONObject js = new JSONObject(); + js.put("pkProduct", bdWaresSpecsSku.getPkProduct()); + js.put("pkSkuId", bdWaresSpecsSku.getPkId()); + js.put("quantity", bdWaresSpecsSku.getQuantity()); + jsonArray.add(js); + } + } + waresParams.setProductGroup(jsonArray); + waresParamsList.add(waresParams); + } + } + } + return AjaxResult.success(waresParamsList); + } + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresMapper.java index 9bdaf7ea..f311e5a8 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresMapper.java @@ -38,6 +38,18 @@ public interface BdWaresMapper extends BaseMapper { @Param("waresCodeNotInList") List waresCodeNotInList, @Param("pkCountry") Integer pkCountry); + /** + * 根据条件查询商品信息 + * + * @param specialArea 专区 + * @param specialArea 专区 + * @param pkCountry 所属国家 + * @return: List + */ + List listWaresShare(@Param("specialArea") Integer specialArea, + @Param("isMakerGift") Integer isMakerGift, + @Param("pkCountry") Integer pkCountry); + /** * 查询最末商品编号 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/ConfirmOrderWaresInfoParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/ConfirmOrderWaresInfoParams.java deleted file mode 100644 index ecc7d7a6..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/ConfirmOrderWaresInfoParams.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.hzs.sale.wares.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/5/23 15:21 - * @Classname: ConfirmOrderWaresInfoParams - * @PackageName: com.hzs.sale.wares.param - */ - -import lombok.Data; - -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.sale.wares.param - *@Author: yh - *@CreateTime: 2023-05-23 15:21 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class ConfirmOrderWaresInfoParams { - - - private List confirmOrderWaresInfoParamsList; -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresInfoParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresInfoParams.java deleted file mode 100644 index 81344caa..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresInfoParams.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hzs.sale.wares.param; - -import lombok.Data; - -import java.util.List; - -/** - * @Description: - * @Author: yuhui - * @Time: 2023/1/30 11:51 - * @Classname: CuWaresInfoParams - * @PackageName: com.hzs.sale.wares.param - */ -@Data -public class CuWaresInfoParams { - - - /** - * 商品编号 - */ - private String waresCode; - - - /** - * 商品明细主键,用于查询sku - */ - private List pkWaresDetail; -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresParams.java index e0dc7cce..9ec3edf7 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresParams.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresParams.java @@ -22,11 +22,10 @@ import java.util.List; @NoArgsConstructor public class CuWaresParams implements Serializable { - /** - * - */ private Long pkId; + private Integer pkWares; + /** * 商品id */ @@ -237,7 +236,6 @@ public class CuWaresParams implements Serializable { /** * 商品分类（一级分类） */ - private Long pkCategoryOne; /** @@ -248,10 +246,10 @@ public class CuWaresParams implements Serializable { * 商品介绍 */ private String description; + /** * 商品分类（三级分类） */ - private Long pkCategoryThree; /** @@ -279,7 +277,6 @@ public class CuWaresParams implements Serializable { */ private BigDecimal retailPrice; - /** * 消费配置主键 */ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/LabelParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/LabelParams.java deleted file mode 100644 index 9819b452..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/LabelParams.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hzs.sale.wares.param; - -import lombok.Data; - -/** - * @Description: - * @Author: yuhui - * @Time: 2022/11/2 15:54 - * @Classname: LabelParams - * @PackageName: com.hzs.sale.wares.param - */ -@Data -public class LabelParams { - /** - * 标签类型 - */ - private Integer labelType; - - /** - * 标签主键 - */ - private Integer pkLabel; -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/SpecsNameVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/SpecsNameVo.java deleted file mode 100644 index 909898b9..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/SpecsNameVo.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.hzs.sale.wares.param;/** - * @Description: - * @Author: yuhui - * @Time: 2024/3/7 14:45 - * @Classname: SpecsNameVo - * @PackageName: com.hzs.sale.wares.param - */ - -import lombok.Data; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.sale.wares.param - *@Author: yh - *@CreateTime: 2024-03-07 14:45 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class SpecsNameVo { - - /** - * 规格名称 - */ - private String specsName; - - /** - * 是否赠品 0 是 1 否 - */ - private Integer isGift; -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/TransportPostage.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/TransportPostage.java deleted file mode 100644 index ef07ffac..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/TransportPostage.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.hzs.sale.wares.param; - -import lombok.Data; - -/** - * @Description: - * @Author: yuhui - * @Time: 2022/11/2 16:25 - * @Classname: TransportPostage - * @PackageName: com.hzs.sale.wares.param - */ -@Data -public class TransportPostage { - /** - * ETransportType 枚举 海运 陆运空运 - */ - private Integer transportType; - - /** - * 邮费外键 - */ - private Integer pkPostage; -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresCategoryParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresCategoryParam.java deleted file mode 100644 index 76968564..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresCategoryParam.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hzs.sale.wares.param;/** - * @Description: - * @Author: yuhui - * @Time: 2023/7/20 14:50 - * @Classname: WaresCategoryParam - * @PackageName: com.hzs.sale.wares.param - */ - -import lombok.Data; - -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.sale.wares.param - *@Author: yh - *@CreateTime: 2023-07-20 14:50 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class WaresCategoryParam { - - /** - * 上级id 列表 - */ - List parentIds; -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresShareParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresShareParam.java new file mode 100644 index 00000000..0b8ec820 --- /dev/null +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresShareParam.java @@ -0,0 +1,31 @@ +package com.hzs.sale.wares.param; + +import lombok.Data; + +/** + * 分享商品查询条件 + */ +@Data +public class WaresShareParam { + + /** + * 分享会员编号 + */ + private String shareMemberCode; + + /** + * 所属专区 + */ + private Integer specialArea; + + /** + * 商品类型 + */ + private Integer isMakerGift; + + /** + * 国家 + */ + private Integer pkCountry; + +} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresStatisticsParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresStatisticsParam.java deleted file mode 100644 index 3499658b..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/WaresStatisticsParam.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hzs.sale.wares.param; - -import lombok.Data; - -import java.util.Date; - -/** - * @Description: 三方商品统计入参 - * @Author: jiang chao - * @Time: 2023/7/21 17:50 - * @Classname: WaresStatisticsParam - * @PackageName: com.hzs.sale.wares.param - */ -@Data -public class WaresStatisticsParam { - - /** - * 商品名称 - */ - private String productName; - - /** - * 一级商品分类 - */ - private Long pkCategoryOne; - - /** - * 二级商品分类 - */ - private Long pkCategoryTwo; - - /** - * 三级商品分类 - */ - private Long pkCategoryThree; - - /** - * 统计时间范围 - */ - private Date[] statisticsDate; - -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java index 1faf4224..91b770be 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java @@ -82,6 +82,16 @@ public interface IBdWaresService extends IService { */ List queryWaresByCondition(); + /** + * 根据条件查询商品信息 + * + * @param specialArea 专区 + * @param specialArea 专区 + * @param pkCountry 所属国家 + * @return: List + */ + List listWaresShare(Integer specialArea, Integer isMakerGift, Integer pkCountry); + /** * 查询商品外键 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java index e3e7ce5d..492989ff 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java @@ -899,6 +899,11 @@ public class BdWaresServiceImpl extends ServiceImpl impl return baseMapper.queryWaresByCondition(null, null, null, null, null, null, null); } + @Override + public List listWaresShare(Integer specialArea, Integer isMakerGift, Integer pkCountry) { + return baseMapper.listWaresShare(specialArea, isMakerGift, pkCountry); + } + @Override public BdWares getWares(Integer waresId) { String redisKey = CacheConstants.BD_WARES + waresId; diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml index 2fca7d0a..bc153133 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml @@ -146,6 +146,37 @@ order by bw.SORT_STATUS desc , bw.WARES_PRICE ,bw.CREATION_TIME desc + + +