Commit 65ec373d by ping.wu

判断修改

parent ab6e74ad
...@@ -69,21 +69,16 @@ public class SellCouponOrderServiceImpl { ...@@ -69,21 +69,16 @@ public class SellCouponOrderServiceImpl {
@Autowired @Autowired
private CheckOrder checkOrder; private CheckOrder checkOrder;
@Autowired @Autowired
private MenuService menuService; private MenuService menuService;
@Autowired @Autowired
private OrderSdkService orderSdkService; private OrderSdkService orderSdkService;
@Autowired @Autowired
private OrderServiceImpl orderservice; private OrderServiceImpl orderservice;
@Autowired @Autowired
private StoreCenterService storeCenterService; private StoreCenterService storeCenterService;
@Autowired @Autowired
private OrderAdapter orderAdapter; private OrderAdapter orderAdapter;
@Autowired @Autowired
private OrderSdkAdapter orderSdkAdapter; private OrderSdkAdapter orderSdkAdapter;
...@@ -93,7 +88,7 @@ public class SellCouponOrderServiceImpl { ...@@ -93,7 +88,7 @@ public class SellCouponOrderServiceImpl {
@Value("${coupon.app.id}") @Value("${coupon.app.id}")
private String appId; private String appId;
String SUCCESS = "100"; private final String SUCCESS = "100";
/** /**
* 卖券订单创建 * 卖券订单创建
...@@ -136,10 +131,16 @@ public class SellCouponOrderServiceImpl { ...@@ -136,10 +131,16 @@ public class SellCouponOrderServiceImpl {
} }
List<ActiveDetailVO> activeDetailVOS = batchQueryActivityInfo(partnerId, activityCodes, trackingNo); List<ActiveDetailVO> activeDetailVOS = batchQueryActivityInfo(partnerId, activityCodes, trackingNo);
if(activeDetailVOS == null){
return ResponseUtil.error(ResponseResult.STORE_ITEM_CHECK_INVAILD);
}
CreateOrderRequest createOrderRequest = convent2NEWCreateOrderRequest(requestVo,userLoginInfoDto,productInfosByIds.getData(),activeDetailVOS,storeResponse.getBizVO()); CreateOrderRequest createOrderRequest = convent2NEWCreateOrderRequest(requestVo,userLoginInfoDto,productInfosByIds.getData(),activeDetailVOS,storeResponse.getBizVO());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> orderInfoReqsBaseResponse = orderSdkService.createOrder(createOrderRequest, trackingNo); com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> orderInfoReqsBaseResponse = orderSdkService.createOrder(createOrderRequest, trackingNo);
CreateOrderResponse createOrderResponse = orderSdkAdapter.convent2NEWOrderInfoReqs(orderInfoReqsBaseResponse); CreateOrderResponse createOrderResponse = orderSdkAdapter.convent2NEWOrderInfoReqs(orderInfoReqsBaseResponse);
if(createOrderResponse == null || createOrderResponse.getErrcode() != 100){
return ResponseUtil.error(ResponseResult.ORDER_CREATE_ERROR);
}
//创建支付 //创建支付
CreatePrepayRequestDto createPrepayRequestDto = new CreatePrepayRequestDto(); CreatePrepayRequestDto createPrepayRequestDto = new CreatePrepayRequestDto();
createPrepayRequestDto.setPartnerId(partnerId); createPrepayRequestDto.setPartnerId(partnerId);
...@@ -155,8 +156,6 @@ public class SellCouponOrderServiceImpl { ...@@ -155,8 +156,6 @@ public class SellCouponOrderServiceImpl {
createPrepayRequestDto.setCardAmount(0); createPrepayRequestDto.setCardAmount(0);
OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto(); OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
String deliveryHoursDayStart = ""; String deliveryHoursDayStart = "";
String deliveryHoursDayEnd = ""; String deliveryHoursDayEnd = "";
if (StringUtils.isNotBlank(storeResponseDto.getDeliveryHoursDay())) { if (StringUtils.isNotBlank(storeResponseDto.getDeliveryHoursDay())) {
......
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