diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/ShowWaresDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/ShowWaresDTO.java index 30cd4653..7941ecf3 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/ShowWaresDTO.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/dto/ShowWaresDTO.java @@ -1,10 +1,4 @@ -package com.hzs.member.base.dto;/** - * @Description: - * @Author: yuhui - * @Time: 2023/6/29 15:16 - * @Classname: ShowWaresDTO - * @PackageName: com.hzs.member.base.dto - */ +package com.hzs.member.base.dto; import com.hzs.common.domain.sale.wares.BdWaresAuthority; import lombok.Data; @@ -12,14 +6,6 @@ import lombok.Data; import java.io.Serializable; import java.util.List; -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.base.dto - *@Author: yh - *@CreateTime: 2023-06-29 15:16 - *@Description: TODO - *@Version: 1.0 - */ @Data public class ShowWaresDTO implements Serializable { diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICountryServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICountryServiceApi.java index d49a0b9a..50e04b1b 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICountryServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/base/ICountryServiceApi.java @@ -7,11 +7,7 @@ import com.hzs.system.base.dto.CountryDTO; import java.util.Map; /** - * Description: 国家服务接口 - * Author: jiang chao - * Time: 2022/8/31 16:53 - * Classname: ICountryServiceApi - * PackageName: com.hzs.system.base + * 国家服务接口 */ public interface ICountryServiceApi { @@ -25,17 +21,16 @@ public interface ICountryServiceApi { /** * 查询所有国家 + * * @return */ R> getAllCountryMap(); /** * 根据业务类型更新 + * * @param businessType 业务类型 - * @param pkId 主键 - * @return: R - * @Author: sui q - * @Date: 2023/3/10 15:14 - */ + * @param pkId 主键 + */ R updateConfigEffectById(Integer businessType, Integer pkId); } diff --git a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IRangeServiceApi.java b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IRangeServiceApi.java index 1bbf27e2..1d564cce 100644 --- a/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IRangeServiceApi.java +++ b/bd-api/bd-api-system/src/main/java/com/hzs/system/config/IRangeServiceApi.java @@ -1,7 +1,6 @@ package com.hzs.system.config; import com.hzs.common.core.domain.R; -import com.hzs.common.domain.system.config.ext.BdBonusItemsExt; import com.hzs.common.domain.system.config.ext.BdRangeExt; import com.hzs.system.config.dto.RangeDTO; @@ -9,39 +8,26 @@ import java.util.List; import java.util.Map; /** - * @description: 根据国家查询极差配置列表api - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: - * @return: + * 根据国家查询极差配置列表api **/ public interface IRangeServiceApi { - /** - * @description: 根据国家查询极差配置列表 - * @author: zhang jing - * @date: 2022/9/29 15:31 - * @param: [pkCountry] - * @return: com.hzs.common.core.domain.R> - **/ - R> queryRange(Integer pkCountry); + /** + * 根据国家查询极差配置列表 + **/ + R> queryRange(Integer pkCountry); - /** - * 查询各个国家极差的配置 键为 国家+极差类型+等级主键 - * @return: Map - * @Author: sui q - * @Date: 2023/1/3 14:00 - */ - R> queryRangeDto(); + /** + * 查询各个国家极差的配置 键为 国家+极差类型+等级主键 + */ + R> queryRangeDto(); - /** - * 查询各个国家极差的配置 键为 国家+极差类型+等级主键 - * @param pkCountry 国家 - * @param rangeType 极差类型 - * @param pkLevel 等级 - * @return: Map - * @Author: sui q - * @Date: 2023/1/3 14:00 - */ - R queryRangeDtoByCondition(Integer pkCountry, Integer rangeType, Integer pkLevel); + /** + * 查询各个国家极差的配置 键为 国家+极差类型+等级主键 + * + * @param pkCountry 国家 + * @param rangeType 极差类型 + * @param pkLevel 等级 + */ + R queryRangeDtoByCondition(Integer pkCountry, Integer rangeType, Integer pkLevel); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/controller/api/ApiIndexController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/controller/api/ApiIndexController.java index 34afecd0..de038793 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/controller/api/ApiIndexController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/controller/api/ApiIndexController.java @@ -1,39 +1,177 @@ package com.hzs.sale.index.controller.api; -import com.hzs.common.core.web.domain.AjaxResult; +import cn.hutool.core.collection.CollectionUtil; +import com.hzs.common.core.enums.EOrderType; +import com.hzs.common.core.enums.ERangeType; +import com.hzs.common.core.enums.ESpecialArea; +import com.hzs.common.core.web.controller.BaseController; +import com.hzs.common.core.web.page.TableDataInfo; +import com.hzs.common.domain.member.ext.CuMemberExt; +import com.hzs.common.domain.sale.ext.BdWaresExt; +import com.hzs.common.domain.sale.ext.BdWaresSpecsSkuExt; +import com.hzs.common.domain.sale.wares.BdWares; +import com.hzs.common.domain.sale.wares.BdWaresAuthority; +import com.hzs.common.domain.sale.wares.BdWaresRange; +import com.hzs.common.domain.sale.wares.ext.WaresGradeAwards; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.sale.order.service.ISaOrderService; +import com.hzs.member.base.IMemberServiceApi; +import com.hzs.member.base.dto.ShowWaresDTO; +import com.hzs.sale.wares.service.IBdWaresGradeService; +import com.hzs.sale.wares.service.IBdWaresRangeService; +import com.hzs.sale.wares.service.IBdWaresService; +import com.hzs.sale.wares.service.IBdWaresSpecsSkuService; +import com.hzs.sale.wares.vo.WaresVo; import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; + /** * 会员首页 - * - * @Description: - * @Author: ljc - * @Time: 2023/5/4 21:06 - * @Classname: ApiHomePageController - * @Package_name: com.hzs.member.base.controller.api */ @Slf4j @RequestMapping("/api/order") @RestController -public class ApiIndexController { +public class ApiIndexController extends BaseController { @Autowired - ISaOrderService saOrderService; + private IBdWaresService iBdWaresService; + @Autowired + private IBdWaresRangeService iBdWaresRangeService; + @Autowired + private IBdWaresGradeService iBdWaresGradeService; + @Autowired + private IBdWaresSpecsSkuService iBdWaresSpecsSkuService; + + @DubboReference + IMemberServiceApi iMemberServiceApi; /** - * 我的市场 + * 首页商品列表 * - * @return AjaxResult + * @return */ - @GetMapping("/index-myMarket") - public AjaxResult selectMyMarket() { - return AjaxResult.success(saOrderService.selectMyMarket(SecurityUtils.getUserId(), SecurityUtils.getPkCountry())); + @GetMapping("/index-wares-list") + public TableDataInfo indexWaresList() { + Long pkMember = SecurityUtils.getUserId(); + + // 返回数据列表 + List waresVOList = new ArrayList<>(); + + // 商品列表 + List waresList = iBdWaresService.listWares(Arrays.asList(ESpecialArea.REPURCHASE_AREA.getValue(), ESpecialArea.SPECIAL_REPURCHASE_AREA.getValue(), ESpecialArea.RESCISSION_AREA.getValue())); + if (CollectionUtil.isNotEmpty(waresList)) { + // 获取商品ID列表 + List waresIdList = waresList.stream().map(BdWares::getPkId).collect(Collectors.toList()); + // 登录用户 + CuMemberExt loginMember = iMemberServiceApi.getMemberById(pkMember).getData(); + + // 商品等级、奖衔、权限控制处理 + Set authWaresIdSet = new HashSet<>(); + List authWaresList = new ArrayList<>(); + if (waresIdList.size() > 0) { + List waresGradeAwardsList = iBdWaresGradeService.queryWaresGradeAwards(waresIdList); + waresGradeAwardsList.forEach(waresGradeAwards -> { + authWaresIdSet.add(waresGradeAwards.getPkWares()); + String key = waresGradeAwards.getPkWares() + "_" + waresGradeAwards.getRangeType() + "_" + waresGradeAwards.getPkRange().toString(); + authWaresList.add(key); + }); + } + + // 商品是否显示（用于团队显示控制使用） + Map waresShowMap = new HashMap<>(); + Map> waresAuthorityMap = iBdWaresService.getWaresAuthority(waresIdList); + if (waresAuthorityMap.size() > 0) { + List showWaresList = waresList.stream().map(item -> { + ShowWaresDTO showWaresDTO = new ShowWaresDTO(); + showWaresDTO.setPkWares(item.getPkId()); + showWaresDTO.setLoginMember(pkMember); + showWaresDTO.setWaresAuthorityList(waresAuthorityMap.get(item.getPkId())); + return showWaresDTO; + }).collect(Collectors.toList()); + // 商品显示权限map（key:商品ID，value:是否可见） + waresShowMap = iMemberServiceApi.checkIsShowWares(showWaresList).getData(); + } + + // 查询商品sku 最小值 和数量 + Map> waresSpecsSkuMap = new HashMap<>(); + if (waresIdList.size() > 0) { + List waresSpecsSkuArray = iBdWaresSpecsSkuService.selectByMinWaresSpecsSkuByPkWaresList(waresIdList); + waresSpecsSkuMap = waresSpecsSkuArray.stream().collect(Collectors.groupingBy(BdWaresSpecsSkuExt::getPkWares)); + } + // 复购类商品级差价格 + List bdWaresRangeList = iBdWaresRangeService.queryWaresRangeByCondition(loginMember, waresIdList); + + for (BdWaresExt bdWares : waresList) { + if (authWaresIdSet.contains(bdWares.getPkId())) { + String gradeKey = bdWares.getPkId() + "_" + ERangeType.GRADE.getValue() + "_" + loginMember.getPkSettleGrade(); + String awardsKey = bdWares.getPkId() + "_" + ERangeType.AWARDS.getValue() + "_" + loginMember.getPkAwards(); + String authorityKey = bdWares.getPkId() + "_" + ERangeType.AUTHORITY.getValue() + "_" + loginMember.getRegisterAuthority(); + if (!authWaresList.contains(gradeKey) && !authWaresList.contains(awardsKey) && !authWaresList.contains(authorityKey)) { + continue; + } + } + + Boolean isShow = waresShowMap.get(bdWares.getPkId()); + if (null == isShow || isShow) { + List waresSpecsSku = waresSpecsSkuMap.get(bdWares.getPkId()); + waresSpecsSku = waresSpecsSku.stream().peek(a -> a.setProductGift(a.getPkProduct() + "" + a.getIsGift())).collect(Collectors.toList()); + Map> col = waresSpecsSku.stream().collect(Collectors.groupingBy(BdWaresSpecsSkuExt::getProductGift)); + BigDecimal waresPrice = BigDecimal.ZERO; + BigDecimal waresAchieve = BigDecimal.ZERO; + BigDecimal assAchieve = BigDecimal.ZERO; + // 会员价 + BigDecimal vipAchieve = BigDecimal.ZERO; + // 零售价 + BigDecimal retailPrice = BigDecimal.ZERO; + 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()))); + assAchieve = assAchieve.add(bdWaresSpecsSkuExt.getAssAchieve().multiply(new BigDecimal(bdWaresSpecsSkuExt.getQuantity()))); + // 会员价 + vipAchieve = vipAchieve.add(bdWaresSpecsSkuExt.getVipPrice().multiply(BigDecimal.valueOf(bdWaresSpecsSkuExt.getQuantity()))); + // 零售价 + retailPrice = retailPrice.add(bdWaresSpecsSkuExt.getRetailPrice().multiply(BigDecimal.valueOf(bdWaresSpecsSkuExt.getQuantity()))); + } + + // 商品信息填充 + WaresVo waresVo = new WaresVo(); + waresVo.setCover(bdWares.getCover()); + waresVo.setWaresName(bdWares.getWaresName()); + BigDecimal price = waresPrice; + if (EOrderType.REPURCHASE_ORDER.getValue() == bdWares.getSpecialArea()) { + for (BdWaresRange bdWaresRange : bdWaresRangeList) { + if (bdWares.getPkId().intValue() == bdWaresRange.getPkWares().intValue()) { + price = price.add(bdWaresRange.getPrice()); + } + } + } + waresVo.setWaresPrice(price); + waresVo.setVipPrice(vipAchieve); + waresVo.setRetailPrice(retailPrice); + waresVo.setWaresAchieve(waresAchieve); + waresVo.setPkWares(bdWares.getPkId()); + waresVo.setWaresCode(bdWares.getWaresCode()); + waresVo.setSpecialArea(bdWares.getSpecialArea()); + waresVo.setIsSale(bdWares.getIsSale()); + waresVo.setPreSaleStatus(bdWares.getPreSaleStatus()); + waresVo.setSales(bdWares.getSales()); + waresVOList.add(waresVo); + } + } + } + TableDataInfo tableDataInfo = getDataTable(waresList); + tableDataInfo.setRows(waresVOList); + return tableDataInfo; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/controller/manage/IndexController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/controller/manage/IndexController.java index 03cc8f60..3bd602e7 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/controller/manage/IndexController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/controller/manage/IndexController.java @@ -16,13 +16,6 @@ import org.springframework.web.bind.annotation.RestController; import java.math.BigDecimal; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/12/1 17:52 - * @Classname: IndexController - * @PackageName: com.hzs.sale.index - */ @RestController @RequestMapping("/manager/index") public class IndexController extends BaseController { @@ -36,7 +29,7 @@ public class IndexController extends BaseController { * 查询套组商品占比 */ @GetMapping("get-wares-scale") - public AjaxResult getWaresScale(){ + public AjaxResult getWaresScale() { // 查询单品 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("IS_SINGLE", EYesNo.YES.getIntValue()); @@ -58,21 +51,21 @@ public class IndexController extends BaseController { JSONObject json = new JSONObject(); // 总收益 - json.put("priceSum",priceSum); + json.put("priceSum", priceSum); // 套组百分比占比 - json.put("composeRatio",composeRatio); + json.put("composeRatio", composeRatio); // 单品百分比占比 - json.put("singleRatio",singleRatio); + json.put("singleRatio", singleRatio); return AjaxResult.success(json); } - /** * 产品销售比例 */ @GetMapping("get-product-scale") - public AjaxResult saleProductScale(){ - // productService. + public AjaxResult saleProductScale() { + // productService. return AjaxResult.success(); } + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/vo/CuMemberMyMarketDetailVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/vo/CuMemberMyMarketDetailVO.java deleted file mode 100644 index 223b5133..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/vo/CuMemberMyMarketDetailVO.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hzs.sale.index.vo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; - -/** - * 我的市场一下详情VO - * - * @Description: - * @Author: ljc - * @Time: 2023/5/9 14:34 - * @Classname: CuMemberMyMarketVO - * @Package_name: com.hzs.member.base.vo - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberMyMarketDetailVO implements Serializable { - private static final long serialVersionUID = -2715842187394176784L; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 省 - */ - private Integer province; - /** - * 市 - */ - private Integer city; - - /** - * 县 - */ - private Integer county; - - /** - * 点亮名称 - */ - private String lightName; - - -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/vo/CuMemberMyMarketVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/vo/CuMemberMyMarketVO.java deleted file mode 100644 index 00db08ef..00000000 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/index/vo/CuMemberMyMarketVO.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.hzs.sale.index.vo; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.List; - -/** - * 我的市场VO - * - * @Description: - * @Author: ljc - * @Time: 2023/5/9 14:34 - * @Classname: CuMemberMyMarketVO - * @Package_name: com.hzs.member.base.vo - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CuMemberMyMarketVO implements Serializable { - private static final long serialVersionUID = -2715842187394176784L; - - /** - * 国家数 - */ - private Integer countryNum; - /** - * 地区数 - */ - private Integer regionNum; - - /** - * 我的国家数 - */ - private Integer myCountryNum; - /** - * 我的地区数 - */ - private Integer myRegionNum; - - /** - * 国家点亮名称 - */ - private String countryLightName; - - /** - * 市场详情 - */ - private List myMarketDetailVOList; - - -} diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java index 55921cd7..883f2fd6 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOthSaOrderController.java @@ -7,26 +7,19 @@ import com.hzs.common.core.constant.HttpStatus; import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.constant.msg.SaOrderMsgConstants; import com.hzs.common.core.enums.EOrderType; -import com.hzs.common.core.enums.ESpecialArea; import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.domain.member.ext.CuMemberAccountExt; import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.sale.order.SaOrder; -import com.hzs.common.domain.sale.wares.BdWares; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.sale.order.controller.ParentOrderController; import com.hzs.sale.order.param.OrderParam; import com.hzs.sale.order.param.OrderReturn; import com.hzs.sale.shopping.vo.ShoppingCartVO; -import com.hzs.sale.wares.service.IBdWaresService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; -import java.util.stream.Collectors; - /** * 其他订单（升级、复购）订单 */ @@ -35,9 +28,6 @@ import java.util.stream.Collectors; @Slf4j public class ApiOthSaOrderController extends ParentOrderController { - @Autowired - private IBdWaresService iBdWaresService; - /** * 提供确认订单的方法 * @@ -190,18 +180,4 @@ public class ApiOthSaOrderController extends ParentOrderController { return AjaxResult.error(cuMemberAccountExt.getErrorMsg()); } - /** - * 查询复购商品列表 - * - * @return - */ - @GetMapping("/list-maker-ware") - public AjaxResult listMakerWare() { - List bdWaresList = iBdWaresService.queryMakerIncomeList(ESpecialArea.REPURCHASE_AREA.getValue(), SecurityUtils.getPkCountry()); - if (CollectionUtil.isNotEmpty(bdWaresList)) { - return AjaxResult.success(bdWaresList.stream().map(BdWares::getWaresCode).collect(Collectors.toList())); - } - return AjaxResult.success(); - } - } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java index 101eef16..82e47fd0 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java @@ -7,8 +7,6 @@ import com.hzs.common.domain.sale.ext.SaOrderItemsExt; import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.sale.deliver.param.DeliverSecondParam; import com.hzs.sale.deliver.vo.DeliverSecondVO; -import com.hzs.sale.index.vo.CuMemberMyMarketDetailVO; -import com.hzs.sale.index.vo.CuMemberMyMarketVO; import com.hzs.sale.order.param.*; import com.hzs.sale.order.vo.*; import org.apache.ibatis.annotations.Param; @@ -268,25 +266,6 @@ public interface SaOrderMapper extends BaseMapper { */ List secondList(@Param("param") DeliverSecondParam param, @Param("pkCountry") Integer pkCountry); - - /** - * 会员首页我的市场 - * - * @param pkMember 用户ID - * @param pkCountry 国家ID - * @return - */ - CuMemberMyMarketVO selectMyMarket(@Param("pkMember") Long pkMember, @Param("pkCountry") Integer pkCountry); - - /** - * 会员首页我的市场 - * - * @param pkMember 用户ID - * @param pkCountry 国家ID - * @return - */ - List selectMyMarketDetail(@Param("pkMember") Long pkMember, @Param("pkCountry") Integer pkCountry); - /** * 查询当天已支付订单信息 **/ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java index 0840afdf..8c746058 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java @@ -11,7 +11,6 @@ import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.sale.order.SaOrderItems; import com.hzs.sale.deliver.param.DeliverSecondParam; import com.hzs.sale.deliver.vo.DeliverSecondVO; -import com.hzs.sale.index.vo.CuMemberMyMarketVO; import com.hzs.sale.order.param.*; import com.hzs.sale.order.vo.*; import com.hzs.system.config.dto.GradeDTO; @@ -592,16 +591,6 @@ public interface ISaOrderService extends IService { */ List secondList(DeliverSecondParam param, Integer pkCountry); - - /** - * 会员首页我的市场 - * - * @param pkMember 用户ID - * @param pkCountry 国家ID - * @return - */ - CuMemberMyMarketVO selectMyMarket(Long pkMember, Integer pkCountry); - /** * 查询当天已支付订单信息 **/ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 44dd5bf9..c4f56a16 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -52,8 +52,6 @@ import com.hzs.member.detail.ICuMemberServiceLogServiceApi; import com.hzs.sale.deliver.param.DeliverSecondParam; import com.hzs.sale.deliver.service.ISaDeliverItemsService; import com.hzs.sale.deliver.vo.DeliverSecondVO; -import com.hzs.sale.index.vo.CuMemberMyMarketDetailVO; -import com.hzs.sale.index.vo.CuMemberMyMarketVO; import com.hzs.sale.order.dto.OrderQueryChargeDTO; import com.hzs.sale.order.mapper.SaOrderMapper; import com.hzs.sale.order.param.*; @@ -2256,30 +2254,6 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.secondList(param, pkCountry); } - @Override - public CuMemberMyMarketVO selectMyMarket(Long pkMember, Integer pkCountry) { - //查询全国市场 - CuMemberMyMarketVO cuMemberMyMarketVO = baseMapper.selectMyMarket(null, pkCountry); - CountryDTO country = countryServiceApi.getCountry(pkCountry).getData(); - //查询市场分布 - List cuMemberMyMarketDetailVOList = baseMapper.selectMyMarketDetail(pkMember, pkCountry); - cuMemberMyMarketVO.setMyMarketDetailVOList(cuMemberMyMarketDetailVOList); - //查询我的市场 - if (CollectionUtil.isNotEmpty(cuMemberMyMarketDetailVOList)) { - List countryNmus = cuMemberMyMarketDetailVOList.stream().map(CuMemberMyMarketDetailVO::getPkCountry).distinct().collect(Collectors.toList()); - cuMemberMyMarketVO.setMyCountryNum(countryNmus.size()); - cuMemberMyMarketVO.setMyRegionNum(cuMemberMyMarketDetailVOList.size()); - } else { - cuMemberMyMarketVO.setMyCountryNum(1); - cuMemberMyMarketVO.setMyRegionNum(0); - } - //海外暂时点亮国家 - if (!pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { - cuMemberMyMarketVO.setMyMarketDetailVOList(Collections.singletonList(CuMemberMyMarketDetailVO.builder().lightName(country.getLightName()).build())); - } - return cuMemberMyMarketVO; - } - @Override public SaOrder queryOrderTotalAchieveByTime(Date startDate, Date endDate) { List orderTypeList = new ArrayList<>(); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresGradeMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresGradeMapper.java index 1d608af8..e7392ac6 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresGradeMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresGradeMapper.java @@ -9,9 +9,6 @@ import java.util.List; /** * 等级配置 Mapper 接口 - * - * @author hzs - * @since 2023-03-13 */ public interface BdWaresGradeMapper extends BaseMapper { 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 f4bcf286..bea42a48 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 @@ -149,12 +149,11 @@ public interface BdWaresMapper extends BaseMapper { WaresAuthorityVo getWaresAuthorityFirst(@Param("pkWares") Integer pkWares); /** - * 查询上架的发起人收益商品列表 + * 新商品列表 * - * @param specialArea 所属专区（可为空） - * @param pkCountry 所属国家 + * @param specialAreaList * @return */ - List queryMakerIncomeList(@Param("specialArea") Integer specialArea, @Param("pkCountry") Integer pkCountry); + List listWaresNew(@Param("specialAreaList") List specialAreaList); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresRangeMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresRangeMapper.java index 884456fd..1235fef0 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresRangeMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresRangeMapper.java @@ -8,9 +8,6 @@ import java.util.List; /** * 极差明细表 Mapper 接口 - * - * @author hzs - * @since 2022-09-09 */ public interface BdWaresRangeMapper extends BaseMapper { @@ -19,9 +16,6 @@ public interface BdWaresRangeMapper extends BaseMapper { * * @param pkRange 极差类型 * @param pkWaresList 商品 - * @return: List - * @Author: sui q - * @Date: 2022/9/27 10:02 */ List queryWaresRangeByCondition(@Param("pkRange") Integer pkRange, @Param("pkWaresList") List pkWaresList); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresGradeService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresGradeService.java index f909eb42..b5c6a6cc 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresGradeService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresGradeService.java @@ -8,18 +8,12 @@ import java.util.List; /** * 等级配置 服务类 - * - * @author hzs - * @since 2023-03-13 */ public interface IBdWaresGradeService extends IService { - /* - * @description: 查询会员权限 - * @author: sui q - * @date: 2023/9/5 19:49 - * @param: null null - **/ + /** + * 查询会员权限 + */ List queryWaresGradeAwards(List waresIdList); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresRangeService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresRangeService.java index 7670bfed..d7348146 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresRangeService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresRangeService.java @@ -8,9 +8,6 @@ import java.util.List; /** * 极差明细表 服务类 - * - * @author hzs - * @since 2022-09-09 */ public interface IBdWaresRangeService extends IService { @@ -19,9 +16,6 @@ public interface IBdWaresRangeService extends IService { * * @param cuMember 会员 * @param pkWareList 商品主键 - * @return: List - * @Author: sui q - * @Date: 2022/9/26 16:48 */ List queryWaresRangeByCondition(CuMember cuMember, List pkWareList); @@ -32,9 +26,6 @@ public interface IBdWaresRangeService extends IService { * @param rangeType 类型 * @param level 基本 * @param specsSkuList 最小库存单位 - * @return: List - * @Author: sui q - * @Date: 2022/9/26 15:33 */ List querySkuWaresRangeByCondition(Integer pkCountry, Integer rangeType, Integer level, List specsSkuList); 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 611a0e1b..b179d1a1 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 @@ -211,12 +211,11 @@ public interface IBdWaresService extends IService { void bottomUp(Integer waresId, LoginUser loginUser); /** - * 查询上架的发起人收益商品列表 + * 新商品列表 * - * @param specialArea 所属专区（可为空） - * @param pkCountry 所属国家 + * @param specialAreaList * @return */ - List queryMakerIncomeList(Integer specialArea, Integer pkCountry); + List listWares(List specialAreaList); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresGradeServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresGradeServiceImpl.java index a4bfa5a5..4f73840d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresGradeServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresGradeServiceImpl.java @@ -12,9 +12,6 @@ import java.util.List; /** * 等级配置 服务实现类 - * - * @author hzs - * @since 2023-03-13 */ @Service public class BdWaresGradeServiceImpl extends ServiceImpl implements IBdWaresGradeService { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresRangeServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresRangeServiceImpl.java index 92e807f1..a192da4f 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresRangeServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresRangeServiceImpl.java @@ -20,28 +20,25 @@ import java.util.List; /** * 极差明细表 服务实现类 - * - * @author hzs - * @since 2022-09-09 */ @Service public class BdWaresRangeServiceImpl extends ServiceImpl implements IBdWaresRangeService { @DubboReference - IRangeServiceApi rangeServiceApi; + IRangeServiceApi iRangeServiceApi; @DubboReference - IAwardsServiceApi awardsServiceApi; + IAwardsServiceApi iAwardsServiceApi; @Override public List queryWaresRangeByCondition(CuMember cuMember, List pkWareList) { int level = cuMember.getPkSettleGrade(); int rangeType = ERangeType.GRADE.getValue(); -// BdAwards bdAwards = awardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); +// BdAwards bdAwards = iAwardsServiceApi.getAwardsOne(cuMember.getPkAwards()).getData(); // if (bdAwards.getAwardsValue() > EAwards.MEMBER.getValue()) { // level = cuMember.getPkAwards(); // rangeType = ERangeType.AWARDS.getValue(); // } - RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); + RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(cuMember.getPkSettleCountry(), rangeType, level).getData(); if (rangeDTO == null) { return new ArrayList<>(); } @@ -50,21 +47,16 @@ public class BdWaresRangeServiceImpl extends ServiceImpl querySkuWaresRangeByCondition(Integer pkCountry, Integer rangeType, Integer level, List specsSkuList) { - RangeDTO rangeDTO = rangeServiceApi.queryRangeDtoByCondition(pkCountry, rangeType, level).getData(); + RangeDTO rangeDTO = iRangeServiceApi.queryRangeDtoByCondition(pkCountry, rangeType, level).getData(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(SystemFieldConstants.PK_RANGE, rangeDTO.getPkRange()); queryWrapper.in(SystemFieldConstants.PK_WARES_SPECS_SKU, specsSkuList); return baseMapper.selectList(queryWrapper); } - /** - * 以range 为主表查询商品极差信息 - * - * @param pkWares - * @return - */ @Override public List queryWaresList(Long pkWares, Integer pkCountry) { return baseMapper.queryWaresList(pkWares, 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 5924a4ab..f70a830b 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 @@ -1188,7 +1188,6 @@ public class BdWaresServiceImpl extends ServiceImpl impl if (waresIdSet.contains(waresExt.getPkId())) { String gradeKey = waresExt.getPkId() + "_" + ERangeType.GRADE.getValue() + "_" + loginMember.getPkSettleGrade(); String awardsKey = waresExt.getPkId() + "_" + ERangeType.AWARDS.getValue() + "_" + loginMember.getPkAwards(); - // 添加商品注册权限配置 String authorityKey = waresExt.getPkId() + "_" + ERangeType.AUTHORITY.getValue() + "_" + loginMember.getRegisterAuthority(); if (!authWaresList.contains(gradeKey) && !authWaresList.contains(awardsKey) && !authWaresList.contains(authorityKey)) { continue; @@ -1585,6 +1584,8 @@ public class BdWaresServiceImpl extends ServiceImpl impl if (pkWaresList.size() > 0) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(BdWaresAuthority::getPkWares, pkWaresList); + // 只查询不为全部的，全部的话默认都是可见的 + queryWrapper.ne(BdWaresAuthority::getAuthorityType, EWaresPermissionType.AUTH_ORITY_TYPE.getValue()); List waresAuthorityList = iBdWaresAuthorityService.list(queryWrapper); map = waresAuthorityList.stream().collect(Collectors.groupingBy(BdWaresAuthority::getPkWares, Collectors.toList())); } @@ -1616,8 +1617,10 @@ public class BdWaresServiceImpl extends ServiceImpl impl } @Override - public List queryMakerIncomeList(Integer specialArea, Integer pkCountry) { - return baseMapper.queryMakerIncomeList(specialArea, pkCountry); + public List listWares(List specialAreaList) { + // 商品列表（复购、乐学复购、重消） + return baseMapper.listWaresNew(specialAreaList); + } } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresCoverInfoVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresCoverInfoVo.java index 9c1a1e72..d092b006 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresCoverInfoVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresCoverInfoVo.java @@ -4,14 +4,6 @@ import lombok.Data; import java.util.List; -/** - * @BelongsProject: hzs_cloud - * @BelongsPackage: com.hzs.sale.wares.vo - * @Author: yh - * @CreateTime: 2023-05-15 11:18 - * @Description: - * @Version: 1.0 - */ @Data public class WaresCoverInfoVo { @@ -24,4 +16,5 @@ public class WaresCoverInfoVo { * 商品图列表 */ private List coverList; + } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java index 81dd9dad..fdb939c6 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/vo/WaresVo.java @@ -176,10 +176,10 @@ public class WaresVo { */ @Excel(name = "上架状态", readConverterExp = "0=上架,1=下架") private Integer isPutOn; + /** * 预售状态 */ - private Integer preSaleStatus; /** @@ -264,11 +264,13 @@ public class WaresVo { /** * 会员价 */ + @BigDecimalFormat private BigDecimal vipPrice; /** * 零售价 */ + @BigDecimalFormat private BigDecimal retailPrice; /** diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml index b99bb493..89540748 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml @@ -1464,57 +1464,6 @@ order by so.creation_time desc - - - - - - + select bd.*, bwe.is_sale, bwe.pre_sale_status + from bd_wares bd + left join bd_wares_extend bwe + on bwe.pk_wares = bd.pk_id + where bd.del_flag = 0 + and bd.wares_status = 5 + and bwe.is_put_on = 0 + + and bd.special_area in + + #{item} + + order by bd.sort desc, bd.wares_price diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresRangeMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresRangeMapper.xml index 91e75ed7..82b8a5a7 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresRangeMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresRangeMapper.xml @@ -22,7 +22,8 @@ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWaresPermissionType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWaresPermissionType.java index 26369798..717cac67 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWaresPermissionType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EWaresPermissionType.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 商品权限类型枚举 - * - * @author: sui q - * @time: 2022/8/27 10:26 - * @description: 商品权限类型 - * @classname: EWaresPermissionType - * @package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/PageUtils.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/PageUtils.java index c0b34b76..a0c4bb29 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/PageUtils.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/PageUtils.java @@ -7,8 +7,6 @@ import com.hzs.common.core.web.page.TableSupport; /** * 分页工具类 - * - * @author hzs */ public class PageUtils extends PageHelper { diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/ext/WaresGradeAwards.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/ext/WaresGradeAwards.java index 0018b30b..796c4692 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/ext/WaresGradeAwards.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/ext/WaresGradeAwards.java @@ -1,17 +1,11 @@ package com.hzs.common.domain.sale.wares.ext; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.io.Serializable; /** - * @description: 商品权限控制 - * @author: sui q - * @time: 2023/9/5 19:47 - * @classname: WaresGradeAwards - * @package_name: com.hzs.common.domain.sale.wares.ext - * version 1.0.0 + * 商品权限控制 */ @Data public class WaresGradeAwards implements Serializable {