angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:96887828479f00a97007a2801f01e507c4441419
Branches Tags
angelo:master
angelo:online
angelo:test
angelo:dev
..
compare: angelo:4549fedc13619a709b4fc3326112f913786b2485
Branches Tags
angelo:online
angelo:test
angelo:dev
angelo:master

3 Commits
9688782847 ... 4549fedc13

Author SHA1 Message Date
cabbage 4549fedc13 ## 去掉盒数等处理； 2025-10-29 10:08:34 +08:00
cabbage a67b880a11 ## 分享注册计算邮费补全用户信息调整； 2025-10-29 10:08:33 +08:00
cabbage 857ddb5956 ## 注册成功短信改为member服务调用发送； 2025-10-29 10:08:20 +08:00
6 changed files with 21 additions and 38 deletions
Show Stats Expand all files Collapse all files

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

@ -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)

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

@ -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);

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

@ -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 {
// 其它专区计算邮费

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

@ -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) {
@ -116,8 +112,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
CuMember newMember = new CuMember();
newMember.setMemberName(registerParam.getMemberName());
newMember.setPhone(registerParam.getPhone());
newMember.setPkSettleCountry(CountryConstants.CHINA_COUNTRY);
// newMember.setPkSettleGrade(gradeList.get(0).getPkId());
newMember.setPkSettleCountry(1);
// newMember.setPkAwards(gradeList.get(0).getPkAwards());
// 封装订单信息
SaOrderExt saOrderExt = this.createSaOrder(registerParam, gradeList, newMember);
@ -273,14 +269,10 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
// 邮费模板map（key：邮费模板ID，value：邮费订单明细）
Map<Integer, List<SaOrderItems>> postageMap = new HashMap<>(ComputeUtil.mapInitCapacity(waresDetailExtList.size()));
// 当前盒数
BigDecimal boxNum = BigDecimal.ZERO;
// 遍历生成订单明细数据
for (BdWaresDetailExt waresDetailExt : waresDetailExtList) {
// 订单明细
SaOrderItems orderItems = saOrderHandle.getSaOrderItems(cuMember, saOrderExt, currency, orderItemsList, waresDetailExt);
orderItems.setWaresBoxNum(null != waresDetailExt.getBoxNum() ? waresDetailExt.getBoxNum() : BigDecimal.ZERO);
// 不是赠品，需要累积包邮邮费
if (EYesNo.NO.getIntValue() == waresDetailExt.getIsGift()) {
@ -301,8 +293,7 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
if (null != saOrderExt) {
// 订单邮费
saOrderExt.setPostage(orderParam.getPostage());
// 订单指定商品盒数
saOrderExt.setBoxNum(boxNum);
saOrderExt.setBoxNum(BigDecimal.ZERO);
if (isCopy41List) {
saOrderExt.setOrderType(ESpecialArea.RETAIL_UPGRADE.getValue());
}
@ -581,13 +572,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;
}

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

@ -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()) {
// 赠品不计算金额、业绩等

7
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresSpecsSkuExt.java
View File

@ -8,11 +8,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* @Description: sku扩展表
* @Author: sui q
* @Time: 2022/9/19 11:06
* @Classname: BdWaresSpecsSkuExt
* @PackageName: com.hzs.common.domain.sale.ext
* sku扩展表
*/
@EqualsAndHashCode(callSuper = true)
@Data
@ -31,7 +27,6 @@ public class BdWaresSpecsSkuExt extends BdWaresSpecsSku {
private BigDecimal waresAchieve;
/**
* 商品编号
*/