Merge branch 'feature/1.9.10-购物车接口修改渠道字段-海波'

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

@@ -751,6 +751,7 @@ public class OrderSdkAdapter {
         data.setShopId(orderInfoReqs.getStoreId());
         data.setShopName(orderInfoReqs.getStoreName());
         data.setOid(orderInfoReqs.getOrderCode());
+        data.setOrderType(getOldOrderType(orderInfoReqs.getOrderType()));
         data.setAmount(orderInfoReqs.getSettlementAmount() == null ? 0L : orderInfoReqs.getSettlementAmount().longValue());
         data.setUserId(orderInfoReqs.getUserId());
         data.setUserName(orderInfoReqs.getUserName());
@@ -1361,8 +1362,7 @@ public class OrderSdkAdapter {
         updateStocksRequest.setIsOversold(0);
         updateStocksRequest.setPartnerId(orderBean.getCompanyId());
         updateStocksRequest.setStoreId(orderBean.getShopId());
-        String transNo = UUID.randomUUID().toString().replaceAll("-", "");
-        updateStocksRequest.setTransNo(transNo);
+        updateStocksRequest.setTransNo(orderBean.getOid());
         updateStocksRequest.setTransTime(DateUtil.convert2String(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
         List<ProductStocksVO> productStocks = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(products)) {

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

@@ -502,7 +502,7 @@ public class OrderAdapter {
         createOrderDto.setAmount(0L);
         createOrderDto.setBarCounter(createOrderVo.getTableNumber());
         createOrderDto.setOperator(createOrderVo.getUserName());
-        createOrderDto.setMenuType(BusinessTypeEnum.getByCode(createOrderDto.getMenuType()));
+        createOrderDto.setMenuType(BusinessTypeEnum.getByCode(createOrderVo.getMenuType()));
         return createOrderDto;
     }