Commit 66ae34f9 by zhiheng.zhang

6位取餐码添加打印日志

parent bc3b0615
...@@ -447,9 +447,11 @@ public class OrderServiceImpl implements Orderservice { ...@@ -447,9 +447,11 @@ public class OrderServiceImpl implements Orderservice {
//更新取餐码 //更新取餐码
String pickUpGoodNo = orderAdapter.generateTackCode(orderBean.getCompanyId(), orderBean.getShopId()); String pickUpGoodNo = orderAdapter.generateTackCode(orderBean.getCompanyId(), orderBean.getShopId());
BaseResponse baseResponse = updatePickUpGoodNo(pickUpGoodNo,orderBean,wxappid); BaseResponse baseResponse = updatePickUpGoodNo(pickUpGoodNo,orderBean,wxappid);
log.info("===="+baseResponse.getCode());
if(baseResponse.getCode().equalsIgnoreCase(ResponseResult.SUCCESS.getCode())){ if(baseResponse.getCode().equalsIgnoreCase(ResponseResult.SUCCESS.getCode())){
payAccessResponse.getData().setTakeCode(pickUpGoodNo); payAccessResponse.getData().setTakeCode(pickUpGoodNo);
} }
log.info("====payAccessResponse.getData().getTakeCode():"+payAccessResponse.getData().getTakeCode());
// TODO 订单序号替换取餐码显示 // TODO 订单序号替换取餐码显示
takeCode = payAccessResponse.getData().getTakeCode(); takeCode = payAccessResponse.getData().getTakeCode();
daySeq = payAccessResponse.getData().getDaySeq(); daySeq = payAccessResponse.getData().getDaySeq();
...@@ -464,6 +466,8 @@ public class OrderServiceImpl implements Orderservice { ...@@ -464,6 +466,8 @@ public class OrderServiceImpl implements Orderservice {
newShoppingCartClearDto.setSessionId(sessionId); newShoppingCartClearDto.setSessionId(sessionId);
newShoppingCartClearDto.setOperationType(1); newShoppingCartClearDto.setOperationType(1);
shoppingCartClient.clearShoppingCart(newShoppingCartClearDto); shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
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())) { if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : ""; String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : "";
orderBean.setAddress(storeAddress); orderBean.setAddress(storeAddress);
...@@ -2971,14 +2975,12 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2971,14 +2975,12 @@ public class OrderServiceImpl implements Orderservice {
if(null != refundDeliveryFeeConfig) { if(null != refundDeliveryFeeConfig) {
String mealCodeRule = refundDeliveryFeeConfig.getAppValue(); String mealCodeRule = refundDeliveryFeeConfig.getAppValue();
if (!StringUtils.isEmpty(mealCodeRule) && "2".equalsIgnoreCase(mealCodeRule)) { if (!StringUtils.isEmpty(mealCodeRule) && "2".equalsIgnoreCase(mealCodeRule)) {
log.info("orderBean,partnerWxappConfigs:{},{}",orderBean.getOid(),JsonUtil.toJSONString(partnerWxappConfigs));
//更新db中的取餐码,生成取餐码 //更新db中的取餐码,生成取餐码
OrderModifyRelatingCodeReq relatingCodeReq = new OrderModifyRelatingCodeReq(); OrderModifyRelatingCodeReq relatingCodeReq = new OrderModifyRelatingCodeReq();
relatingCodeReq.setOrderCode(orderBean.getOid()); relatingCodeReq.setOrderCode(orderBean.getOid());
relatingCodeReq.setOperator(orderBean.getCreateUser()); relatingCodeReq.setOperator(orderBean.getCreateUser());
relatingCodeReq.setPartnerId(orderBean.getCompanyId()); relatingCodeReq.setPartnerId(orderBean.getCompanyId());
relatingCodeReq.setPickUpGoodsNo(pickUpGoodNo); relatingCodeReq.setPickUpGoodsNo(pickUpGoodNo);
log.info("relatingCodeReq:{}", relatingCodeReq);
BaseOrderResponse baseOrderResponse = orderCenterSdkService.updatePickUpGoodNo(relatingCodeReq, LogThreadLocal.getTrackingNo()); BaseOrderResponse baseOrderResponse = orderCenterSdkService.updatePickUpGoodNo(relatingCodeReq, LogThreadLocal.getTrackingNo());
if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) { if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
return ResponseUtil.error(ResponseResult.ACTIVITY_QUERY_ERROR.ORDER_PICK_UP_GOOD_NO); return ResponseUtil.error(ResponseResult.ACTIVITY_QUERY_ERROR.ORDER_PICK_UP_GOOD_NO);
......
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