早餐随心配套餐名称

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

@@ -113,7 +113,13 @@ public class DeliveryAdapter {
         deliveryOrderRequestDto.setDepatchWeight(order.getWeight());
         //deliveryOrderRequestDto.setSerialNumber(order.getOtherCode());
         deliveryOrderRequestDto.setOrderId(order.getOid());
-        deliveryOrderRequestDto.setOrderRemark(order.getRemark());
+        JSONObject json = JSON.parseObject(order.getExtInfo());
+        String needTableWare = json.getString("needTableware");
+        if("0".equals(needTableWare)) {
+            deliveryOrderRequestDto.setOrderRemark("无需餐具（刀、叉、勺），"+order.getRemark());
+        } else {
+            deliveryOrderRequestDto.setOrderRemark("需要餐具（刀、叉、勺），"+order.getRemark());
+        }
         deliveryOrderRequestDto.setOrderTotalAmount(order.getAmount().intValue());
         deliveryOrderRequestDto.setOrderActualAmount(order.getAmount().intValue());
         deliveryOrderRequestDto.setPartnerId(order.getCompanyId());

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -137,6 +137,10 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode,goodsId);
         CartGoods addCartGoods = convent2CartGoods(addShoppingCartGoodsRequestVo, goodsId);
         setClassificationAndPrice(addCartGoods, productBeanListSpuClass);
+        if(StringUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getGroupName())) {
+            addCartGoods.setSkuName(addShoppingCartGoodsRequestVo.getGroupName());
+            addCartGoods.setSpuName(addShoppingCartGoodsRequestVo.getGroupName());
+        }
         //查询多个商品库存信息
 //        Integer checkQty = this.checkSkuQty(oldCartGoodsList, addCartGoods);
 //        queryManyGoodsStocks(partnerId, storeId, menuType, productIds, productBeanListSpuClass, skuId, checkQty);

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/MCoffeeAddGoodsRequestVo.java

@@ -112,4 +112,9 @@ public class MCoffeeAddGoodsRequestVo {
      */
     private String couponCode;
 
+    /**
+     * 套餐名称
+     */
+    private String groupName;
+
 }