caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper 2021-12-01 15:21:57 +08:00
commit 385a4ae618
13 changed files with 184 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DB/version4.2.3to4.2.4.sql Normal file
View File

@ -0,0 +1,2 @@
/** 新增已退货数量 **/
ALTER TABLE li_order_item ADD return_goods_number int DEFAULT 0 COMMENT '退货数量 ';

1
consumer/src/main/java/cn/lili/listener/AfterSaleMessageListener.java
View File

@ -17,7 +17,6 @@ import java.util.List;
* 售后通知
*
* @author paulG
* @since 2020/12/9
*/
@Slf4j
@Component

1
framework/src/main/java/cn/lili/common/enums/ResultCode.java
View File

@ -209,6 +209,7 @@ public enum ResultCode {
AFTER_STATUS_ERROR(33006, "售后状态错误，请刷新页面"),
RETURN_MONEY_OFFLINE_BANK_ERROR(33007, "当账号类型为银行转账时，银行信息不能为空"),
AFTER_SALES_PRICE_ERROR(33004, "申请退款金额错误"),
AFTER_GOODS_NUMBER_ERROR(33008, "申请售后商品数量错误"),
/**
* 投诉

5
framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleApplyVO.java
View File

@ -54,5 +54,10 @@ public class AfterSaleApplyVO {
@ApiModelProperty(value = "是否支持退款")
private Boolean returnMoney;
@ApiModelProperty(value = "会员ID")
private String memberId;
}

141
framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
View File

@ -17,6 +17,7 @@ import cn.lili.modules.order.aftersale.aop.AfterSaleLogPoint;
import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderItem;
import cn.lili.modules.order.order.entity.enums.*;
import cn.lili.modules.order.aftersale.entity.dto.AfterSaleDTO;
import cn.lili.modules.order.order.entity.enums.OrderItemAfterSaleStatusEnum;
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
@ -57,9 +58,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* 售后业务层实现
@ -165,6 +169,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
afterSaleApplyVO.setImage(orderItem.getImage());
afterSaleApplyVO.setGoodsPrice(orderItem.getGoodsPrice());
afterSaleApplyVO.setSkuId(orderItem.getSkuId());
afterSaleApplyVO.setMemberId(order.getMemberId());
return afterSaleApplyVO;
}
@ -222,8 +227,9 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
afterSale.setAuditRemark(remark);
//根据售后编号修改售后单
updateAfterSale(afterSaleSn, afterSale);
this.updateAfterSale(afterSaleSn, afterSale);
//根据售后状态。修改OrderItem订单中正在售后商品数量及状态
this.updateOrderItemAfterSaleStatus(afterSale);
//发送售后消息
this.sendAfterSaleMessage(afterSale);
@ -304,7 +310,8 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
//根据售后编号修改售后单
this.updateAfterSale(afterSaleSn, afterSale);
//根据售后状态。修改OrderItem订单中正在售后商品数量及状态
this.updateOrderItemAfterSaleStatus(afterSale);
//发送售后消息
this.sendAfterSaleMessage(afterSale);
return afterSale;
@ -353,6 +360,8 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
//根据售后编号修改售后单
this.updateAfterSale(afterSaleSn, afterSale);
//根据售后状态。修改OrderItem订单中正在售后商品数量及状态
this.updateOrderItemAfterSaleStatus(afterSale);
return afterSale;
}
throw new ServiceException(ResultCode.AFTER_SALES_CANCEL_ERROR);
@ -441,15 +450,54 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
double utilPrice = CurrencyUtil.div(orderItem.getPriceDetailDTO().getFlowPrice(), orderItem.getNum());
afterSale.setApplyRefundPrice(CurrencyUtil.mul(afterSale.getNum(), utilPrice));
}
//添加售后
this.save(afterSale);
//发送售后消息
this.sendAfterSaleMessage(afterSale);
//修改订单的售后状态
orderItemService.updateAfterSaleStatus(orderItem.getSn(), OrderItemAfterSaleStatusEnum.ALREADY_APPLIED);
//根据售后状态。修改OrderItem订单中正在售后商品数量及状态
this.updateOrderItemAfterSaleStatus(afterSale);
return afterSale;
}
/**
* 修改OrderItem订单中正在售后的商品数量及OrderItem订单状态
*
* @author ftyy
*/
private void updateOrderItemAfterSaleStatus(AfterSale afterSale) {
//根据商品skuId及订单sn获取子订单
OrderItem orderItem = orderItemService.getOne(new LambdaQueryWrapper<OrderItem>()
.eq(OrderItem::getOrderSn, afterSale.getOrderSn())
.eq(OrderItem::getSkuId, afterSale.getSkuId()));
AfterSaleStatusEnum afterSaleStatusEnum = AfterSaleStatusEnum.valueOf(afterSale.getServiceStatus());
switch (afterSaleStatusEnum){
//判断当前售后的状态---申请中
case APPLY:{
orderItem.setReturnGoodsNumber(orderItem.getReturnGoodsNumber() + afterSale.getNum());
break;
}
//判断当前售后的状态---已拒绝,买家取消售后,卖家终止售后
case REFUSE:
case BUYER_CANCEL:
case SELLER_TERMINATION: {
orderItem.setReturnGoodsNumber(orderItem.getReturnGoodsNumber() - afterSale.getNum());
break;
}
default:
break;
}
//修改orderItem订单
this.updateOrderItem(orderItem);
}
/**
* 检查当前订单状态是否为可申请当前售后类型的状态
*
@ -465,11 +513,17 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
//获取订单货物判断是否可申请售后
OrderItem orderItem = orderItemService.getBySn(afterSaleDTO.getOrderItemSn());
//未申请售后订单货物才能进行申请
if (!orderItem.getAfterSaleStatus().equals(OrderItemAfterSaleStatusEnum.NOT_APPLIED.name())) {
//未申请售后或部分售后订单货物才能进行申请
if (!orderItem.getAfterSaleStatus().equals(OrderItemAfterSaleStatusEnum.NOT_APPLIED.name()) && !orderItem.getAfterSaleStatus().equals(OrderItemAfterSaleStatusEnum.PART_AFTER_SALE.name())) {
throw new ServiceException(ResultCode.AFTER_SALES_BAN);
}
//申请商品数量不能超过商品总数量-售后商品数量
if (afterSaleDTO.getNum() > (orderItem.getNum() - orderItem.getReturnGoodsNumber())) {
throw new ServiceException(ResultCode.AFTER_GOODS_NUMBER_ERROR);
}
//获取售后类型
Order order = orderService.getBySn(orderItem.getOrderSn());
AfterSaleTypeEnum afterSaleTypeEnum = AfterSaleTypeEnum.valueOf(afterSaleDTO.getServiceType());
@ -531,6 +585,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
* @param afterSale 售后单
*/
private void updateAfterSale(String afterSaleSn, AfterSale afterSale) {
//修改售后单状态
LambdaUpdateWrapper<AfterSale> queryWrapper = Wrappers.lambdaUpdate();
queryWrapper.eq(AfterSale::getSn, afterSaleSn);
this.update(afterSale, queryWrapper);
@ -547,4 +602,76 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
//发送订单变更mq消息
rocketMQTemplate.asyncSend(destination, JSONUtil.toJsonStr(afterSale), RocketmqSendCallbackBuilder.commonCallback());
}
/**
* 功能描述: 获取售后商品数量及已完成售后商品数量修改orderItem订单
*
* @param orderItem,afterSaleList
* @author ftyy
**/
private void updateOrderItemGoodsNumber(OrderItem orderItem, List<AfterSale> afterSaleList) {
//根据售后状态获取不是已结束的售后记录
List<AfterSale> implementList = afterSaleList.stream()
.filter(afterSale -> afterSale.getServiceStatus().equals(AfterSaleStatusEnum.APPLY.name())
|| afterSale.getServiceStatus().equals(AfterSaleStatusEnum.PASS.name())
|| afterSale.getServiceStatus().equals(AfterSaleStatusEnum.BUYER_RETURN.name())
|| afterSale.getServiceStatus().equals(AfterSaleStatusEnum.SELLER_CONFIRM.name())
|| afterSale.getServiceStatus().equals(AfterSaleStatusEnum.WAIT_REFUND.name())
|| afterSale.getServiceStatus().equals(AfterSaleStatusEnum.COMPLETE.name()))
.collect(Collectors.toList());
if (!implementList.isEmpty()) {
//遍历售后记录获取售后商品数量
implementList.forEach(a -> orderItem.setReturnGoodsNumber(orderItem.getReturnGoodsNumber() + a.getNum()));
}
//获取已完成售后订单数量
List<AfterSale> completeList = afterSaleList.stream()
.filter(afterSale -> afterSale.getServiceStatus().equals(AfterSaleStatusEnum.COMPLETE.name()))
.collect(Collectors.toList());
if (!completeList.isEmpty()) {
//遍历售后记录获取已完成售后商品数量
completeList.forEach(a -> orderItem.setReturnGoodsNumber(orderItem.getReturnGoodsNumber() + a.getNum()));
}
}
/**
* 功能描述: 修改orderItem订单
*
* @param orderItem
* @return void
* @author ftyy
**/
private void updateOrderItem(OrderItem orderItem) {
//订单状态不能为新订单,已失效订单或未申请订单才可以去修改订单信息
OrderItemAfterSaleStatusEnum afterSaleTypeEnum = OrderItemAfterSaleStatusEnum.valueOf(orderItem.getAfterSaleStatus());
switch (afterSaleTypeEnum){
//售后状态为：未申请 部分售后 已申请
case NOT_APPLIED:
case PART_AFTER_SALE:
case ALREADY_APPLIED:{
//通过正在售后商品总数修改订单售后状态
if (orderItem.getReturnGoodsNumber().equals(orderItem.getNum())) {
//修改订单的售后状态--已申请
orderItem.setAfterSaleStatus(OrderItemAfterSaleStatusEnum.ALREADY_APPLIED.name());
} else if(orderItem.getReturnGoodsNumber().equals(0)){
//修改订单的售后状态--未申请
orderItem.setAfterSaleStatus(OrderItemAfterSaleStatusEnum.NOT_APPLIED.name());
}else{
//修改订单的售后状态--部分售后
orderItem.setAfterSaleStatus(OrderItemAfterSaleStatusEnum.PART_AFTER_SALE.name());
}
break;
}
default:
break;
}
orderItemService.update(new LambdaUpdateWrapper<OrderItem>()
.eq(OrderItem::getSn, orderItem.getSn())
.set(OrderItem::getAfterSaleStatus, orderItem.getAfterSaleStatus())
.set(OrderItem::getReturnGoodsNumber,orderItem.getReturnGoodsNumber()));
}
}

2
framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java
View File

@ -97,7 +97,7 @@ public class TradeBuilder {
renderCartBySteps(tradeDTO, RenderStepStatement.tradeRender);
}
//添加order订单及order_item子订单并返回
return tradeService.createTrade(tradeDTO);
}

4
framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java
View File

@ -112,6 +112,10 @@ public class OrderItem extends BaseEntity {
@ApiModelProperty(value = "交易投诉id")
private String complainId;
@ApiModelProperty(value = "退货商品数量")
private Integer returnGoodsNumber;
public OrderItem(CartSkuVO cartSkuVO, CartVO cartVO, TradeDTO tradeDTO) {
String oldId = this.getId();
BeanUtil.copyProperties(cartSkuVO.getGoodsSku(), this);

4
framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderItemAfterSaleStatusEnum.java
View File

@ -14,7 +14,9 @@ public enum OrderItemAfterSaleStatusEnum {
NEW("新订单，不能申请售后"),
NOT_APPLIED("未申请"),
ALREADY_APPLIED("已申请"),
EXPIRED("已失效不允许申请售后");
EXPIRED("已失效不允许申请售后"),
PART_AFTER_SALE("部分售后");
private final String description;

3
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
View File

@ -147,7 +147,8 @@ public class StoreFlowServiceImpl extends ServiceImpl<StoreFlowMapper, StoreFlow
//获取付款信息
StoreFlow payStoreFlow = this.getOne(new LambdaUpdateWrapper<StoreFlow>().eq(StoreFlow::getOrderItemSn, afterSale.getOrderItemSn()));
StoreFlow payStoreFlow = this.getOne(new LambdaUpdateWrapper<StoreFlow>().eq(StoreFlow::getOrderItemSn, afterSale.getOrderItemSn())
.eq(StoreFlow::getFlowType,FlowTypeEnum.PAY));
storeFlow.setNum(afterSale.getNum());
storeFlow.setCategoryId(payStoreFlow.getCategoryId());
//佣金

30
framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java
View File

@ -4,11 +4,14 @@ import cn.lili.common.utils.SnowFlake;
import cn.lili.common.utils.SpringContextUtil;
import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderItem;
import cn.lili.modules.order.order.service.OrderItemService;
import cn.lili.modules.order.aftersale.service.AfterSaleService;
import cn.lili.modules.order.order.service.OrderService;
import cn.lili.modules.order.order.service.StoreFlowService;
import cn.lili.modules.payment.entity.RefundLog;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -41,6 +44,11 @@ public class RefundSupport {
*/
@Autowired
private OrderService orderService;
/**
* 子订单
*/
@Autowired
private OrderItemService orderItemService;
/**
* 售后退款
@ -69,10 +77,32 @@ public class RefundSupport {
afterSaleService.update(new LambdaUpdateWrapper<AfterSale>()
.eq(AfterSale::getId, afterSale.getId())
.set(AfterSale::getRefundTime, new Date()));
this.updateReturnGoodsNumber(afterSale);
//记录退款流水
storeFlowService.refundOrder(afterSale);
}
/**
* 功能描述: 修改子订单中已售后退款商品数量
* @Author ftyy
* @Description //TODO
* @Date 17:33 2021/11/18
* @Param [afterSale]
* @return void
**/
private void updateReturnGoodsNumber(AfterSale afterSale){
//根据商品id及订单sn获取子订单
OrderItem orderItem = orderItemService.getOne(new LambdaQueryWrapper<OrderItem>()
.eq(OrderItem::getOrderSn, afterSale.getOrderSn())
.eq(OrderItem::getGoodsId, afterSale.getGoodsId()));
//修改子订单订单中的退货数量
orderItemService.update(new LambdaUpdateWrapper<OrderItem>()
.eq(OrderItem::getOrderSn,afterSale.getOrderSn())
.eq(OrderItem::getGoodsId,afterSale.getGoodsId())
.set(OrderItem::getReturnGoodsNumber,(afterSale.getNum()+orderItem.getReturnGoodsNumber())));
}
/**
* 订单取消
*

19
framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java
View File

@ -183,28 +183,9 @@ public class StoreDetail extends BaseIdEntity {
public StoreDetail(Store store, AdminStoreApplyDTO adminStoreApplyDTO) {
this.storeId = store.getId();
//过滤字段值
isNotNull(adminStoreApplyDTO);
//设置店铺公司信息、设置店铺银行信息、设置店铺其他信息
BeanUtil.copyProperties(adminStoreApplyDTO, this);
this.settlementDay = DateUtil.date();
this.stockWarning = 10;
}
public void isNotNull(AdminStoreApplyDTO adminStoreApplyDTO){
if("null".equals(adminStoreApplyDTO.getSalesConsigneeName())){
adminStoreApplyDTO.setSalesConsigneeName("");
}
if("null".equals(adminStoreApplyDTO.getSalesConsigneeMobile())){
adminStoreApplyDTO.setSalesConsigneeMobile("");
}
if("null".equals(adminStoreApplyDTO.getSalesConsigneeDetail())){
adminStoreApplyDTO.setSalesConsigneeDetail("");
}
if("null".equals(adminStoreApplyDTO.getDdCode())){
adminStoreApplyDTO.setDdCode("");
}
}
}

3
framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java
View File

@ -72,8 +72,7 @@ public class StoreDetailServiceImpl extends ServiceImpl<StoreDetailMapper, Store
@Override
public StoreDetailVO getStoreDetailVO(String storeId) {
StoreDetailVO storeDetail = this.baseMapper.getStoreDetail(storeId);
return storeDetail;
return this.baseMapper.getStoreDetail(storeId);
}
@Override

1
framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
View File

@ -99,6 +99,7 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
if (Boolean.TRUE.equals(member.getHaveStore())) {
throw new ServiceException(ResultCode.STORE_APPLY_DOUBLE_ERROR);
}
//添加店铺
Store store = new Store(member, adminStoreApplyDTO);
this.save(store);