取餐码转移至聚合层

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java

@@ -72,7 +72,7 @@ public class ConfirmOrderRequest extends BaseConfig {
      */
     private String mealCodeRule;
 
-    private String tackCode;
+    private String pickUpGoodsNo;
 
     /**
      * 团号

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -291,7 +291,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setCompleteOrderCode(confirmOrderRequest.getCompleteOrderCode());
         request.setOrderCode(confirmOrderRequest.getOrderId());
         request.setMealCodeRule(confirmOrderRequest.getMealCodeRule());
-        request.setTackCode(confirmOrderRequest.getTackCode());
+        request.setPickUpGoodsNo(confirmOrderRequest.getPickUpGoodsNo());
         // 引入门店基础服务 查询自动制作完成配置时间，预约单单独超时任务设置
         request.setTimeout(getPaySuccessTimeout(confirmOrderRequest,request));
 

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

@@ -542,8 +542,8 @@ public class OrderServiceImpl implements Orderservice {
         if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(partnerId)) {
             var1.setNotAutomaticTwistTime(notAutomaticTwistTime);
         }
-        String tackCodeNew = orderTackCodeManager.generateTackCode(orderBean.getType(),partnerId,storeId,var1,OrderTackCodeFactory.getByOrderClient(orderBean.getOrderClient()).getGenerateTackCodeFunc());
-        var1.setTackCode(tackCodeNew);
+        String pickUpGoodsNo = orderTackCodeManager.generateTackCode(orderBean.getType(),partnerId,storeId,var1,OrderTackCodeFactory.getByOrderClient(orderBean.getOrderClient()).getGenerateTackCodeFunc());
+        var1.setPickUpGoodsNo(pickUpGoodsNo);
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);
         String string2 = JSONObject.toJSONString(payAccessRes);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/PaySuccessReq.java

@@ -56,7 +56,8 @@ public class PaySuccessReq {
     //取餐码生成规则
     private String mealCodeRule;
 
-    private String tackCode;
+    //取餐码
+    private String pickUpGoodsNo;
 
     //订单拓展表字段-团号
     private String spellGroupCode;