新增到店堂食额外订单类型，同步调整打包费、打印逻辑

src/main/java/com/sqx/modules/order/entity/TbOrder.java

@@ -66,7 +66,7 @@ public class TbOrder implements Serializable {
     @ApiModelProperty("订单类型 1上门 2外卖")
     private Integer orderType;
 
-    @ApiModelProperty("订单类型拓展 1上门 2骑手配送 3商家配送")
+    @ApiModelProperty("订单类型拓展 0上门堂食 1上门打包 2骑手配送 3商家配送")
     private Integer orderTypeExtra;
 
     @ApiModelProperty("订单父id")

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -561,8 +561,10 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             } else {
                 order.setOrderTypeExtra(2);
             }
-        } else {
-            order.setOrderTypeExtra(1);
+        }
+        // 其他 到店订单
+        else {
+            order.setOrderTypeExtra(payOrderDTO.getPackType());
         }
 
         // 骑手配送订单
@@ -1219,7 +1221,12 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
                 OrderGoods orderGoods = orderGoodsList.get(a);
                 BigDecimal goodsNum = new BigDecimal(orderGoods.getGoodsNum());
                 BigDecimal goodsPrice = orderGoods.getGoodsPrice();
-                BigDecimal goodsPacks = orderGoods.getGoodsPack();
+
+                // orderTypeExtra不为0时需要计算打包费，为0时不计算打包费
+                BigDecimal goodsPacks = BigDecimal.valueOf(0);
+                if (parentOrder.getOrderTypeExtra() != 0) {
+                    goodsPacks = orderGoods.getGoodsPack();
+                }
 
                 // 当前子订单总打包费
                 BigDecimal sumGoodsPack = goodsNum.multiply(goodsPacks);

src/main/java/com/sqx/modules/pay/dto/PayOrderDTO.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
@@ -34,6 +36,12 @@ public class PayOrderDTO {
     @NotNull(message = "订单类型不能为空")
     private Integer orderType;
 
+    @ApiModelProperty("打包类型 0堂食 1打包")
+    @NotNull(message = "打包类型不能为空")
+    @Max(value = 1, message = "打包类型只能为0或1")
+    @Min(value = 0, message = "打包类型只能为0或1")
+    private Integer packType;
+
     @ApiModelProperty("活动id")
     private Long activityId;
 

src/main/java/com/sqx/modules/printInfo/entity/eOrderTypeExtra.java

@@ -55,6 +55,8 @@ public enum eOrderTypeExtra {
 
     public static String stringOf(Integer value) {
         switch (value) {
+            case 0:
+                return "到店堂食";
             case 1:
                 return "到店取餐";
             case 2: