czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.代客下单，折扣

This commit is contained in:
SongZhang 2024-08-29 14:13:19 +08:00
parent 417451f432
commit 297ccc0233
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PayDTO.java
View File

@ -2,6 +2,8 @@ package cn.ysk.cashier.dto.shoptable;
import lombok.Data;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@ -13,4 +15,7 @@ public class PayDTO {
private Integer orderId;
@NotEmpty
private String payType;
@Min(0)
@Max(1)
private Double discount;
}

3
eladmin-system/src/main/java/cn/ysk/cashier/service/TbPayService.java
View File

@ -4,12 +4,13 @@ import cn.ysk.cashier.dto.ScanPayDTO;
import cn.ysk.cashier.dto.shoptable.PayDTO;
import cn.ysk.cashier.pojo.order.TbOrderInfo;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
public interface TbPayService {
void scanPay(ScanPayDTO scanPayDTO);
TbOrderInfo vipPay(@NotNull Integer shopId, @NotNull Integer orderId);
TbOrderInfo vipPay(@NotNull Integer shopId, @NotNull Integer orderId, Double discount);
TbOrderInfo cashPay(PayDTO payDTO);
}

20
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPayServiceImpl.java
View File

@ -21,13 +21,15 @@ import cn.ysk.cashier.repository.shop.TbMerchantThirdApplyRepository;
import cn.ysk.cashier.service.TbPayService;
import cn.ysk.cashier.utils.RabbitMsgUtils;
import cn.ysk.cashier.utils.SnowFlakeUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Service;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List;
@Service
@ -297,7 +299,7 @@ public class TbPayServiceImpl implements TbPayService {
private final TbShopUserFlowMapper shopUserFlowMapper;
@Override
public TbOrderInfo vipPay(@NotNull Integer shopId, @NotNull Integer orderId) {
public TbOrderInfo vipPay(@NotNull Integer shopId, @NotNull Integer orderId, Double discount) {
TbOrderInfo orderInfo = orderInfoMapper.selectById(orderId);
@ -334,7 +336,12 @@ public class TbPayServiceImpl implements TbPayService {
userFlow.setType("-");
shopUserFlowMapper.insert(userFlow);
orderInfo.setPayAmount(orderInfo.getOrderAmount());
orderInfo.setPayAmount(discount == null ? orderInfo.getOrderAmount() : orderInfo.getOrderAmount().multiply(BigDecimal.valueOf(discount)).setScale(2, RoundingMode.UP));
if (discount != null && discount != 1) {
orderInfo.setDiscountAmount(orderInfo.getOrderAmount().subtract(orderInfo.getPayAmount()));
orderInfo.setDiscountRatio(BigDecimal.valueOf(discount));
}
orderInfo.setPayType("cash");
orderInfo.setStatus("closed");
orderInfo.setPayOrderNo("cash".concat(SnowFlakeUtil.generateOrderNo()));
@ -373,7 +380,12 @@ public class TbPayServiceImpl implements TbPayService {
// return Result.fail(CodeEnum.PAYTYPENOEXIST);
// }
orderInfo.setPayAmount(orderInfo.getOrderAmount());
orderInfo.setPayAmount(payDTO.getDiscount() == null ? orderInfo.getOrderAmount() : orderInfo.getOrderAmount()
.multiply(BigDecimal.valueOf(payDTO.getDiscount())).setScale(2, RoundingMode.UP));
if (payDTO.getDiscount() != null && payDTO.getDiscount() != 1) {
orderInfo.setDiscountAmount(orderInfo.getOrderAmount().subtract(orderInfo.getPayAmount()));
orderInfo.setDiscountRatio(BigDecimal.valueOf(payDTO.getDiscount()));
}
orderInfo.setPayType("cash");
orderInfo.setStatus("closed");
orderInfo.setPayOrderNo("cash".concat(SnowFlakeUtil.generateOrderNo()));

2
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@ -1083,7 +1083,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
TbOrderInfo orderInfo = null;
switch (payDTO.getPayType()) {
case "vipPay":
orderInfo = tbPayServiceImpl.vipPay(payDTO.getShopId(), payDTO.getOrderId());
orderInfo = tbPayServiceImpl.vipPay(payDTO.getShopId(), payDTO.getOrderId(), payDTO.getDiscount());
break;
case "cash":
orderInfo = tbPayServiceImpl.cashPay(payDTO);