Commit a9b6da53 by ping.wu

券预校验与锁定新接口对接

parent 739e5ef7
...@@ -34,7 +34,6 @@ public class PreCheckAndLockReq { ...@@ -34,7 +34,6 @@ public class PreCheckAndLockReq {
@ApiModelProperty(value = "券信息列表", required = true) @ApiModelProperty(value = "券信息列表", required = true)
private List<CouponInfo> couponInfoList; private List<CouponInfo> couponInfoList;
@ApiModelProperty(value = "用户微信openid") @ApiModelProperty(value = "用户微信openid")
private String openId; private String openId;
......
...@@ -323,7 +323,8 @@ public class OrderBusinessServiceImpl implements OrderBusinessService { ...@@ -323,7 +323,8 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
PreCheckAndLockReq request = couponAdapter.convert2PreCheckRequest(orderBean, openId); PreCheckAndLockReq request = couponAdapter.convert2PreCheckRequest(orderBean, openId);
if (request != null) { if (request != null) {
// request.setChannel_ids(getOrgCodes(orderBean.getCompanyId(),orderBean.getShopId())); // request.setChannel_ids(getOrgCodes(orderBean.getCompanyId(),orderBean.getShopId()));
BaseResponse<CouponLockResponse> couponLockResponseBaseResponse = offlineCouponSdkService.preCheckAndLock(request); request.getStoreInfo().setChannelIdList(getOrgCodes(orderBean.getCompanyId(),orderBean.getShopId()));
BaseResponse couponLockResponseBaseResponse = offlineCouponSdkService.preCheckAndLock(request);
if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponLockResponseBaseResponse.getCode())) { if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponLockResponseBaseResponse.getCode())) {
CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null); CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null);
orderCancel(cancelOrderRequest); orderCancel(cancelOrderRequest);
......
...@@ -18,7 +18,10 @@ public interface CouponOfflineClient { ...@@ -18,7 +18,10 @@ public interface CouponOfflineClient {
@PostMapping("/api") @PostMapping("/api")
CouponCodeResponseDto verification(CouponCodeVerificationDto couponCodeVerificationDto); CouponCodeResponseDto verification(CouponCodeVerificationDto couponCodeVerificationDto);
/**
* 预校验锁定券新接口
*/
@LogIgnoreFeign(logMessage="precheckAndLock",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE) @LogIgnoreFeign(logMessage="precheckAndLock",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
@PostMapping("/precheck/redeem") @PostMapping("/standard/checkandlock")
BaseResponse<CouponLockResponse> preCheckAndLock(PreCheckAndLockReq couponCodeVerificationDto); BaseResponse preCheckAndLock(PreCheckAndLockReq couponCodeVerificationDto);
} }
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