Commit 92a6db7c by zhiheng.zhang

取餐码更新位置调整

parent 037696dd
......@@ -445,8 +445,6 @@ public class OrderServiceImpl implements Orderservice {
return gson.toJson(message);
}
daySeq = payAccessResponse.getData().getDaySeq();
QueryByCodeResponse queryByCodeResponse33 = orderSdkService.getOrderInfo(orderBean.getOid(),0,LogTreadLocal.getTrackingNo());
log.info("queryByCodeResponse33.getResult():{}",queryByCodeResponse33.getResult());
//TODO 清空购物车
NewShoppingCartClearDto newShoppingCartClearDto = new NewShoppingCartClearDto();
newShoppingCartClearDto.setPartnerId(partnerId);
......@@ -462,11 +460,9 @@ public class OrderServiceImpl implements Orderservice {
if(baseResponse.getCode().equalsIgnoreCase(ResponseResult.SUCCESS.getCode())){
payAccessResponse.getData().setTakeCode(pickUpGoodNo);
}
log.info("====payAccessResponse.getData().getTakeCode():"+payAccessResponse.getData().getTakeCode());
log.info("====payAccessResponse.getData().getTakeCode()-->orderCode:{},{}"+payAccessResponse.getData().getTakeCode(),orderBean.getOid());
// TODO 订单序号替换取餐码显示
takeCode = payAccessResponse.getData().getTakeCode();
QueryByCodeResponse queryByCodeResponse44 = orderSdkService.getOrderInfo(orderBean.getOid(),0,LogTreadLocal.getTrackingNo());
log.info("queryByCodeResponse44.getResult():{}",queryByCodeResponse44.getResult());
if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : "";
orderBean.setAddress(storeAddress);
......@@ -474,8 +470,6 @@ public class OrderServiceImpl implements Orderservice {
//发送支付成功模板消息
this.sendPaySuccessMessage(orderBean);
}
QueryByCodeResponse queryByCodeResponse11 = orderSdkService.getOrderInfo(orderBean.getOid(),0,LogTreadLocal.getTrackingNo());
log.info("queryByCodeResponse11.getResult():{}",queryByCodeResponse11.getResult());
// 有云打印机 打印小票,杯贴
try {
List<AssortmentCloudPrinter> storePrinters = cloudPrinterManager.getStorePrinters(partnerId, storeId);
......@@ -497,8 +491,6 @@ public class OrderServiceImpl implements Orderservice {
} catch (Exception e) {
LogUtil.error("cloudPrint_error", null, null, e);
}
QueryByCodeResponse queryByCodeResponse22 = orderSdkService.getOrderInfo(orderBean.getOid(),0,LogTreadLocal.getTrackingNo());
log.info("queryByCodeResponse22.getResult():{}",queryByCodeResponse11.getResult());
//TODO 埋点支付行为
BuriedPointPaymentRequestDto requestDto = new BuriedPointPaymentRequestDto();
requestDto.setStoreId(storeId);
......@@ -512,8 +504,6 @@ public class OrderServiceImpl implements Orderservice {
if (StringUtils.isNotBlank(ruleId)) {
this.activateMemberCard(partnerId, ruleId, oid, userId, storeId, orderBean.getShopName());
}
QueryByCodeResponse queryByCodeResponse = orderSdkService.getOrderInfo(orderBean.getOid(),0,LogTreadLocal.getTrackingNo());
log.info("queryByCodeResponse.getResult():{}",queryByCodeResponse.getResult());
//支付回掉成功标记
redisCache.save(RedisKeyConstant.KGD_PAYMENT_CALLBACK_FMID + message.getOut_trade_no(), message.getOut_trade_no(), 10L, TimeUnit.MINUTES);
return sendPaySuccessNoticeMessage();
......
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