Skip to content

O
order-group
Commit af1defa6 by pass商户管理员
Options

删除华莱士定制需求相关代码（先注后删）

parent 3d93c743
Showing with 94 additions and 97 deletions
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
......@@ -557,15 +557,15 @@ public class OrderController {
}
/**
* 华莱士临时对接百事抽奖活动
* @param request
* @return 是否需要弹框,跳转百事
*/
@ApiAnnotation(logMessage = "/order/temp/activity")
@PostMapping("/temp/activity/query")
public BaseResponse wallaceTempActivity(@Validated @LogParams @RequestBody WallaceTempActivityRequest request) {
return orderAdapterService.wallaceTempActivity(request);
}
// /**
// * 华莱士临时对接百事抽奖活动
// * @param request
// * @return 是否需要弹框,跳转百事
// */
// @ApiAnnotation(logMessage = "/order/temp/activity")
// @PostMapping("/temp/activity/query")
// public BaseResponse wallaceTempActivity(@Validated @LogParams @RequestBody WallaceTempActivityRequest request) {
// return orderAdapterService.wallaceTempActivity(request);
// }
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
......@@ -24,7 +24,6 @@ import cn.freemud.redis.RedisCache;
import cn.freemud.service.*;
import cn.freemud.service.thirdparty.EcologyProgramApplicationClient;
import cn.freemud.service.thirdparty.SvcTransactionClient;
import cn.freemud.service.thirdparty.WallaceApplicationClient;
import cn.freemud.service.universal.factory.CreateOrderServiceFactory;
import cn.freemud.utils.RedisUtil;
import cn.freemud.utils.ResponseUtil;
......@@ -179,8 +178,6 @@ public class OrderAdapterServiceImpl {
private OrderSdkService orderSdkService;
@Autowired
private OrderCenterSdkAdapter orderCenterSdkAdapter;
@Autowired
private WallaceApplicationClient wallaceApplicationClient;
//获取下单实现对象
private OrderFactoryService getCreateOrderBean(AssortmentCustomerInfoVo assortmentCustomerInfoVo, CreateOrderVo createOrderVo) {
......@@ -503,61 +500,61 @@ public class OrderAdapterServiceImpl {
}
/**
* 华莱士临时需求,
*
* @param request
* @return
*/
public BaseResponse wallaceTempActivity(WallaceTempActivityRequest request) {
AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(request.getSessionId());
if (assortmentCustomerInfoVo == null || StringUtils.isEmpty(assortmentCustomerInfoVo.getMemberId())) {
return ResponseUtil.error(ResponseResult.NOT_LOGIN);
}
if (CollectionUtils.isEmpty(request.getOrderCodes())) {
return ResponseUtil.error(ResponseResult.PARAMETER_MISSING);
}
Map<String, Object> respVo = new HashMap<>();
boolean skip = false;
Map<String, Object> respMsg = new LinkedHashMap<>();
for (String orderCode : request.getOrderCodes()) {
// 校验订单
QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo(null, orderCode, null, null, LogThreadLocal.getTrackingNo(),assortmentCustomerInfoVo.getPartnerId());
if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "") || orderDetailResponse.getResult() == null) {
respMsg.put(orderCode, "订单不存在");
continue;
}
OrderInfoReqs orderInfoReqs = orderDetailResponse.getResult();
if (!Objects.equals(orderInfoReqs.getUserId(), assortmentCustomerInfoVo.getMemberId())) {
respMsg.put(orderCode, "订单用户信息不匹配");
continue;
}
// step1 调用敬轩, 是否能参加活动
OrderBeanV1 orderBeanV1 = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
boolean canJoin = this.canJoinActivity(orderBeanV1);
respMsg.put(orderCode, "skip is false");
if (canJoin) {
try {
// stpe2 调用光兴, 是否成功 +1
PepsiOrderSubmitRequest pepsiOrderSubmitRequest = new PepsiOrderSubmitRequest();
pepsiOrderSubmitRequest.setMemberId(orderInfoReqs.getUserId());
pepsiOrderSubmitRequest.setOrderCode(orderInfoReqs.getOrderCode());
pepsiOrderSubmitRequest.setPartnerId(orderInfoReqs.getPartnerId());
EdenResponse edenResponse = wallaceApplicationClient.pepsiOrderSubmit(pepsiOrderSubmitRequest);
if (!skip) {
skip = Objects.equals(edenResponse.getStatusCode(), EdenResponse.SUCCESSCODE);
}
respMsg.put(orderCode, JSON.toJSONString(edenResponse));
} catch (Exception e) {
respMsg.put(orderCode, e.getMessage());
}
}
}
respVo.put("skip", skip);
respVo.put("info", respMsg);
return ResponseUtil.success(respVo);
}
// /**
// * 华莱士临时需求,
// *
// * @param request
// * @return
// */
// public BaseResponse wallaceTempActivity(WallaceTempActivityRequest request) {
// AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(request.getSessionId());
// if (assortmentCustomerInfoVo == null || StringUtils.isEmpty(assortmentCustomerInfoVo.getMemberId())) {
// return ResponseUtil.error(ResponseResult.NOT_LOGIN);
// }
// if (CollectionUtils.isEmpty(request.getOrderCodes())) {
// return ResponseUtil.error(ResponseResult.PARAMETER_MISSING);
// }
// Map<String, Object> respVo = new HashMap<>();
// boolean skip = false;
// Map<String, Object> respMsg = new LinkedHashMap<>();
// for (String orderCode : request.getOrderCodes()) {
// // 校验订单
// QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo(null, orderCode, null, null, LogThreadLocal.getTrackingNo(),assortmentCustomerInfoVo.getPartnerId());
// if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "") || orderDetailResponse.getResult() == null) {
// respMsg.put(orderCode, "订单不存在");
// continue;
// }
// OrderInfoReqs orderInfoReqs = orderDetailResponse.getResult();
// if (!Objects.equals(orderInfoReqs.getUserId(), assortmentCustomerInfoVo.getMemberId())) {
// respMsg.put(orderCode, "订单用户信息不匹配");
// continue;
// }
// // step1 调用敬轩, 是否能参加活动
// OrderBeanV1 orderBeanV1 = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
// boolean canJoin = this.canJoinActivity(orderBeanV1);
// respMsg.put(orderCode, "skip is false");
// if (canJoin) {
// try {
// // stpe2 调用光兴, 是否成功 +1
// PepsiOrderSubmitRequest pepsiOrderSubmitRequest = new PepsiOrderSubmitRequest();
// pepsiOrderSubmitRequest.setMemberId(orderInfoReqs.getUserId());
// pepsiOrderSubmitRequest.setOrderCode(orderInfoReqs.getOrderCode());
// pepsiOrderSubmitRequest.setPartnerId(orderInfoReqs.getPartnerId());
// EdenResponse edenResponse = wallaceApplicationClient.pepsiOrderSubmit(pepsiOrderSubmitRequest);
// if (!skip) {
// skip = Objects.equals(edenResponse.getStatusCode(), EdenResponse.SUCCESSCODE);
// }
// respMsg.put(orderCode, JSON.toJSONString(edenResponse));
// } catch (Exception e) {
// respMsg.put(orderCode, e.getMessage());
// }
// }
//
// }
// respVo.put("skip", skip);
// respVo.put("info", respMsg);
// return ResponseUtil.success(respVo);
// }
private boolean canJoinActivity(OrderBeanV1 orderBeanV1) {
String partnerId = orderBeanV1.getCompanyId();
......
order-application-service/src/main/java/cn/freemud/service/thirdparty/WallaceApplicationClient.java
package cn.freemud.service.thirdparty;
import cn.freemud.entities.EdenResponse;
import cn.freemud.entities.dto.wallace.request.PepsiOrderSubmitRequest;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* @author : xh.Z
* @email : fisherman0510@163.com
* @Date : 2022/7/15 17:04
* @description :
*/
@FeignClient(name = "wallace-application")
@RequestMapping(produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
public interface WallaceApplicationClient {
/**
* 请求百事 设置抽奖次数+1
*
* @param request
* @return
*/
@PostMapping(value = "/pass/wallace/pepsi/order/submit")
EdenResponse pepsiOrderSubmit(@RequestBody PepsiOrderSubmitRequest request);
}
//package cn.freemud.service.thirdparty;
//
//import cn.freemud.entities.EdenResponse;
//import cn.freemud.entities.dto.wallace.request.PepsiOrderSubmitRequest;
//import org.springframework.cloud.openfeign.FeignClient;
//import org.springframework.http.MediaType;
//import org.springframework.web.bind.annotation.PostMapping;
//import org.springframework.web.bind.annotation.RequestBody;
//import org.springframework.web.bind.annotation.RequestMapping;
//
///**
// * @author : xh.Z
// * @email : fisherman0510@163.com
// * @Date : 2022/7/15 17:04
// * @description :
// */
//@FeignClient(name = "wallace-application")
//@RequestMapping(produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
//public interface WallaceApplicationClient {
//
// /**
// * 请求百事 设置抽奖次数+1
// *
// * @param request
// * @return
// */
// @PostMapping(value = "/pass/wallace/pepsi/order/submit")
// EdenResponse pepsiOrderSubmit(@RequestBody PepsiOrderSubmitRequest request);
//}
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