app下单修改

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

@@ -132,9 +132,11 @@ public class AppOrderServiceImpl implements AppOrderService {
         // 查询门店信息 营业时间、营业状态，服务器当前时间在营业时间内 点餐桌号
         checkOrder.checkOrderByStore(storeResponse.getBizVO(),createOrderReq.getTakeMealTime());
         // 查商品服务确定金额
-        ShoppingCartGoodsDto shoppingCartGoodsDto = checkOrderProduct(partnerId,shopId,createOrderReq.getOrderProducts(),createOrderReq.getMenuType());
+        ShoppingCartGoodsDto shoppingCartGoodsDto = checkOrderProduct(partnerId,shopId,createOrderReq.getOrderProducts(),
+                createOrderReq.getMenuType(),createOrderReq.getReachStoreType());
         CreateOrderVo createOrderVo = new CreateOrderVo();
         BeanUtil.convertBean(createOrderReq,createOrderVo);
+        createOrderVo.setStoreName(storeResponse.getBizVO().getStoreName());
         // 查询小程序自提外卖配置信息 校验当前订单类型的下单参数 校验外卖是否满足起送条件
         Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, customerInfo, storeResponse.getBizVO(),shoppingCartGoodsDto.getTotalAmount(), trackingNo);
         //1.5.4版本，商品库存校验与扣库存
@@ -248,7 +250,8 @@ public class AppOrderServiceImpl implements AppOrderService {
     /**
      * 查询商品信息
      */
-    public ShoppingCartGoodsDto checkOrderProduct(String partnerId, String shopId, List<OrderProductVo> orderProducts, String menuType) {
+    public ShoppingCartGoodsDto checkOrderProduct(String partnerId, String shopId, List<OrderProductVo> orderProducts,
+                                                  String menuType,Integer reachStoreType) {
         ShoppingCartGoodsDto shoppingCartGoodsDto = new ShoppingCartGoodsDto();
 
 
@@ -313,12 +316,14 @@ public class AppOrderServiceImpl implements AppOrderService {
                         cartGoodsDetailDto.setUnit(productBeanDTO.getUnit());
 
                         List<ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra> extraList = new ArrayList<>();
+                        if(CollectionUtils.isNotEmpty(op.getExtra())){
                             for (OrderProductExtraVo orderProductExtraVo : op.getExtra()) {
                                 ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra cartGoodsExtra = new ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra();
                                 cartGoodsExtra.setAttributeId(orderProductExtraVo.getAttributeId());
                                 cartGoodsExtra.setAttributeName(orderProductExtraVo.getAttributeName());
                                 extraList.add(cartGoodsExtra);
                             }
+                        }
                         cartGoodsDetailDto.setExtraList(extraList);
                         cartGoodsDetailDto.setActivityDiscountsDtos(null);
                         cartGoodsDetailDto.setComboProducts(null);
@@ -359,12 +364,14 @@ public class AppOrderServiceImpl implements AppOrderService {
                         cartGoodsDetailDto.setUnit(productBeanDTO.getUnit());
 
                         List<ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra> extraList = new ArrayList<>();
+                        if(CollectionUtils.isNotEmpty(op.getExtra())){
                             for (OrderProductExtraVo orderProductExtraVo : op.getExtra()) {
                                 ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra cartGoodsExtra = new ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra();
                                 cartGoodsExtra.setAttributeId(orderProductExtraVo.getAttributeId());
                                 cartGoodsExtra.setAttributeName(orderProductExtraVo.getAttributeName());
                                 extraList.add(cartGoodsExtra);
                             }
+                        }
                         cartGoodsDetailDto.setExtraList(extraList);
                         cartGoodsDetailDto.setActivityDiscountsDtos(null);
                         cartGoodsDetailDto.setComboProducts(null);
@@ -384,8 +391,10 @@ public class AppOrderServiceImpl implements AppOrderService {
         shoppingCartGoodsDto.setOriginalTotalAmount(originalTotalAmount);
         shoppingCartGoodsDto.setTotalAmount(totalAmount);
 //        shoppingCartGoodsDto.setTotalDiscountAmount(0L);
+        //堂食无包装费
+        if(reachStoreType != null && reachStoreType != 5){
             shoppingCartGoodsDto.setPackageAmount(packageAmount);
-
+        }
         //积分抵扣
         shoppingCartGoodsDto.setScoreReduceAmount(0L);
         shoppingCartGoodsDto.setReduceScore(0L);