Merge remote-tracking branch 'origin/dev' into dev

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java

@@ -49,6 +49,7 @@ import com.hzs.system.config.IAreaCurrencyServiceApi;
 import com.hzs.system.config.IAwardsServiceApi;
 import com.hzs.system.config.dto.AreaCurrencyDTO;
 import com.hzs.third.pay.ITOnlinePaymentServiceApi;
+import com.hzs.third.sms.ISmsServiceApi;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +77,8 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
     ICurrencyServiceApi iCurrencyServiceApi;
     @DubboReference
     ISaOrderServiceApi iSaOrderServiceApi;
+    @DubboReference
+    ISmsServiceApi iSmsServiceApi;
 
     @DubboReference
     ITOnlinePaymentServiceApi itOnlinePaymentServiceApi;
@@ -1232,6 +1235,14 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
         saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, 0);
 
         this.handleRetailMemberAccount(saOrder, cuMemberAccountExt);
+
+        try {
+            // 发送会员注册成功短信
+            iSmsServiceApi.sendMemberRegister(cuMember.getPhone(), EAliSmsTemplate.MEMBER_REGISTER,
+                    cuMember.getMemberCode(), cuMember.getLoginPassword(), cuMember.getPayPassword());
+        } catch (Exception e) {
+            log.error("发送注册短信失败");
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)

bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.hzs.common.core.annotation.RepeatSubmit;
 import com.hzs.common.core.config.BdConfig;
 import com.hzs.common.core.constant.CacheConstants;
+import com.hzs.common.core.constant.CountryConstants;
 import com.hzs.common.core.constant.RetailConstants;
 import com.hzs.common.core.domain.R;
 import com.hzs.common.core.enums.EGrade;
@@ -281,11 +282,10 @@ public class ApiRetailOrderController {
             }
             if (ObjectUtil.isEmpty(buyMember)) {
                 buyMember = new CuMember();
-                List<BdGrade> gradeList = iGradeServiceApi.getRetailGradeList().getData();
-//                Map<String, BdAwards> awardsMap = iAwardsServiceApi.getAwards().getData();
-                buyMember.setPkSettleGrade(gradeList.get(0).getPkId());
-                buyMember.setPkSettleCountry(1);
-                buyMember.setPkAwards(1);
+                GradeDTO gradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.MEMBER.getValue(), CountryConstants.CHINA_COUNTRY).getData();
+                buyMember.setPkSettleGrade(gradeDTO.getPkId());
+                buyMember.setPkAwards(gradeDTO.getPkAwards());
+                buyMember.setPkSettleCountry(CountryConstants.CHINA_COUNTRY);
             }
             orderParam.setOrderItemsParams(orderItemsParams);
             iRetailOrderService.createSaOrderItems(orderParam, null, buyMember, null, null);

bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderPostageServiceImpl.java

@@ -61,7 +61,7 @@ public class RetailOrderPostageServiceImpl implements IRetailOrderPostageService
     public String calculatePostage(BigDecimal freePostage, Map<Integer, List<SaOrderItems>> postageMap, RetailOrderParam orderParam) {
         // 处理邮费
         if (ESpecialArea.RETAIL_REGISTER.getValue() == orderParam.getSpecialArea()) {
-            // 会员专区（注册、升级）免邮费
+            // 精品专区免邮费
             orderParam.setPostage(BigDecimal.ZERO);
         } else {
             // 其它专区计算邮费

bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java

@@ -40,7 +40,6 @@ import com.hzs.sale.order.param.OrderItemsParam;
 import com.hzs.sale.order.param.WaresNumberParam;
 import com.hzs.sale.order.service.*;
 import com.hzs.sale.order.service.impl.SaOrderHandle;
-import com.hzs.sale.order.service.impl.SaOrderServiceImpl;
 import com.hzs.sale.product.service.IBdProductService;
 import com.hzs.sale.wares.service.IBdWaresDetailService;
 import com.hzs.sale.wares.service.IBdWaresExtendService;
@@ -50,7 +49,6 @@ import com.hzs.system.base.dto.CurrencyDTO;
 import com.hzs.system.config.IAwardsServiceApi;
 import com.hzs.system.config.IGradeServiceApi;
 import com.hzs.system.config.dto.GradeDTO;
-import com.hzs.third.sms.ISmsServiceApi;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -107,8 +105,6 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
     IMemberServiceApi iMemberServiceApi;
     @DubboReference
     IMemberAccountServiceApi iMemberAccountServiceApi;
-    @DubboReference
-    ISmsServiceApi iSmsServiceApi;
 
     @Override
     public String confirmRegOrder(RetailOrderRegisterParam registerParam, List<BdGrade> gradeList) {
@@ -581,13 +577,6 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
             throw new RuntimeException("会员注册失败");
         }
 
-        try {
-            // 发送会员注册成功短信
-            iSmsServiceApi.sendMemberRegister(newMember.getPhone(), EAliSmsTemplate.MEMBER_REGISTER,
-                    newMember.getMemberCode(), newMember.getLoginPassword(), newMember.getPayPassword());
-        } catch (Exception e) {
-            log.error("发送注册短信失败");
-        }
         this.pushOrderMq(saOrderExt);
         return null;
     }

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

@@ -9,28 +9,22 @@ import com.hzs.common.core.exception.ServiceException;
 import com.hzs.common.core.service.RedisService;
 import com.hzs.common.core.utils.CommonUtil;
 import com.hzs.common.core.utils.ComputeUtil;
-import com.hzs.common.core.utils.DateUtils;
 import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.core.utils.reflect.ReflectUtils;
 import com.hzs.common.domain.member.base.CuMember;
 import com.hzs.common.domain.member.ext.CuMemberAccountExt;
-import com.hzs.common.domain.member.ext.CuMemberTeamExt;
 import com.hzs.common.domain.sale.ext.BdPostageFailAreaExt;
 import com.hzs.common.domain.sale.ext.BdWaresDetailExt;
 import com.hzs.common.domain.sale.ext.SaOrderExt;
-import com.hzs.common.domain.sale.order.SaOrder;
 import com.hzs.common.domain.sale.order.SaOrderItems;
 import com.hzs.common.domain.sale.postage.BdPostage;
 import com.hzs.common.domain.sale.postage.BdPostageArea;
 import com.hzs.common.domain.sale.postage.BdPostageDetail;
 import com.hzs.common.domain.sale.product.BdProduct;
 import com.hzs.common.domain.sale.wares.BdWaresRange;
-import com.hzs.common.domain.system.base.BdStorehouse;
 import com.hzs.common.domain.system.config.BdAreaFreePostage;
 import com.hzs.common.domain.system.config.BdAwards;
-import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.common.util.TransactionUtils;
-import com.hzs.member.base.IMemberTeamServiceApi;
 import com.hzs.sale.order.param.OrderParam;
 import com.hzs.sale.order.vo.SaOrderVO;
 import com.hzs.sale.postage.service.IBdPostageAreaService;
@@ -46,9 +40,7 @@ import com.hzs.system.base.ISystemConfigServiceApi;
 import com.hzs.system.base.dto.CurrencyDTO;
 import com.hzs.system.config.IAreaFreePostageServiceApi;
 import com.hzs.system.config.IAwardsServiceApi;
-import com.hzs.system.config.IGradeServiceApi;
 import com.hzs.system.config.dto.AreaCurrencyDTO;
-import com.hzs.system.config.dto.GradeDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -581,6 +573,7 @@ public class SaOrderHandle {
                 .pkSupplier(waresDetailExt.getPkSupplier())
                 .skuCode(CommonUtil.createSkuCode(waresDetailExt.getProductCode(), waresDetailExt.getSpecsNameId()))
                 .wareCode(waresDetailExt.getWaresCode())
+                .waresBoxNum(BigDecimal.ZERO)
                 .build();
         if (saOrderItems.getIsGift() != null && EYesNo.YES.getIntValue() == saOrderItems.getIsGift()) {
             // 赠品不计算金额、业绩等