From be9208db35144a6939fa338709168cf7549e86c6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 26 Aug 2022 18:31:50 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 377 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 322 insertions(+), 55 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 5d3d9bd..0739eab 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -1,41 +1,47 @@
package cc.mrbird.febs.mall.service.impl;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.OrderRefundStatusEnum;
-import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
+import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.mall.conversion.MallGoodsCommentConversion;
import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion;
import cc.mrbird.febs.mall.conversion.MallOrderRefundConversion;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
-import cc.mrbird.febs.mall.service.IApiMallMemberService;
-import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
-import cc.mrbird.febs.mall.service.IApiMallOrderInfoService;
-import cc.mrbird.febs.mall.service.MallMemberService;
+import cc.mrbird.febs.mall.service.*;
import cc.mrbird.febs.mall.vo.OrderDetailVo;
import cc.mrbird.febs.mall.vo.OrderListVo;
import cc.mrbird.febs.mall.vo.OrderRefundVo;
+import cc.mrbird.febs.pay.model.AgreementPayDto;
+import cc.mrbird.febs.pay.model.AgreementSignDto;
+import cc.mrbird.febs.pay.model.UnipayDto;
+import cc.mrbird.febs.pay.service.IPayService;
+import cc.mrbird.febs.pay.service.UnipayService;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
+import java.text.DecimalFormat;
import java.util.*;
/**
@@ -52,15 +58,20 @@
private final MallAddressInfoMapper mallAddressInfoMapper;
private final MallOrderItemMapper mallOrderItemMapper;
private final MallMemberMapper memberMapper;
+ private final MallGoodsCommentMapper mallGoodsCommentMapper;
private final IApiMallMemberWalletService memberWalletService;
private final MallExpressInfoMapper expressInfoMapper;
private final MallOrderRefundMapper mallOrderRefundMapper;
private final MallOrderRefundOperationMapper mallOrderRefundOperationMapper;
private final MallShoppingCartMapper mallShoppingCartMapper;
private final IApiMallMemberService memberService;
+ private final IMallMoneyFlowService mallMoneyFlowService;
private final RedisUtils redisUtils;
private final AgentProducer agentProducer;
+ private final IPayService payService;
+ private final IMallAchieveService mallAchieveService;
+ private final UnipayService unipayService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -84,6 +95,7 @@
orderInfo.setLatitude(address.getLatitude());
orderInfo.setLongitude(address.getLongitude());
orderInfo.setRemark(addOrderDto.getRemark());
+ orderInfo.setOrderType(addOrderDto.getOrderType());
if (CollUtil.isEmpty(addOrderDto.getItems())) {
throw new FebsException("参数错误");
@@ -91,47 +103,93 @@
this.baseMapper.insert(orderInfo);
BigDecimal total = BigDecimal.ZERO;
+ BigDecimal carriage = BigDecimal.ZERO;
for (AddOrderItemDto item : addOrderDto.getItems()) {
- MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(item.getSkuId());
- if (sku == null) {
- throw new FebsException("购买商品或sku不存在");
- }
-
- if (sku.getStock() < item.getCnt()) {
- throw new FebsException("库存不足");
- }
-
MallOrderItem orderItem = new MallOrderItem();
- BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
- orderItem.setAmount(amount);
- orderItem.setCnt(item.getCnt());
- orderItem.setOrderId(orderInfo.getId());
- orderItem.setPrice(sku.getPresentPrice());
- orderItem.setGoodsId(sku.getGoodsId());
- orderItem.setGoodsName(sku.getGoodsName());
- orderItem.setSkuId(sku.getId());
- orderItem.setStyleName(sku.getStyleName());
- orderItem.setSkuName(sku.getSkuName());
- orderItem.setSkuImage(sku.getSkuImage());
- total = total.add(amount);
- mallOrderItemMapper.insert(orderItem);
+ // 积分商品提交订单
+ if (addOrderDto.getOrderType() == 2) {
+ MallGoods mallGoods = mallGoodsMapper.selectById(item.getSkuId());
+ if (mallGoods.getStock() < item.getCnt()) {
+ throw new FebsException(mallGoods.getGoodsName() + "库存不足");
+ }
- sku.setStock(sku.getStock() - item.getCnt());
- sku.setSkuVolume(sku.getSkuVolume() + item.getCnt());
- mallGoodsSkuMapper.updateById(sku);
+ if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
+ throw new FebsException(mallGoods.getGoodsName() + "已下架");
+ }
- if (addOrderDto.getType() == 1) {
- mallShoppingCartMapper.delBySkuId(sku.getId(), member.getId());
+ BigDecimal amount = mallGoods.getScore().multiply(BigDecimal.valueOf(item.getCnt()));
+ orderItem.setAmount(amount);
+ orderItem.setCnt(item.getCnt());
+ orderItem.setOrderId(orderInfo.getId());
+ orderItem.setPrice(mallGoods.getScore());
+ orderItem.setGoodsId(mallGoods.getId());
+ orderItem.setGoodsName(mallGoods.getGoodsName());
+ orderItem.setStyleName(mallGoods.getGoodsName());
+ orderItem.setSkuName(mallGoods.getGoodsName());
+ orderItem.setSkuImage(mallGoods.getThumb());
+
+ total = total.add(amount);
+ } else {
+ MallGoodsSku sku = mallGoodsSkuMapper.selectSkuInfoById(item.getSkuId());
+ if (sku == null) {
+ throw new FebsException("购买商品或sku不存在");
+ }
+
+ if (sku.getStock() < item.getCnt()) {
+ throw new FebsException(sku.getSkuName() + "库存不足");
+ }
+
+ MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
+
+ // 零撸专区购买
+ if (new BigDecimal(mallGoods.getPresentPrice()).compareTo(BigDecimal.ZERO) == 0) {
+ List<MallOrderItem> items = mallOrderItemMapper.selectItemByGoodsIdUnCancel(mallGoods.getId(), member.getId());
+ if (CollUtil.isNotEmpty(items)) {
+ throw new FebsException("无法重复领取同一个商品");
+ }
+ }
+
+ if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
+ throw new FebsException(mallGoods.getGoodsName() + "已下架");
+ }
+
+ BigDecimal amount = sku.getPresentPrice().multiply(BigDecimal.valueOf(item.getCnt()));
+ orderItem.setAmount(amount);
+ orderItem.setCnt(item.getCnt());
+ orderItem.setOrderId(orderInfo.getId());
+ orderItem.setPrice(sku.getPresentPrice());
+ orderItem.setGoodsId(sku.getGoodsId());
+ orderItem.setGoodsName(sku.getGoodsName());
+ orderItem.setSkuId(sku.getId());
+ orderItem.setStyleName(sku.getStyleName());
+ orderItem.setSkuName(sku.getSkuName());
+ orderItem.setSkuImage(sku.getSkuImage());
+ orderItem.setIsNormal(mallGoods.getIsNormal());
+ orderItem.setCostPrice(sku.getCostPrice());
+
+ total = total.add(amount);
+ carriage = carriage.add(mallGoods.getCarriage());
+
+ sku.setStock(sku.getStock() - item.getCnt());
+ sku.setSkuVolume(sku.getSkuVolume() + item.getCnt());
+ mallGoodsSkuMapper.updateById(sku);
+
+ if (addOrderDto.getType() == 1) {
+ mallShoppingCartMapper.delBySkuId(sku.getId(), member.getId());
+ }
}
+ mallOrderItemMapper.insert(orderItem);
}
orderInfo.setAmount(total);
+ orderInfo.setCarriage(carriage);
this.baseMapper.updateById(orderInfo);
agentProducer.sendOrderCancelDelayMsg(orderInfo.getId(), 15 * 60 * 1000L);
return orderInfo.getId();
}
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -151,11 +209,18 @@
this.baseMapper.updateById(orderInfo);
}
+// public static void main(String[] args) {
+// String unipayStr = "{\"r1_MerchantNo\":\"888118000001971\",\"rd_Pic\":\"\",\"r6_FrpCode\":\"ALIPAY_H5\",\"r7_TrxNo\":\"100222082332490699\",\"r0_Version\":\"1.0\",\"r3_Amount\":\"0.01\",\"r4_Cur\":\"1\",\"r2_OrderNo\":\"2022082212510288174\",\"rb_CodeMsg\":\"\",\"hmac\":\"1659BB77DEDDF9956EA4D6DF227C3B14\",\"ra_Code\":100,\"rc_Result\":\"<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8'><title></title></head><body><script type='text/javascript'>location.href='https://qr.alipay.com/bax019737vbdwoisxcdp00a2';</script></body></html>\"}";
+// JSONObject jsonObject = JSONUtil.parseObj(unipayStr);
+// String r7_trxNo = (String) jsonObject.get("r7_TrxNo");
+// System.out.println(r7_trxNo);
+// }
+
@Override
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> payOrder(PayOrderDto payOrderDto) {
MallMember member = LoginUserUtil.getLoginUser();
- MallOrderInfo orderInfo = this.baseMapper.selectOrderByMemberIdAndId(member.getId(), payOrderDto.getId());
+ MallOrderInfo orderInfo = this.baseMapper.selectOrderDetailsById(payOrderDto.getId());
if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
throw new FebsException("订单不存在");
}
@@ -164,50 +229,197 @@
throw new FebsException("订单状态不能支付");
}
- String orderNo = "";
+ String payResultStr = "";
+ String rcResult = "";
switch (payOrderDto.getType()) {
case "1":
- orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
- orderInfo.setPayImage(payOrderDto.getPayImage());
+// orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
+// orderInfo.setPayImage(payOrderDto.getPayImage());
orderInfo.setPayMethod("微信支付");
+ agentProducer.sendOrderReturn(orderInfo.getId());
break;
case "2":
- orderInfo.setPayOrderNo(payOrderDto.getPayOrderNo());
- orderInfo.setPayImage(payOrderDto.getPayImage());
+// if (StrUtil.isNotBlank(orderInfo.getPayOrderNo())) {
+// payResultStr = orderInfo.getPayOrderNo();
+// } else {
+// payResultStr = payService.aliPay(orderInfo);
+// }
+ UnipayDto unipayDto = new UnipayDto();
+// unipayDto.setAmount(new BigDecimal("0.01"));
+ unipayDto.setAmount(orderInfo.getAmount());
+ unipayDto.setFrpCode("ALIPAY_H5");
+ unipayDto.setTradeMerchantNo("777180800385820");
+ unipayDto.setOrderNo(orderInfo.getOrderNo());
+ List<MallOrderItem> items = orderInfo.getItems();
+ if(CollUtil.isEmpty(items)){
+ unipayDto.setProductName("商品");
+ }else{
+ unipayDto.setProductName(items.get(0).getGoodsName());
+ }
+ String unipayStr = unipayService.unipay(unipayDto);
+ if("fail" == unipayStr){
+ throw new FebsException("支付失败");
+ }else{
+// JSONUtil.parseObj(unipayStr);
+ JSONObject jsonObject = JSONUtil.parseObj(unipayStr);
+ payResultStr = (String) jsonObject.get("r7_TrxNo");
+ rcResult = (String) jsonObject.get("rc_Result");
+ }
+ orderInfo.setPayOrderNo(payResultStr);
orderInfo.setPayMethod("支付宝支付");
+// agentProducer.sendOrderReturn(orderInfo.getId());
break;
case "3":
- orderNo = balancePay(orderInfo, payOrderDto.getTradePwd());
+ payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd(), "balance");
+
+ orderInfo.setPayOrderNo(orderInfo.getOrderNo());
+ orderInfo.setPayMethod("余额支付");
+ orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ orderInfo.setPayTime(new Date());
+ orderInfo.setPayResult("1");
+
+ boolean hasTc = false;
+ // 静态倍数
+ List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderInfo.getId());
+ if (CollUtil.isNotEmpty(orderItems)) {
+ for (MallOrderItem orderItem : orderItems) {
+ MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
+ BigDecimal score = BigDecimal.ZERO;
+ MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
+ if (mallGoods.getIsNormal() == 2) {
+ hasTc = true;
+ score = sku.getPresentPrice().multiply(mallGoods.getStaticMulti()).multiply(new BigDecimal(orderItem.getCnt()));
+// BigDecimal staticMulti = mallGoods.getStaticMulti() == null ? BigDecimal.ZERO : mallGoods.getStaticMulti();
+// score = sku.getPresentPrice().multiply(staticMulti);
+ // 普通商品也及时结算，不再10天结算
+ } else {
+ score = sku.getPresentPrice();
+ }
+
+ if (score.compareTo(BigDecimal.ZERO) > 0) {
+ memberWalletService.add(score, member.getId(), "score");
+ mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
+
+ // 添加业绩
+ mallAchieveService.add(orderItem.getId());
+ }
+ }
+ }
+
+ // 购买套餐后，升级为普通会员
+ if (hasTc) {
+ MallMember mallMember = memberMapper.selectById(member.getId());
+ if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
+ mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ memberMapper.updateById(mallMember);
+ }
+ }
+
+ mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
+ agentProducer.sendAutoLevelUpMsg(member.getId());
+ agentProducer.sendOrderReturn(orderInfo.getId());
+ break;
+ case "4":
+ if (orderInfo.getOrderType() != 2) {
+ throw new FebsException("非积分订单，无法使用积分支付");
+ }
+ payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd(), "prizeScore");
orderInfo.setPayOrderNo(orderInfo.getOrderNo());
orderInfo.setPayMethod("积分支付");
+ orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
+ orderInfo.setPayTime(new Date());
+ orderInfo.setPayResult("1");
+
+ mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.PRIZE_SCORE.getValue());
+ break;
+ case "5":
+ AgreementSignDto agreementSignDto = new AgreementSignDto();
+ agreementSignDto.setOrderNo(orderInfo.getOrderNo());
+ agreementSignDto.setSmsCode(payOrderDto.getSmsCode());
+ String agreementSignStr = unipayService.agreementSign(agreementSignDto);
+ if("fail".equals(agreementSignStr)){
+ throw new FebsException("支付失败");
+ }else{
+ JSONObject jsonObject = JSONUtil.parseObj(agreementSignStr);
+ payResultStr = (String) jsonObject.get("biz_code");
+ String signData = (String) jsonObject.get("data");
+ String signBizMsg = (String) jsonObject.get("biz_msg");
+
+ JSONObject signDatajsonObject = JSONUtil.parseObj(signData);
+ String err_msg = (String) signDatajsonObject.get("err_msg");
+ if(!"JS000000".equals(payResultStr)){
+ throw new FebsException(signBizMsg);
+ }
+ if(ObjectUtil.isNotNull(signDatajsonObject.get("err_code"))){
+ throw new FebsException(err_msg);
+ }
+ }
+
+ AgreementPayDto agreementPayDto = new AgreementPayDto();
+ agreementPayDto.setOrderNo(orderInfo.getOrderNo());
+
+ BigDecimal value = orderInfo.getAmount().setScale(2, BigDecimal.ROUND_DOWN);
+ DecimalFormat decimalFormat = new DecimalFormat("0.00#");
+ String strVal = decimalFormat.format(value);
+ agreementPayDto.setOrderAmount(new BigDecimal(strVal));
+ agreementPayDto.setOrderTime(DateUtil.now());
+ List<MallOrderItem> itemsGoods = orderInfo.getItems();
+ if(CollUtil.isEmpty(itemsGoods)){
+ agreementPayDto.setOrderDesc("商品");
+ }else{
+ agreementPayDto.setOrderDesc(itemsGoods.get(0).getGoodsName());
+ }
+ agreementPayDto.setBankNo(payOrderDto.getBankNo());
+ String agreementPayStr = unipayService.agreementPay(agreementPayDto);
+
+ if("fail".equals(agreementSignStr)){
+ throw new FebsException("支付失败");
+ }else{
+ JSONObject jsonObject = JSONUtil.parseObj(agreementPayStr);
+ payResultStr = (String) jsonObject.get("biz_code");
+ String payBizMsg = (String) jsonObject.get("biz_msg");
+ if(!"JS000000".equals(payResultStr)){
+ throw new FebsException(payBizMsg);
+ }
+ }
+ orderInfo.setPayMethod("快捷协议支付");
+ break;
default:
}
- orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
- orderInfo.setPayTime(new Date());
- orderInfo.setPayResult("1");
this.baseMapper.updateById(orderInfo);
-
- memberService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null);
-
Map<String, Object> map = new HashMap<>();
- map.put("orderNo", orderNo);
+ map.put("orderInfo", payResultStr);
+ map.put("orderNo", orderInfo.getOrderNo());
map.put("orderId", orderInfo.getId());
+ map.put("rcResult", rcResult);
- agentProducer.sendAutoLevelUpMsg(member.getId());
- agentProducer.sendReturnMoneyMsg(orderInfo.getId());
return map;
}
- private String balancePay(MallOrderInfo orderInfo, String tradePwd) {
+ public static void main(String[] args) {
+ String str = "{\"biz_code\":\"JS000000\",\"biz_msg\":\"成功\",\"data\":\"{\\\"order_status\\\":\\\"P2000\\\",\\\"jp_order_no\\\":\\\"100120220826446740396081496064\\\",\\\"err_msg\\\":\\\"短信验证码不符\\\",\\\"err_code\\\":\\\"CP110026\\\",\\\"sign_no\\\":\\\"\\\",\\\"mch_order_no\\\":\\\"NO_2022082618263952399\\\"}\",\"mch_no\":\"888118000001971\",\"rand_str\":\"an2w7ulf5ru6upkk5bdg441kdi3gnpvu\",\"resp_code\":\"SUCCESS\",\"sec_key\":\"\",\"sign\":\"NiJXRTSIZ9xZMUOwEHiEHdZXmgL2cHUU5WUa1NbMRRzui0DIiuZSW4e31LjnBxwVwmy3uuPMP+tqhY8VLyC8uCFOdGdZI7e72VuRvyvaiW7/sqCrsfgPOBEjiGE/CmSMRoEXv9HmqCyNBF6iHSEhQJql5Yge30dQdyB6xFfqjk0=\",\"sign_type\":\"2\"}";
+
+ JSONObject jsonObject = JSONUtil.parseObj(str);
+ String payResultStr = (String) jsonObject.get("biz_code");
+ String signBizMsg = (String) jsonObject.get("biz_msg");
+ String signData = (String) jsonObject.get("data");
+
+ JSONObject signDatajsonObject = JSONUtil.parseObj(signData);
+ String err_msg = (String) signDatajsonObject.get("err_msg");
+ if(ObjectUtil.isNotNull(signDatajsonObject.get("err_code"))){
+ System.out.println(err_msg);
+ }
+ }
+
+ private String balancePay(MallOrderInfo orderInfo, String tradePwd, String field) {
if (StrUtil.isBlank(tradePwd)) {
throw new FebsException("支付密码错误");
}
MallMember mallMember = memberMapper.selectById(orderInfo.getMemberId());
-
if (StrUtil.isBlank(mallMember.getTradePassword())) {
throw new FebsException("未设置支付密码");
}
@@ -216,8 +428,10 @@
throw new FebsException("支付密码错误");
}
- memberWalletService.reduceBalance(orderInfo.getAmount(), mallMember.getId());
-
+ int reduce = memberWalletService.reduce(orderInfo.getAmount().add(orderInfo.getCarriage()), mallMember.getId(), field);
+ if (reduce == 2) {
+ throw new FebsException("余额不足");
+ }
return orderInfo.getOrderNo();
}
@@ -324,6 +538,13 @@
orderRefund.setRefundTime(new Date());
orderRefund.setBeforeStatus(beforeStatus);
orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue());
+
+ // 未发货则退运费，发货了则不退
+ if (beforeStatus == 2) {
+ orderRefund.setAmount(orderInfo.getAmount().add(orderInfo.getCarriage()));
+ } else {
+ orderRefund.setAmount(orderInfo.getAmount());
+ }
mallOrderRefundMapper.insert(orderRefund);
} else {
orderRefund.setDesp(addRefundDto.getDesp());
@@ -332,6 +553,12 @@
orderRefund.setRefundTime(new Date());
orderRefund.setBeforeStatus(beforeStatus);
orderRefund.setStatus(OrderRefundStatusEnum.REFUND_APPLY.getValue());
+ // 未发货则退运费，发货了则不退
+ if (beforeStatus == 2) {
+ orderRefund.setAmount(orderInfo.getAmount().add(orderInfo.getCarriage()));
+ } else {
+ orderRefund.setAmount(orderInfo.getAmount());
+ }
mallOrderRefundMapper.updateById(orderRefund);
}
@@ -378,4 +605,44 @@
this.baseMapper.updateById(orderInfo);
}
}
+
+ @Override
+ @Transactional
+ public void goodsComment(ApiAddCommentDtos addCommentDtos) {
+ Long orderId = addCommentDtos.getOrderId();
+ MallMember member = LoginUserUtil.getLoginUser();
+ MallOrderInfo orderInfo = this.baseMapper.selectOrderDetailsById(orderId);
+ if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
+ throw new FebsException("订单不存在");
+ }
+ if (OrderStatusEnum.FINISH.getValue() != orderInfo.getStatus()) {
+ throw new FebsException("该状态不能评价");
+ }
+ if (MallOrderInfo.COMMENT_STATE_YES == orderInfo.getCommentState()) {
+ throw new FebsException("该状态不能评价");
+ }
+
+ orderInfo.setCommentState(MallOrderInfo.COMMENT_STATE_YES);
+ this.baseMapper.updateById(orderInfo);
+
+ List<ApiAddCommentDto> apiAddCommentDtos = addCommentDtos.getApiAddCommentDtos();
+ if(CollUtil.isNotEmpty(apiAddCommentDtos)){
+ for(ApiAddCommentDto apiAddCommentDto : apiAddCommentDtos){
+ Long skuId = apiAddCommentDto.getSkuId();
+ MallGoodsSku mallGoodsSku = mallGoodsSkuMapper.selectById(skuId);
+ Long goodsId = apiAddCommentDto.getGoodsId();
+ MallGoods mallGoods = mallGoodsMapper.selectById(goodsId);
+ MallGoodsComment mallGoodsComment = MallGoodsCommentConversion.INSTANCE.dtoToEntity(apiAddCommentDto);
+ mallGoodsComment.setMemberId(member.getId());
+ mallGoodsComment.setOrderId(orderId);
+ mallGoodsComment.setGoodsName(mallGoods.getGoodsName());
+ mallGoodsComment.setSkuName(mallGoodsSku.getSkuName());
+ mallGoodsComment.setStyleId(mallGoodsSku.getStyleId());
+ mallGoodsComment.setStyleName(mallGoodsSku.getStyleName());
+ mallGoodsComment.setShowState(MallGoodsComment.SHOW_STATE_ENABLE);
+ mallGoodsCommentMapper.insert(mallGoodsComment);
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1