Commit 06b843c5 by box

申请退款冻结优惠券

parent 7f24c264
...@@ -5,6 +5,7 @@ import cn.freemud.adapter.OrderCancelReqAdapter; ...@@ -5,6 +5,7 @@ import cn.freemud.adapter.OrderCancelReqAdapter;
import cn.freemud.adapter.OrderPrintDtoAdapter; import cn.freemud.adapter.OrderPrintDtoAdapter;
import cn.freemud.adapter.OrderTaskReqAdapter; import cn.freemud.adapter.OrderTaskReqAdapter;
import cn.freemud.base.util.DateUtil; import cn.freemud.base.util.DateUtil;
import cn.freemud.demoTest.enums.TradeBizTypeEnum;
import cn.freemud.entities.dto.delivery.QueryFreightRefundSupportedResponse; import cn.freemud.entities.dto.delivery.QueryFreightRefundSupportedResponse;
import cn.freemud.entities.dto.delivery.QueryFreightRefundSupportedVo; import cn.freemud.entities.dto.delivery.QueryFreightRefundSupportedVo;
import cn.freemud.entities.dto.ecology.SendMessageRequest; import cn.freemud.entities.dto.ecology.SendMessageRequest;
...@@ -20,6 +21,8 @@ import cn.freemud.management.entities.dto.request.order.OrderManagerRequest; ...@@ -20,6 +21,8 @@ import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
import cn.freemud.management.entities.dto.response.pay.PayRefundResponse; import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
import cn.freemud.management.enums.AfterSalesRefunStateEnum; import cn.freemud.management.enums.AfterSalesRefunStateEnum;
import cn.freemud.management.service.adapter.OrderManagerAdapter; import cn.freemud.management.service.adapter.OrderManagerAdapter;
import cn.freemud.management.service.handle.CouponQueryHandle;
import cn.freemud.management.service.handle.OrderCouponHandle;
import cn.freemud.management.service.handle.OrderVerifyHandle; import cn.freemud.management.service.handle.OrderVerifyHandle;
import cn.freemud.management.service.handle.PaymentHandle; import cn.freemud.management.service.handle.PaymentHandle;
import cn.freemud.redis.RedisCache; import cn.freemud.redis.RedisCache;
...@@ -41,6 +44,7 @@ import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto; ...@@ -41,6 +44,7 @@ import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp; import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService; import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto; import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
...@@ -61,6 +65,7 @@ import java.math.BigDecimal; ...@@ -61,6 +65,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND; import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
...@@ -140,6 +145,11 @@ public class RefundService { ...@@ -140,6 +145,11 @@ public class RefundService {
if (!orderVerifyHandle.getRefundConfig(order)) if (!orderVerifyHandle.getRefundConfig(order))
throw new ServiceException("该门店不支持线上退款,请联系门店进行线下处理"); throw new ServiceException("该门店不支持线上退款,请联系门店进行线下处理");
// 如果是买券订单,查询券是否已使用,如果没有使用,冻结券,否则不许退款
if (BizTypeEnum.SALE_COUPON.getBizType().equals(order.getBizType())) {
freezeCouponCode(partnerId, order);
}
// 退款是否退配送费 // 退款是否退配送费
boolean refundDeliveryFee = isRefundDeliveryFee(order, refundAmount); boolean refundDeliveryFee = isRefundDeliveryFee(order, refundAmount);
// 未接单 // 未接单
...@@ -406,4 +416,30 @@ public class RefundService { ...@@ -406,4 +416,30 @@ public class RefundService {
ErrorLog.errorConvertJson(this.getClass(), "打印退款小票异常", e); ErrorLog.errorConvertJson(this.getClass(), "打印退款小票异常", e);
} }
} }
private CouponQueryHandle couponQueryHandle;
private OrderCouponHandle orderCouponHandle;
/**
* 校验券状态,如果没有核销则冻结券,否则抛异常
* <pre></pre>
* @param partnerId
* @param orderInfo
* @throws ServiceException
*/
private void freezeCouponCode(String partnerId, OrderInfoReqs orderInfo) {
List<String> couponCodes = Optional.ofNullable(orderInfo.getOrderSettlementDetailList()).orElse(new ArrayList<>()).stream()
.filter(dto -> Objects.equals(OrderSettlementType.SEND_COUPON.getIndex(), dto.getSettlementType()) && StringUtils.isNotBlank(dto.getExternalObjectId()))
.map(OrderSettlementResp::getExternalObjectId)
.collect(Collectors.toList());
boolean couponUsed = couponQueryHandle.isCouponUsed(partnerId, couponCodes);
if (couponUsed) {
throw new ServiceException("识别到您已使用过该券包中的部分或全部券,故不支持退款。");
}
// 冻结券
boolean freeze = orderCouponHandle.freezeCodes(partnerId, orderInfo.getUserId(), couponCodes, "买券订单退款");
if (!freeze) {
throw new ServiceException("优惠券校验失败,请稍后再试!");
}
}
} }
...@@ -6,6 +6,7 @@ import cn.freemud.management.entities.dto.response.coupon.CouponBaseResponse; ...@@ -6,6 +6,7 @@ import cn.freemud.management.entities.dto.response.coupon.CouponBaseResponse;
import cn.freemud.management.enums.ResponseResult; import cn.freemud.management.enums.ResponseResult;
import cn.freemud.management.thirdparty.CouponOnlineClient; import cn.freemud.management.thirdparty.CouponOnlineClient;
import cn.freemud.management.thirdparty.request.coupon.BatchCouponDiscardReq; import cn.freemud.management.thirdparty.request.coupon.BatchCouponDiscardReq;
import cn.freemud.management.thirdparty.request.coupon.CodeFreezeReq;
import cn.freemud.management.thirdparty.request.coupon.CouponUnFreezeReq; import cn.freemud.management.thirdparty.request.coupon.CouponUnFreezeReq;
import cn.freemud.management.util.ResponseUtil; import cn.freemud.management.util.ResponseUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -18,10 +19,7 @@ import org.apache.commons.lang.StringUtils; ...@@ -18,10 +19,7 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.ArrayList; import java.util.*;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -74,6 +72,36 @@ public class OrderCouponHandle { ...@@ -74,6 +72,36 @@ public class OrderCouponHandle {
return ResponseUtil.success(); return ResponseUtil.success();
} }
/**
* 冻结券
* <pre></pre>
* @param partnerId
* @param memberId
* @param codes 注意所有券号尾号必须相同
* @param reason
* @return
*/
public boolean freezeCodes(String partnerId, String memberId, Collection<String> codes, String reason) {
CodeFreezeReq req = new CodeFreezeReq();
req.setPartnerId(partnerId);
req.setReason(reason);
req.setCoupons(codes.stream().map(code -> {
return new CodeFreezeReq.CouponInfo(){{
setCode(code);
setMemberId(memberId);
}};
}).collect(Collectors.toList()));
CouponBaseResponse<Object> freeze = couponOnlineClient.freeze(req);
return Objects.equals(freeze.getStatusCode(), 100);
}
/**
* 解冻券
* <pre></pre>
* @param partnerId
* @param orderBean
*/
public void unfreezeOrderCoupon(String partnerId, OrderBeanV1 orderBean) { public void unfreezeOrderCoupon(String partnerId, OrderBeanV1 orderBean) {
if (BizTypeEnum.SALE_COUPON.getBizType().equals(orderBean.getBizType())) { if (BizTypeEnum.SALE_COUPON.getBizType().equals(orderBean.getBizType())) {
List<String> couponCodes = Optional.ofNullable(orderBean.getOrderSettlementDetailList()).orElse(new ArrayList<>()).stream() List<String> couponCodes = Optional.ofNullable(orderBean.getOrderSettlementDetailList()).orElse(new ArrayList<>()).stream()
......
...@@ -560,6 +560,9 @@ public class OrderVerifyHandle { ...@@ -560,6 +560,9 @@ public class OrderVerifyHandle {
// 除 未支付 拒单 和 取消外,其他可退款 // 除 未支付 拒单 和 取消外,其他可退款
return Stream.of(NewOrderStatus.PENDING_PAYMENT, NewOrderStatus.CLOSED) return Stream.of(NewOrderStatus.PENDING_PAYMENT, NewOrderStatus.CLOSED)
.noneMatch(s -> Objects.equals(order.getOrderState(), s.getIndex())); .noneMatch(s -> Objects.equals(order.getOrderState(), s.getIndex()));
} else if (BizTypeEnum.SALE_COUPON.getBizType().equals(order.getBizType())) {
// 买券订单判断,买券订单不受配置限制
return true;
} }
OrderExtInfoDto extInfo = JSON.parseObject(order.getExtInfo(), OrderExtInfoDto.class); OrderExtInfoDto extInfo = JSON.parseObject(order.getExtInfo(), OrderExtInfoDto.class);
// 查询小程序配置的退款设置 // 查询小程序配置的退款设置
...@@ -679,4 +682,4 @@ public class OrderVerifyHandle { ...@@ -679,4 +682,4 @@ public class OrderVerifyHandle {
return ResponseUtil.success(); return ResponseUtil.success();
} }
} }
\ No newline at end of file
...@@ -2,6 +2,7 @@ package cn.freemud.management.thirdparty; ...@@ -2,6 +2,7 @@ package cn.freemud.management.thirdparty;
import cn.freemud.management.entities.dto.response.coupon.CouponBaseResponse; import cn.freemud.management.entities.dto.response.coupon.CouponBaseResponse;
import cn.freemud.management.thirdparty.request.coupon.BatchCouponDiscardReq; import cn.freemud.management.thirdparty.request.coupon.BatchCouponDiscardReq;
import cn.freemud.management.thirdparty.request.coupon.CodeFreezeReq;
import cn.freemud.management.thirdparty.request.coupon.CouponUnFreezeReq; import cn.freemud.management.thirdparty.request.coupon.CouponUnFreezeReq;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -21,6 +22,15 @@ public interface CouponOnlineClient { ...@@ -21,6 +22,15 @@ public interface CouponOnlineClient {
CouponBaseResponse<Object> batchDiscard(BatchCouponDiscardReq req); CouponBaseResponse<Object> batchDiscard(BatchCouponDiscardReq req);
/** /**
* 冻结券,注意该接口入参券号尾号必须相同,券数量最多20
* <pre></pre>
* @param req
* @return
*/
@PostMapping("/coupon/standard/ops/freeze")
CouponBaseResponse<Object> freeze(CodeFreezeReq req);
/**
* 解冻券,请求券号列表中,所有券号尾号必须一样 * 解冻券,请求券号列表中,所有券号尾号必须一样
* <pre></pre> * <pre></pre>
* @param req * @param req
......
package cn.freemud.management.thirdparty.request.coupon;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import java.util.List;
/**
* &copy; All rights Reserved
*
* @author wénkǎi.zhāng 2023-12-27
* @since 1.0
*/
@Data
public class CodeFreezeReq {
@Size(min = 1, max = 20, message = "操作的券信息不能为空且最多支持20张")
private List<CouponInfo> coupons;
@NotBlank(message = "商户编号不能为空")
private String partnerId;
@ApiModelProperty("冻结原因。默认储值卡退款")
private String reason;
@Valid
@Data
public static class CouponInfo {
private String memberId;
@NotBlank(message = "券号不能为空")
private String code;
}
}
...@@ -49,6 +49,9 @@ public enum OrderSettlementType { ...@@ -49,6 +49,9 @@ public enum OrderSettlementType {
//待调整 //待调整
ONE_BY_ONE(207, "买一送一"), ONE_BY_ONE(207, "买一送一"),
DISCOUNT_COUPON(208, "折扣券"), DISCOUNT_COUPON(208, "折扣券"),
SEND_COUPON(216, "购买券包发的优惠券"),
FULL_DISTRIBUTION_FEE(1014, "满减配送费"), FULL_DISTRIBUTION_FEE(1014, "满减配送费"),
; ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment