升级SDK

assortment-ordercenter-sdk/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>3.5.RELEASE</version>
+            <version>5.4.4-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderAssortmentDtoConvertToDMVoAdapter.java

@@ -34,11 +34,13 @@ public class OrderAssortmentDtoConvertToDMVoAdapter {
     public static DMOrderItemVo convertCreateOrderProductRequest(CreateOrderProductRequest createOrderProductRequest){
         DMOrderItemVo dmOrderItemVo=new DMOrderItemVo();
         dmOrderItemVo.setAddInfo(createOrderProductRequest.getAddInfo());
+        dmOrderItemVo.setForeignAddInfo(createOrderProductRequest.getForeignAddInfo());
         dmOrderItemVo.setCategoryId(createOrderProductRequest.getCategoryId());
         dmOrderItemVo.setCategoryName(createOrderProductRequest.getCategoryName());
         dmOrderItemVo.setCustomerCode(createOrderProductRequest.getCustomerCode());
         dmOrderItemVo.setDiscountId(createOrderProductRequest.getDiscountId());
         dmOrderItemVo.setExtras(createOrderProductRequest.getExtras());
+        dmOrderItemVo.setForeignExtras(createOrderProductRequest.getForeignExtras());
         dmOrderItemVo.setHasStockProduct(createOrderProductRequest.getHasStockProudct());
         dmOrderItemVo.setWeight(createOrderProductRequest.getWeight());
         dmOrderItemVo.setUnit(createOrderProductRequest.getUnit());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2749,9 +2749,11 @@ public class OrderSdkAdapter {
         orderItemCreateReq.setId(product.getId());
         orderItemCreateReq.setPartnerId(partnerId);
         orderItemCreateReq.setProductName(product.getProductName());
+        orderItemCreateReq.setProductForeignName(product.getProductForeignName());
         orderItemCreateReq.setProductId(product.getProductId());
         orderItemCreateReq.setProductSpec(product.getSpecification());
         orderItemCreateReq.setProductSpecName(product.getSpecificationName());
+        orderItemCreateReq.setProductForeignSpecName(product.getSpecificationForeignName());
         orderItemCreateReq.setProductSeq(product.getOpid());
         orderItemCreateReq.setProductQuantity(product.getNumber());
         orderItemCreateReq.setProductPrice(product.getPrice());
@@ -2789,7 +2791,7 @@ public class OrderSdkAdapter {
                     Long setmealTotalSettlementPrice = 0L;
                     for (CreateOrderProductRequest createOrderProductRequest : product.getComboProduct()) {
                         // 删除的不计算在内
-                        if(createOrderProductRequest.getIsDeleted() != null && createOrderProductRequest.getIsDeleted()) {
+                         if(createOrderProductRequest.getIsDeleted() != null && createOrderProductRequest.getIsDeleted()) {
                             continue;
                         }
                         Long comboProductTotalDiscountAmount = createOrderProductRequest.getTotalDiscountAmount() == null ? 0L : createOrderProductRequest.getTotalDiscountAmount();
@@ -2822,6 +2824,7 @@ public class OrderSdkAdapter {
         OrderProductAddInfoDto addInfo = JSONObject.parseObject(product.getAddInfo(), OrderProductAddInfoDto.class);
         if (addInfo !=null ) {
             orderItemCreateReq.setProductProperty(addInfo.getAttributeNames());
+            orderItemCreateReq.setProductForeignProperty(addInfo.getAttributeForeignNames());
         }
         orderItemCreateReq.setProductPicUrl(product.getPicture());
         orderItemCreateReq.setThirdProductId(product.getCustomerCode());
@@ -2988,13 +2991,17 @@ public class OrderSdkAdapter {
         CreateOrderProductRequest createOrderProductRequest = new CreateOrderProductRequest();
         createOrderProductRequest.setProductCode(productBean.getProductCode());
         createOrderProductRequest.setProductName(productBean.getProductName());
+        createOrderProductRequest.setProductForeignName(productBean.getProductForeignName());
         createOrderProductRequest.setNumber(productBean.getNumber());
         createOrderProductRequest.setParentProductId(productBean.getParentProductId());
         createOrderProductRequest.setTrackingNo(trackingNo);
         createOrderProductRequest.setAddInfo(productBean.getAddInfo());
+        createOrderProductRequest.setForeignAddInfo(productBean.getForeignAddInfo());
         createOrderProductRequest.setProductId(productBean.getProductId());
         createOrderProductRequest.setSpecification(productBean.getSpecification());
         createOrderProductRequest.setSpecificationName(productBean.getSpecificationName());
+        createOrderProductRequest.setSpecificationForeignName(productBean.getSpecificationName());
+
         createOrderProductRequest.setCustomerCode(productBean.getCustomerCode());
         createOrderProductRequest.setSequence(productBean.getSequence());
         createOrderProductRequest.setPrice(productBean.getPrice());

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

@@ -86,10 +86,14 @@ public class CreateOrderProductRequest extends BaseConfig {
      * 属性 温|半糖|甜
      */
     private String addInfo;
+
+    private String foreignAddInfo;
     /**
      * 属性
      */
     private String extras;
+    private String foreignExtras;
+
     /**
      * 第三方菜品分类Id
      */

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

@@ -27,6 +27,11 @@ public class OrderProductAddInfoDto extends BaseConfig {
     private String attributeNames;
 
     /**
+     * 属性英文名称 多糖/冷/常温
+     */
+    private String attributeForeignNames;
+
+    /**
      * 是否是套餐内固定商品
      */
     private Boolean isFixedProduct;

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

@@ -19,6 +19,10 @@ public class OrderSpecialExtraAttrRequest {
      */
     private String attributeName;
     /**
+     * 属性英文名
+     */
+    private String attributeForeignName;
+    /**
      * 入机code
      */
     private String specialCode;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -560,6 +560,10 @@ public class QueryOrdersResponse {
                  */
                 private String productName;
                 /**
+                 * 商品英文名称
+                 */
+                private String productForeignName;
+                /**
                  * 商品排序
                  */
                 private int sequence;
@@ -568,16 +572,20 @@ public class QueryOrdersResponse {
                  */
                 private String specification;
                 private String specificationName;
+                private String specificationForeignName;
                 private String unit;
                 /**
                  * 商品扩展字段 保存为
                  */
                 private String addInfo;
 
+                private String foreignAddInfo;
+
                 /**
                  * 商品属性
                  */
                 private String productProperty;
+                private String productForeignProperty;
 
                 /**
                  * 数据库字段（保存套餐商品是否为固定商品）

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

@@ -1303,7 +1303,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     public OrderDetailResponse updateOrderItem(AssortmentSdkUpdateOrderProductInfoRequest updateOrderProductInfoRequest) {
         QueryOrderByIdResponse queryOrderByIdResponse = null;
         /**
-         * 若先清除再更新先清除现有订单商品信息
+         * 若先清除再更新 先清除现有订单商品信息
          */
         if (AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.deleteAndUpdate == updateOrderProductInfoRequest.getOpUpdateOrderItemEnum()) {
             this.orderSdkService.clearGroupOrder(this.orderSdkAdapter.convertAssortmentSdkUpdateOrderProductInfoRequestTo(updateOrderProductInfoRequest), updateOrderProductInfoRequest.getTrackingNo());

order-application-service/pom.xml

@@ -125,7 +125,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.2.7.RELEASE</version>
+            <version>5.4.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2481,7 +2481,6 @@ public class OrderAdapter {
         createOrderProductDemoDto.setSpecification(cartGoodsDetailDto.getSkuId());
         createOrderProductDemoDto.setSpecificationName(cartGoodsDetailDto.getSkuName());
         createOrderProductDemoDto.setSpecificationForeignName(cartGoodsDetailDto.getSkuForeignName());
-
         createOrderProductDemoDto.setPrice(cartGoodsDetailDto.getOriginalPrice());
         createOrderProductDemoDto.setSalePrice(cartGoodsDetailDto.getOriginalPrice());
         createOrderProductDemoDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount() == null ? 0 : cartGoodsDetailDto.getTotalDiscountAmount().longValue());
@@ -2548,7 +2547,7 @@ public class OrderAdapter {
         if(CollectionUtils.isNotEmpty(cartGoodsDetailDto.getSpecialExtra())) {
             createOrderProductDemoDto.setSpecialAttrs(new ArrayList<>());
             cartGoodsDetailDto.getSpecialExtra().stream().forEach(o -> {
-                createOrderProductDemoDto.getSpecialAttrs().add(new OrderSpecialExtraAttrRequest(o.getAttributeId(), o.getAttributeName(), o.getSpecialCode()));
+                createOrderProductDemoDto.getSpecialAttrs().add(new OrderSpecialExtraAttrRequest(o.getAttributeId(), o.getAttributeName(),o.getAttributeForeignName(), o.getSpecialCode()));
             });
         }
         return createOrderProductDemoDto;

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

@@ -59,6 +59,7 @@ import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -82,6 +83,7 @@ import java.util.stream.Collectors;
  * @Copyright: ${DATE.YARE} www.freemud.cn Inc. All rights reserved.
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
+@Slf4j
 @Service
 public class EncircleOrderServiceImpl implements EncircleOrderService {
 
@@ -142,10 +144,14 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
         storeTableListRequest.setStoreCode(createOrderVo.getShopId());
         storeTableListRequest.setTableCode(assortmentCustomerInfoVo.getTableNumber());
         com.freemud.application.sdk.api.base.BaseResponse<GetStoreTableResponse> storeTable = storeCenterService.getStoreTable(storeTableListRequest,LogThreadLocal.getTrackingNo());
+        //activeFlag 是否有效 0无效 1有效
+        //orderState 点餐状态 1开台 2清台
         if(ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(),storeTable.getCode()) || storeTable.getData() == null) return ResponseUtil.error(ResponseResult.STORE_NOT_TABLE_INFO);
         if(storeTable.getData().getActiveFlag() == 0) return ResponseUtil.error(ResponseResult.QUERY_TABLESTATUS_ACTIVEFLAG_ERROR);
-        if(storeTable.getData().getOrderState() == 1) return ResponseUtil.success();
-
+        if(storeTable.getData().getOrderState() == 1) {
+            log.info("门店返回1,已开台");
+            return ResponseUtil.success();
+        }
         /**
          * 尝试获取Redis锁  ==>获取锁失败直接提示用户有人正在开台或桌号已被占用
          * 锁过期时间  24小时

order-application-service/src/main/java/cn/freemud/service/thirdparty/ShoppingCartClient.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-@FeignClient(name = "SHOPPING-CART-APPLICATION-SERVICE",url = "localhost:9211")
+@FeignClient(name = "SHOPPING-CART-APPLICATION-SERVICE",url = "${saas.newshoppingcartclient.feign.url}")
 //@FeignClient(name = "123",url = "http://localhost:9211")
 @RequestMapping(value = "/shoppingCart",produces = {"application/json;charset=UTF-8"})
 public interface ShoppingCartClient {

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

@@ -86,6 +86,9 @@ public class OrderItemCreateReq {
     //商品属性
     private String productProperty;
 
+    //商品英文属性
+    private String productForeignProperty;
+
     //重量
     private Double weight;
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderItemResp.java

@@ -46,6 +46,9 @@ public class OrderItemResp {
     //商品名称
     private String productName;
 
+    //商品英文名称
+    private String productForeignName;
+
     //商品序号
     private Integer productSeq;
 
@@ -54,6 +57,8 @@ public class OrderItemResp {
 
     //商品规格名称
     private String productSpecName;
+    //商品规格英文名称
+    private String productSpecForeignName;
 
     //商品UPC码
     private String productUpc;
@@ -82,6 +87,9 @@ public class OrderItemResp {
     //商品属性
     private String productProperty;
 
+    //商品属性
+    private String productForeignProperty;
+
     //重量
     private BigDecimal weight;
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -705,6 +705,7 @@ public class OrderSdkService {
      * @return
      */
     public QueryByCodeResponse updateGroupOrder(GroupOrderUpdateReq groupOrderAffirmReq, String trackingNo){
+        log.info(JSONArray.toJSONString(groupOrderAffirmReq));
         QueryByCodeResponse queryByCodeResponse = RequestThirdPartyUtils.httpJsonReqComplexNew(this.restTemplate, InterfaceAddressConstant.GROUP_UPDATEORDER, createBaseRequest(groupOrderAffirmReq, trackingNo), new ParameterizedTypeReference<QueryByCodeResponse>() {});
         return queryByCodeResponse;
     }
@@ -716,7 +717,7 @@ public class OrderSdkService {
      * @return
      */
     public BaseResponse<PaySuccessResp> clearGroupOrder(GroupOrderClearReq groupOrderAffirmReq,String trackingNo){
-        StringBuilder urlString = new StringBuilder(InterfaceAddressConstant.GROUP_CLEARITEMS);
+        StringBuilder urlString =   new StringBuilder(InterfaceAddressConstant.GROUP_CLEARITEMS);
         urlString.append("?");
                 if(StringUtils.isNotEmpty(groupOrderAffirmReq.getOrderCode())){
                     urlString.append("&orderCode=")