添加取餐码返回

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -158,6 +158,7 @@ public enum ResponseResult {
     ORDER_MEALTIME_MISSING("450063", "你的取餐方式或取餐时间异常，请重新选择!"),
     ORDER_TAKE_OUT_TIME_ERROR("450062", "你的外卖送达时间异常，请重新选择！"),
     ORDER_TAKE_OUT_ADDRESS_NOT_VALID("45063", "收货地址校验失败"),
+    ORDER_PICK_UP_GOOD_NO("45064", "更新取餐码失败"),
 
     /**
      * 支付

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

@@ -444,12 +444,15 @@ public class OrderServiceImpl implements Orderservice {
             return gson.toJson(message);
         }
         //更新取餐码
-        updatePickUpGoodNo(orderBean,wxappid);
+        String pickUpGoodNo = orderAdapter.generateTackCode(orderBean.getCompanyId(), orderBean.getShopId());
+        BaseResponse baseResponse = updatePickUpGoodNo(pickUpGoodNo,orderBean,wxappid);
+        if(baseResponse.getCode().equalsIgnoreCase(ResponseResult.SUCCESS.getCode())){
+            payAccessResponse.getData().setTakeCode(pickUpGoodNo);
+        }
         // TODO 订单序号替换取餐码显示
         takeCode = payAccessResponse.getData().getTakeCode();
         daySeq = payAccessResponse.getData().getDaySeq();
 
-
         //TODO 清空购物车
         NewShoppingCartClearDto newShoppingCartClearDto = new NewShoppingCartClearDto();
         newShoppingCartClearDto.setPartnerId(partnerId);
@@ -2953,8 +2956,7 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.success(responses.getData());
     }
 
-    public void updatePickUpGoodNo(OrderBean orderBean,String appId){
-        try {
+    public BaseResponse updatePickUpGoodNo(String pickUpGoodNo,OrderBean orderBean,String appId){
         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");
@@ -2967,13 +2969,14 @@ public class OrderServiceImpl implements Orderservice {
                 relatingCodeReq.setOrderCode(orderBean.getOid());
                 relatingCodeReq.setOperator(orderBean.getCreateUser());
                 relatingCodeReq.setPartnerId(orderBean.getCompanyId());
-                    relatingCodeReq.setPickUpGoodsNo(orderAdapter.generateTackCode(orderBean.getCompanyId(), orderBean.getShopId()));
+                relatingCodeReq.setPickUpGoodsNo(pickUpGoodNo);
                 log.info("====relatingCodeReq：{}", relatingCodeReq);
-                    orderCenterSdkService.updatePickUpGoodNo(relatingCodeReq, LogThreadLocal.getTrackingNo());
+                BaseOrderResponse baseOrderResponse = orderCenterSdkService.updatePickUpGoodNo(relatingCodeReq, LogThreadLocal.getTrackingNo());
+                if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseOrderResponse.getErrcode().toString())) {
+                    return ResponseUtil.error(ResponseResult.ACTIVITY_QUERY_ERROR.ORDER_PICK_UP_GOOD_NO);
                 }
             }
-        }catch (Exception e){
-            log.error("===更新取餐码失败，createPrepayRequestDto,partnerWxappConfigs,appId：{},{},{}--->", e,JsonUtil.toJSONString(orderBean),appId);
         }
+        return ResponseUtil.success();
     }
 }