6位取餐码添加打印日志

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -90,6 +90,7 @@ import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
 import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest;
@@ -446,15 +447,14 @@ public class OrderServiceImpl implements Orderservice {
         //更新取餐码
         String pickUpGoodNo = orderAdapter.generateTackCode(orderBean.getCompanyId(), orderBean.getShopId());
         BaseResponse baseResponse = updatePickUpGoodNo(pickUpGoodNo,orderBean,wxappid);
-        log.info("pickUpGoodNo>baseResponse,{}",baseResponse);
         if(baseResponse.getCode().equalsIgnoreCase(ResponseResult.SUCCESS.getCode())){
             payAccessResponse.getData().setTakeCode(pickUpGoodNo);
         }
-        log.info("pickUpGoodNo>payAccessResponse.getData(),{}",payAccessResponse.getData());
         // TODO 订单序号替换取餐码显示
         takeCode = payAccessResponse.getData().getTakeCode();
         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);
@@ -471,6 +471,8 @@ 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);
@@ -492,6 +494,8 @@ 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);
@@ -505,6 +509,8 @@ 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();
@@ -2962,14 +2968,10 @@ public class OrderServiceImpl implements Orderservice {
         List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = orderAdapter.cacheSelectDefaultPage(appId, "2");
         Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
         AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get("mealCodeRule");
-        log.info("orderBean,partnerWxappConfigs：{},{}",orderBean.getOid(),JsonUtil.toJSONString(partnerWxappConfigs));
         if(null != refundDeliveryFeeConfig) {
-            log.info("orderBean.getOid(),refundDeliveryFeeConfig：{},{}",orderBean.getOid(),refundDeliveryFeeConfig);
             String mealCodeRule = refundDeliveryFeeConfig.getAppValue();
-            log.info("orderBean.getOid(),mealCodeRule：{},{}",orderBean.getOid(),mealCodeRule);
-            log.info("!StringUtils.isEmpty(mealCodeRule) {}",!StringUtils.isEmpty(mealCodeRule) );
-            log.info("\"2\".equalsIgnoreCase(mealCodeRule) {}","2".equalsIgnoreCase(mealCodeRule));
             if (!StringUtils.isEmpty(mealCodeRule) && "2".equalsIgnoreCase(mealCodeRule)) {
+                log.info("orderBean,partnerWxappConfigs：{},{}",orderBean.getOid(),JsonUtil.toJSONString(partnerWxappConfigs));
                 //更新db中的取餐码,生成取餐码
                 OrderModifyRelatingCodeReq relatingCodeReq = new OrderModifyRelatingCodeReq();
                 relatingCodeReq.setOrderCode(orderBean.getOid());
@@ -2981,6 +2983,8 @@ public class OrderServiceImpl implements Orderservice {
                 if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
                     return ResponseUtil.error(ResponseResult.ACTIVITY_QUERY_ERROR.ORDER_PICK_UP_GOOD_NO);
                 }
+            }else{
+                log.error("mealCodeRule值为:{}",mealCodeRule);
             }
         }
         return ResponseUtil.success();