bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hzs.common.core.constant.*;
 import com.hzs.common.core.domain.R;
 import com.hzs.common.core.enums.*;
-import com.hzs.common.core.exception.ServiceException;
 import com.hzs.common.core.utils.*;
 import com.hzs.common.domain.member.achieve.CuMemberAchieve;
 import com.hzs.common.domain.member.achieve.CuMemberSettlePeriod;
@@ -390,9 +389,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
 
         // 当前会员
         List<CuMemberExt> cuMemberExtList = iCuMemberService.queryMemberByCondition(CuMember.builder().pkId(pkMember).build());
-        if (CollectionUtil.isNotEmpty(cuMemberExtList)) {
-            throw new ServiceException("查询会员信息失败，请重新登录");
-        }
         CuMemberExt cuMemberExt = cuMemberExtList.get(0);
         //根据国家获取奖衔配置信息
         List<BdAwards> awardsList = iAwardsServiceApi.queryAwards(pkCountry).getData();

bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java

@@ -2,11 +2,13 @@ package com.hzs.member.base.controller.api;
 
 import cn.hutool.core.codec.Base64Decoder;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.hzs.common.core.annotation.RepeatSubmitSimple;
 import com.hzs.common.core.config.BdConfig;
 import com.hzs.common.core.constant.CountryConstants;
 import com.hzs.common.core.constant.EnumsPrefixConstants;
+import com.hzs.common.core.constant.SysConstants;
 import com.hzs.common.core.constant.msg.ConfigMsgConstants;
 import com.hzs.common.core.constant.msg.MemberMsgConstants;
 import com.hzs.common.core.domain.FileResult;
@@ -23,13 +25,17 @@ import com.hzs.common.core.web.page.TableDataInfo;
 import com.hzs.common.domain.member.base.CuMember;
 import com.hzs.common.domain.member.detail.CuMemberChangeLog;
 import com.hzs.common.domain.member.ext.CuMemberExt;
+import com.hzs.common.domain.member.ext.CuMemberRegionExt;
+import com.hzs.common.domain.system.base.BdArea;
 import com.hzs.common.domain.system.config.BdAgreementRenewalWhite;
 import com.hzs.common.domain.system.config.BdAwards;
 import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.common.service.ITransactionCommonService;
 import com.hzs.common.util.TransactionUtils;
+import com.hzs.member.achieve.service.ICuMemberAchieveService;
 import com.hzs.member.base.param.MemberDataParam;
 import com.hzs.member.base.param.MemberRegionParam;
+import com.hzs.member.base.service.ICuMemberRegionService;
 import com.hzs.member.base.service.ICuMemberService;
 import com.hzs.member.base.service.IMemberInfoService;
 import com.hzs.member.base.vo.*;
@@ -75,6 +81,10 @@ public class ApiMemberController extends BaseController {
     private ICuMemberChangeLogService iCuMemberChangeLogService;
     @Autowired
     private IApiAliSmsService iApiAliSmsService;
+    @Autowired
+    private ICuMemberRegionService iCuMemberRegionService;
+    @Autowired
+    private ICuMemberAchieveService iCuMemberRetailAchieveService;
 
     @DubboReference
     IGradeServiceApi iGradeServiceApi;
@@ -707,9 +717,10 @@ public class ApiMemberController extends BaseController {
      */
     @GetMapping("/agreement_expire")
     public AjaxResult agreementExpire() {
-        // 中国会员才进行校验
+        if (CountryConstants.CHINA_COUNTRY.equals(SecurityUtils.getPkCountry())) {
-        CuMember cuMember = iCuMemberService.getMemberById(SecurityUtils.getUserId());
+            // 中国会员才进行校验
-        if (null != cuMember) {
+            CuMember cuMember = iCuMemberService.getMemberById(SecurityUtils.getUserId());
+
             // 校验会员是否添加到白名单
             BdAgreementRenewalWhite agreementRenewalWhite = null;
             R<BdAgreementRenewalWhite> whiteR = iAgreementRenewalWhiteServiceApi.getInfo(SecurityUtils.getUserId(), EAgreementWhiteType.RENEW_NOT_REAL.getValue());

bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderHandle.java

@@ -222,8 +222,7 @@ public class SaOrderHandle {
             resultPostage = resultPostage.add(saOrderItems.getPrice().multiply(new BigDecimal(saOrderItems.getQuantity())));
 
             // 免邮的话不需要计算邮费
-            if (null == waresDetailExt.getIsFreeMail()
+            if (EYesNo.YES.getIntValue() == waresDetailExt.getIsFreeMail()) {
-                    || EYesNo.YES.getIntValue() == waresDetailExt.getIsFreeMail()) {
                 continue;
             }
             if (EDelivery.FAST_MAIL.getValue() == orderParam.getDeliveryWay()) {

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java

@@ -486,29 +486,28 @@ public class ApiBdWaresController extends BaseController {
      */
     @GetMapping("/get-app-index")
     public AjaxResult getAppIndex() {
-//        Integer pkCountry = SecurityUtils.getPkCountry();
+        Integer pkCountry = SecurityUtils.getPkCountry();
-//        Long userId = SecurityUtils.getUserId();
+        Long userId = SecurityUtils.getUserId();
-//        String memberCode = SecurityUtils.getMemberCode();
+        String memberCode = SecurityUtils.getMemberCode();
-//        // 校验产品团队信息（查询所有推荐商品）
+        // 校验产品团队信息（查询所有推荐商品）
-//        List<BdWaresExt> bdWaresList = iBdWaresService.queryByRecommendList(null, EYesNo.YES.getIntValue(), pkCountry, new HashMap<>());
+        List<BdWaresExt> bdWaresList = iBdWaresService.queryByRecommendList(null, EYesNo.YES.getIntValue(), pkCountry, new HashMap<>());
-//        Map<Integer, Boolean> waresShowMap = new HashMap<>();
+        Map<Integer, Boolean> waresShowMap = new HashMap<>();
-//        if (bdWaresList.size() > 0) {
+        if (bdWaresList.size() > 0) {
-//            // 检验商品团队信息
+            // 检验商品团队信息
-//            List<Integer> waresIdList = bdWaresList.stream().map(BdWares::getPkId).collect(Collectors.toList());
+            List<Integer> waresIdList = bdWaresList.stream().map(BdWares::getPkId).collect(Collectors.toList());
-//            Map<Integer, List<BdWaresAuthority>> waresAuthorityMap = iBdWaresService.getWaresAuthority(waresIdList);
+            Map<Integer, List<BdWaresAuthority>> waresAuthorityMap = iBdWaresService.getWaresAuthority(waresIdList);
-//            List<ShowWaresDTO> showWaresList = bdWaresList.stream().map(we -> getShowWares(we.getPkId(), userId, memberCode, waresAuthorityMap)).collect(Collectors.toList());
+            List<ShowWaresDTO> showWaresList = bdWaresList.stream().map(we -> getShowWares(we.getPkId(), userId, memberCode, waresAuthorityMap)).collect(Collectors.toList());
-//            R<Map<Integer, Boolean>> waresShowMapDto = iMemberServiceApi.checkIsShowWares(showWaresList);
+            R<Map<Integer, Boolean>> waresShowMapDto = iMemberServiceApi.checkIsShowWares(showWaresList);
-//            waresShowMap = waresShowMapDto.getData();
+            waresShowMap = waresShowMapDto.getData();
-//        }
+        }
-//        // 查询app端首页商品展示信息
-//        RecommendWaresInfoVo recommendWaresInfoVo = iBdWaresService.queryRecommendInfo(pkCountry, memberCode, userId, waresShowMap);
-//        if (recommendWaresInfoVo.getWaresVoList() != null) {
-//            List<WaresVo> waresList = new ArrayList<>(recommendWaresInfoVo.getWaresVoList());
-//            recommendWaresInfoVo.setWaresVoList(waresList);
-//        }
-        RecommendWaresInfoVo recommendWaresInfoVo = new RecommendWaresInfoVo();
         // 查询全部的banner (登录后banner)
         R<List<AdvertBannerDTO>> advertBannerList = advertBannerServiceApi.findAll(SecurityUtils.getUserId());
+        // 查询app端首页商品展示信息
+        RecommendWaresInfoVo recommendWaresInfoVo = iBdWaresService.queryRecommendInfo(pkCountry, memberCode, userId, waresShowMap);
+        if (recommendWaresInfoVo.getWaresVoList() != null) {
+            List<WaresVo> waresList = new ArrayList<>(recommendWaresInfoVo.getWaresVoList());
+            recommendWaresInfoVo.setWaresVoList(waresList);
+        }
         recommendWaresInfoVo.setAdvertBannerList(advertBannerList.getData());
         return AjaxResult.success(recommendWaresInfoVo);
     }