Commit 88d8bf55 by 查志伟

新版小程序商户禁用旧版下单接口

parent 66188b47
...@@ -21,6 +21,7 @@ import cn.freemud.entities.vo.*; ...@@ -21,6 +21,7 @@ import cn.freemud.entities.vo.*;
import cn.freemud.entities.vo.encircle.CreateReserveOrderVo; import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
import cn.freemud.entities.vo.encircle.EncircleReserveBaseVo; import cn.freemud.entities.vo.encircle.EncircleReserveBaseVo;
import cn.freemud.entities.vo.order.*; import cn.freemud.entities.vo.order.*;
import cn.freemud.enums.ResponseResult;
import cn.freemud.handler.CouponOrderAutoRefundHandler; import cn.freemud.handler.CouponOrderAutoRefundHandler;
import cn.freemud.handler.OrderReportJobHandler; import cn.freemud.handler.OrderReportJobHandler;
import cn.freemud.service.EncircleOrderService; import cn.freemud.service.EncircleOrderService;
...@@ -38,6 +39,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -38,6 +39,7 @@ import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -70,6 +72,13 @@ public class OrderController { ...@@ -70,6 +72,13 @@ public class OrderController {
private RefundService refundService; private RefundService refundService;
/** /**
* 还没有切换到新版本小程序的商户,多个用;分隔
* 不在该列表里的商户,不允许从旧小程序里下单(用户小程序缓存是老小程序情况)
*/
@Value("${config.oldVersionPartner:}")
private String oldVersionPartner;
/**
* 废弃,不在使用 * 废弃,不在使用
* 创建订单之前校验前面排队的订单数 * 创建订单之前校验前面排队的订单数
*/ */
...@@ -86,6 +95,9 @@ public class OrderController { ...@@ -86,6 +95,9 @@ public class OrderController {
@ApiAnnotation(logMessage = "createOrder") @ApiAnnotation(logMessage = "createOrder")
@PostMapping("/createOrder") @PostMapping("/createOrder")
public BaseResponse createOrder(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) { public BaseResponse createOrder(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) {
if (StringUtils.isNotBlank(oldVersionPartner) && !oldVersionPartner.contains(createOrderVo.getPartnerId())) {
return ResponseUtil.error(ResponseResult.OPERATE_NOT_SUPPORT.getCode(), "小程序版本过低, 请升级版本!");
}
return orderAdapterService.createOrderNew(createOrderVo); return orderAdapterService.createOrderNew(createOrderVo);
} }
......
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