修复小票打印订单打包费单独计算问题

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

@@ -56,7 +56,7 @@ public enum eOrderTypeExtra {
     public static String stringOf(Integer value) {
         switch (value) {
             case 0:
-                return "到店堂食";
+                return "到店堂食（不打包）";
             case 1:
                 return "到店取餐";
             case 2:

src/main/java/com/sqx/modules/utils/fieYun/FeiYunUtils.java

@@ -5,23 +5,29 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sqx.common.utils.Result;
 import com.sqx.modules.activity.service.ActivityService;
 import com.sqx.modules.activity.vo.ActivityOrderVO;
-import com.sqx.modules.activity.vo.ActivityVO;
 import com.sqx.modules.app.entity.UserEntity;
 import com.sqx.modules.app.service.UserService;
 import com.sqx.modules.common.service.CommonInfoService;
 import com.sqx.modules.coupon.entity.TbCoupon;
-import com.sqx.modules.coupon.entity.TbCouponUser;
 import com.sqx.modules.coupon.service.TbCouponService;
 import com.sqx.modules.goods.entity.GoodsShop;
 import com.sqx.modules.goods.service.GoodsShopService;
 import com.sqx.modules.order.entity.OrderGoods;
 import com.sqx.modules.order.entity.TbOrder;
 import com.sqx.modules.order.service.AppOrderService;
-import com.sqx.modules.printInfo.entity.*;
+import com.sqx.modules.printInfo.entity.PrintInfo;
+import com.sqx.modules.printInfo.entity.PrintInfoDetail;
+import com.sqx.modules.printInfo.entity.PrintInfoShop;
+import com.sqx.modules.printInfo.entity.PrintModelDetailResult;
+import com.sqx.modules.printInfo.entity.PrintModelResult;
+import com.sqx.modules.printInfo.entity.PrintModelTypeResult;
+import com.sqx.modules.printInfo.entity.eOrderStatus;
+import com.sqx.modules.printInfo.entity.eOrderTypeExtra;
+import com.sqx.modules.printInfo.entity.ePrintStatu;
+import com.sqx.modules.printInfo.entity.eWordSize;
 import com.sqx.modules.printInfo.service.PrintInfoDetailService;
 import com.sqx.modules.printInfo.service.PrintInfoService;
 import com.sqx.modules.printInfo.service.PrintInfoShopService;
-import com.sqx.modules.utils.fieYun.model.OrderForm;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.StringUtils;
@@ -990,12 +996,10 @@ public class FeiYunUtils {
                 stringBuilder.append("<BR>");
 
                 stringBuilder.append("--------------------------------<BR>");
-                BigDecimal packMoney = BigDecimal.ZERO;
+                BigDecimal packMoney = tbOrder.getPackMoney();
                 BigDecimal goodsMoney = BigDecimal.ZERO;
                 for (OrderGoods orderGoods : orderGoodsList) {
                     BigDecimal sumMoney = orderGoods.getGoodsPrice().multiply(BigDecimal.valueOf(orderGoods.getGoodsNum()));
-                    BigDecimal sumPack = orderGoods.getGoodsPack().multiply(BigDecimal.valueOf(orderGoods.getGoodsNum()));
-                    packMoney = packMoney.add(sumPack);
                     goodsMoney = goodsMoney.add(sumMoney);
                     String name;
                     if (StringUtils.isNotEmpty(orderGoods.getSkuMessage())) {