sdsds

src/main/java/com/sqx/modules/activity/dao/ActivityDao.java

@@ -2,6 +2,7 @@ package com.sqx.modules.activity.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sqx.modules.activity.entity.Activity;
+import com.sqx.modules.activity.vo.ActivityOrderVO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -11,4 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ActivityDao extends BaseMapper<Activity> {
+
+    ActivityOrderVO selectByOrder(Long orderId);
 }

src/main/java/com/sqx/modules/activity/service/ActivityService.java

@@ -6,6 +6,7 @@ import com.sqx.modules.activity.bo.ShopActivityBO;
 import com.sqx.modules.activity.dto.ActivityDTO;
 import com.sqx.modules.activity.dto.ActivityQueryDTO;
 import com.sqx.modules.activity.entity.Activity;
+import com.sqx.modules.activity.vo.ActivityOrderVO;
 import com.sqx.modules.activity.vo.ActivityVO;
 import com.sqx.modules.activity.vo.OrderSuitActivityVO;
 
@@ -53,4 +54,6 @@ public interface ActivityService extends IService<Activity> {
      * @return 活动
      */
     OrderSuitActivityVO getOrderBestActivity(Long orderId);
+
+    ActivityOrderVO selectByOrder(Long orderId);
 }

src/main/java/com/sqx/modules/activity/service/impl/ActivityServiceImpl.java

@@ -29,6 +29,7 @@ import com.sqx.modules.activity.service.ActivityGoodsService;
 import com.sqx.modules.activity.service.ActivityService;
 import com.sqx.modules.activity.service.ActivityShopService;
 import com.sqx.modules.activity.util.ActivityUtil;
+import com.sqx.modules.activity.vo.ActivityOrderVO;
 import com.sqx.modules.activity.vo.ActivityVO;
 import com.sqx.modules.activity.vo.OrderSuitActivityVO;
 import com.sqx.modules.order.entity.OrderGoods;
@@ -36,6 +37,7 @@ import com.sqx.modules.order.entity.TbOrder;
 import com.sqx.modules.order.service.AppOrderService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -54,6 +56,9 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class ActivityServiceImpl extends ServiceImpl<ActivityDao, Activity> implements ActivityService {
 
+    @Autowired
+    private ActivityDao activityDao;
+
     private final ActivityShopService activityShopService;
     private final ActivityGoodsService activityGoodsService;
     private final AppOrderService orderService;
@@ -85,7 +90,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, Activity> impl
         pageUtils.setList(vos);
         return pageUtils;
     }
-     
+
     @Override
     public void addActivity(ActivityDTO activityDTO) {
         checkParam(activityDTO);
@@ -465,4 +470,9 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, Activity> impl
         vo.setGoodsNames(applyGoodsNames);
         return vo;
     }
+
+    @Override
+    public ActivityOrderVO selectByOrder(Long orderId) {
+        return activityDao.selectByOrder(orderId);
+    }
 }

src/main/java/com/sqx/modules/activity/service/impl/ActivityShopServiceImpl.java

@@ -15,6 +15,7 @@ import com.sqx.common.utils.Constant;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.SpringContextUtils;
 import com.sqx.modules.activity.bo.ShopActivityBO;
+import com.sqx.modules.activity.dao.ActivityDao;
 import com.sqx.modules.activity.dao.ActivityShopDao;
 import com.sqx.modules.activity.dto.ActivityGoodsDTO;
 import com.sqx.modules.activity.dto.JoinActivityDTO;
@@ -37,6 +38,7 @@ import com.sqx.modules.sys.service.SysUserShopService;
 import lombok.RequiredArgsConstructor;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -55,6 +57,9 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class ActivityShopServiceImpl extends ServiceImpl<ActivityShopDao, ActivityShop> implements ActivityShopService {
 
+    @Autowired
+    private ActivityDao activityDao;
+
     private final ActivityGoodsService activityGoodsService;
     private final SysUserShopService sysUserShopService;
 

src/main/java/com/sqx/modules/activity/vo/ActivityOrderVO.java

@@ -0,0 +1,19 @@
+package com.sqx.modules.activity.vo;
+
+import lombok.Data;
+
+/**
+ * 活动vo
+ */
+@Data
+public class ActivityOrderVO {
+    /**
+     * 活动id
+     */
+    private Integer id;
+
+    /**
+     * 活动名称
+     */
+    private String title;
+}

src/main/java/com/sqx/modules/coupon/service/TbCouponService.java

@@ -23,4 +23,5 @@ public interface TbCouponService extends IService<TbCoupon> {
 
     Result giveCoupon(Long couponId, List<String> userIdList, Long shopId);
 
+    TbCoupon selectCoupon(Long couponId);
 }

src/main/java/com/sqx/modules/coupon/service/impl/TbCouponServiceImpl.java

@@ -12,6 +12,7 @@ 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.datacentre.entity.SysUserShop;
+import com.sqx.modules.goods.entity.GoodsShop;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -88,6 +89,14 @@ public class TbCouponServiceImpl extends ServiceImpl<TbCouponDao, TbCoupon> impl
     }
 
     @Override
+    public TbCoupon selectCoupon(Long couponId) {
+        QueryWrapper<TbCoupon> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("coupon_id",couponId);
+        TbCoupon result = tbCouponDao.selectOne(queryWrapper);
+        return result;
+    }
+
+    @Override
     public Result deleteCoupon(Long couponId) {
         tbCouponDao.deleteById(couponId);
         return Result.success();

src/main/java/com/sqx/modules/printInfo/controller/PrintInfoController.java

@@ -87,12 +87,100 @@ public class PrintInfoController {
     @PostMapping("insertPrintInfo")
     @ApiOperation("新增打印信息")
     public Result insertPrintInfo(@RequestBody PrintInfo printInfo) {
+        //不能加入自定义参数以外的数据
+        List<String> files = new ArrayList<>();
+        files.add("platform_name");
+        files.add("shop_name");
+        files.add("order_number");
+        files.add("order_type_extra");
+        files.add("goods_name");
+        files.add("goods_price");
+        files.add("goods_num");
+        files.add("sum_money");
+        files.add("remark");
+        files.add("pack_money");
+        files.add("goods_money");
+        files.add("coupon_money");
+        files.add("errand_money");
+        files.add("activity_title");
+        files.add("pay_money");
+        files.add("user_name");
+        files.add("phone");
+        files.add("address_detail");
+        files.add("pay_time");
+        files.add("user_nick_name");
+        files.add("shop_phone");
+        files.add("distribution_distance_start");
+        files.add("detailed_address");
+        files.add("shop_receiving_time");
+        files.add("shop_id");
+        files.add("parent_user_id");
+        files.add("auto_send_order");
+        files.add("order_code");
+        files.add("pay_type");
+        files.add("create_time");
+        files.add("user_id");
+        files.add("coupon_id");
+        files.add("expect_delivery_time");
+        if(!files.contains(printInfo.getPrintField())){
+            return Result.error("无法新增非法字段");
+        }
+
+        int existCount = printInfoService.existInfo(printInfo.getTypeId(),printInfo.getPrintField());
+        if(existCount > 0){
+            return Result.error("当前类型中已包含该字段");
+        }
+
         return printInfoService.insertPrintInfo(printInfo);
     }
 
     @GetMapping("updatePrintInfo")
     @ApiOperation("更新打印信息")
     private Result updatePrintInfo(@RequestBody PrintInfo printInfo) {
+        //不能加入自定义参数以外的数据
+        List<String> files = new ArrayList<>();
+        files.add("platform_name");
+        files.add("shop_name");
+        files.add("order_number");
+        files.add("order_type_extra");
+        files.add("goods_name");
+        files.add("goods_price");
+        files.add("goods_num");
+        files.add("sum_money");
+        files.add("remark");
+        files.add("pack_money");
+        files.add("goods_money");
+        files.add("coupon_money");
+        files.add("errand_money");
+        files.add("activity_title");
+        files.add("pay_money");
+        files.add("user_name");
+        files.add("phone");
+        files.add("address_detail");
+        files.add("pay_time");
+        files.add("user_nick_name");
+        files.add("shop_phone");
+        files.add("distribution_distance_start");
+        files.add("detailed_address");
+        files.add("shop_receiving_time");
+        files.add("shop_id");
+        files.add("parent_user_id");
+        files.add("auto_send_order");
+        files.add("order_code");
+        files.add("pay_type");
+        files.add("create_time");
+        files.add("user_id");
+        files.add("coupon_id");
+        files.add("expect_delivery_time");
+        if(!files.contains(printInfo.getPrintField())){
+            return Result.error("无法将数据更新为非法字段");
+        }
+
+        PrintInfo existData = printInfoService.existInfoData(printInfo.getTypeId(),printInfo.getPrintField());
+        if(existData != null && existData.getId().intValue() != printInfo.getId().intValue()){
+            return Result.error("当前类型中已包含该字段");
+        }
+
         return printInfoService.updatePrintInfo(printInfo);
     }
 

src/main/java/com/sqx/modules/printInfo/service/PrintInfoService.java

@@ -26,4 +26,8 @@ public interface PrintInfoService extends IService<PrintInfo> {
     Result deletePrintInfo(Integer id);
 
     List<PrintInfo> printInfos();
+
+    int existInfo(Integer type,String field);
+
+    PrintInfo existInfoData(Integer type,String field);
 }

src/main/java/com/sqx/modules/printInfo/service/impl/PrintInfoServiceImpl.java

@@ -26,8 +26,6 @@ import java.util.List;
  */
 @Service
 public class PrintInfoServiceImpl extends ServiceImpl<PrintInfoDao, PrintInfo> implements PrintInfoService {
-    @Autowired
-    private PrintInfoDao printInfoDao;
 
     @Override
     public Result selectPrintInfoList(Integer page, Integer limit) {
@@ -75,4 +73,24 @@ public class PrintInfoServiceImpl extends ServiceImpl<PrintInfoDao, PrintInfo> i
         List<PrintInfo> result = baseMapper.selectList(queryWrapper);
         return result;
     }
+
+    @Override
+    public int existInfo(Integer type,String field) {
+        QueryWrapper<PrintInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type",type);
+        queryWrapper.eq("print_field",field);
+        queryWrapper.eq("delete_flag",0);
+        int result = baseMapper.selectCount(queryWrapper);
+        return result;
+    }
+
+    @Override
+    public PrintInfo existInfoData(Integer type, String field) {
+        QueryWrapper<PrintInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type",type);
+        queryWrapper.eq("print_field",field);
+        queryWrapper.eq("delete_flag",0);
+        PrintInfo result = baseMapper.selectOne(queryWrapper);
+        return result;
+    }
 }

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

@@ -2,7 +2,17 @@ package com.sqx.modules.utils.fieYun;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
+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.printInfo.entity.*;
@@ -35,7 +45,13 @@ import java.util.stream.Collectors;
 @Component
 @Slf4j
 public class FeiYunUtils {
+    private static ActivityService activityService;
 
+    private static UserService userService;
+
+    private static TbCouponService tbCouponService;
+
+    private static GoodsShopService goodsShopService;
 
     private static CommonInfoService commonInfoService;
 
@@ -44,6 +60,26 @@ public class FeiYunUtils {
     private static PrintInfoService printInfoService;
 
     @Autowired
+    public void setActivityService(ActivityService activityService) {
+        FeiYunUtils.activityService = activityService;
+    }
+
+    @Autowired
+    public void setUserService(UserService userService) {
+        FeiYunUtils.userService = userService;
+    }
+
+    @Autowired
+    public void setTbCouponService(TbCouponService tbCouponService) {
+        FeiYunUtils.tbCouponService = tbCouponService;
+    }
+
+    @Autowired
+    public void setGoodsShopService(GoodsShopService goodsShopService) {
+        FeiYunUtils.goodsShopService = goodsShopService;
+    }
+
+    @Autowired
     public void setCommonInfoService(CommonInfoService commonInfoService) {
         FeiYunUtils.commonInfoService = commonInfoService;
     }
@@ -305,6 +341,11 @@ public class FeiYunUtils {
             //endregion
 
             //region 获取配置的打印模板信息  没设置的就正常不加粗
+            GoodsShop shopData = goodsShopService.selectGoodDatas(tbOrder.getShopId());
+            UserEntity parentUser = userService.selectUserById(tbOrder.getParentUserId());
+            TbCoupon tbCoupon = tbCouponService.selectCoupon(tbOrder.getCouponId());
+            ActivityOrderVO activity = tbOrder.getOrderId() == null ? null : activityService.selectByOrder(tbOrder.getOrderId());
+
             List<PrintModelResult> resultData = new ArrayList<>();
             List<PrintInfo> infos = printInfoService.printInfos();
             List<Integer> typeIds = infos.stream().map(PrintInfo::getTypeId).distinct().collect(Collectors.toList());
@@ -487,23 +528,25 @@ public class FeiYunUtils {
                 //region 基本信息：平台名称 店铺名 订单号 送达时间 订单类型
                 Optional<PrintModelResult> oBaseInfo = resultData.stream().filter(e -> e.getId().intValue() == ePrintStatu.Base.getValue()).findFirst();
                 List<PrintModelTypeResult> baseTypes = oBaseInfo.get().getTypes();
+
                 //region 平台名称
-                String platform_name_type_start = null;
-                String platform_name_type_end = null;
+                String bplatformNameType_start = null;
+                String bplatformNameType_end = null;
                 //endregion
-                //region 店铺名
-                String shop_name_start = null;
-                String shop_name_end = null;
+                //region 商铺名
+                String bshopName_start = null;
+                String bshopName_end = null;
                 //endregion
                 //region 订单类型
-                String order_type_extra_start = null;
-                String order_type_extra_end = null;
+                String borderTypeExtra_start = null;
+                String borderTypeExtra_end = null;
                 //endregion
                 //region 订单号
-                String order_number_start = null;
-                String order_number_end = null;
+                String borderNumber_start = null;
+                String borderNumber_end = null;
                 //endregion
 
+                StringBuilder baseStringBuilder = new StringBuilder();
                 for (PrintModelTypeResult baseType : baseTypes) {
 
                     StringBuilder start = new StringBuilder();
@@ -518,37 +561,132 @@ public class FeiYunUtils {
                     }
                     switch (baseType.getPrintField()) {
                         case "platform_name":
-                            platform_name_type_start = "<C>" + start.toString();
-                            platform_name_type_end = "</C>" + end.toString();
+                            bplatformNameType_start = "<C>" + start.toString();
+                            bplatformNameType_end = end.toString()+"</C>";
                             break;
                         case "shop_name":
-                            shop_name_start = "<C>" + start.toString();
-                            shop_name_end = "</C>" + end.toString();
+                            bshopName_start = "<C>" + start.toString();
+                            bshopName_end = end.toString()+"</C>";
                             break;
                         case "order_type_extra":
-                            order_type_extra_start = start.toString();
-                            order_type_extra_end = end.toString();
+                            borderTypeExtra_start = start.toString();
+                            borderTypeExtra_end = end.toString();
                             break;
                         case "order_number":
-                            order_number_start = start.toString();
-                            order_number_end = end.toString();
+                            borderNumber_start = start.toString();
+                            borderNumber_end = end.toString();
+                            break;
+
+
+                        case "user_nick_name":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
+                            break;
+                        case "shop_phone":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
+                            break;
+                        case "distribution_distance_start":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getDistributionDistance()).append(end.toString()).append("<BR>");
+                            break;
+                        case "detailed_address":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getDetailedAddress()).append(end.toString()).append("<BR>");
+                            break;
+                        case "remark":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getRemark()).append(end.toString()).append("<BR>");
+                            break;
+                        case "shop_receiving_time":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getShopReceivingTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "shop_id":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(shopData != null ? shopData.getBusinessHours()+"-"+shopData.getLockHours() : "").append(end.toString()).append("<BR>");
+                            break;
+                        case "parent_user_id":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(parentUser == null ? "" : parentUser.getNickName()).append(end.toString()).append("<BR>");
+                            break;
+                        case "pay_money":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getPayMoney()).append("元").append(end.toString()).append("<BR>");
+                            break;
+                        case "auto_send_order":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getAutoSendOrder().intValue() == 0 ? "开启" : "关闭").append(end.toString()).append("<BR>");
+                            break;
+                        case "errand_money":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getErrandMoney()).append("元").append(end.toString()).append("<BR>");
+                            break;
+                        case "pack_money":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getPackMoney()).append("元").append(end.toString()).append("<BR>");
+                            break;
+                        case "order_code":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getOrderCode()).append(end.toString()).append("<BR>");
+                            break;
+                        case "pay_type":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getPayType().intValue() == 1 ? "微信支付" : (tbOrder.getPayType().intValue() == 2 ? "余额支付" : "支付宝支付")).append(end.toString()).append("<BR>");
+                            break;
+                        case "pay_time":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getPayTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "create_time":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getCreateTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "address":
+                            if (StringUtils.isNotEmpty(tbOrder.getAddress())) {
+                                JSONObject jsonObject = JSONObject.parseObject(tbOrder.getAddress());
+                                String addressDetail = jsonObject.getString("addressDetail");
+                                String city = jsonObject.getString("city");
+                                String district = jsonObject.getString("district");
+                                String province = jsonObject.getString("province");
+                                baseStringBuilder.append(start.toString()).append(province).append(city).append(district).append(addressDetail).append(end.toString()).append("<BR>");
+                            }
+                            break;
+                        case "phone":
+                            if (StringUtils.isNotEmpty(tbOrder.getAddress())) {
+                                JSONObject jsonObject = JSONObject.parseObject(tbOrder.getAddress());
+                                String phone = jsonObject.getString("userPhone");
+                                baseStringBuilder.append(start.toString()).append(phone).append(end.toString()).append("<BR>");
+                            }
+                            break;
+                        case "user_name":
+                            if (StringUtils.isNotEmpty(tbOrder.getAddress())) {
+                                JSONObject jsonObject = JSONObject.parseObject(tbOrder.getAddress());
+                                String userName = jsonObject.getString("userName");
+                                baseStringBuilder.append(start.toString()).append(userName).append(end.toString()).append("<BR>");
+                            }
+                            break;
+                        case "user_id"://显示isVip和vipExpirationTime
+                            UserEntity user = null;
+                            if(tbOrder.getUserId() != null){
+                                user = userService.selectUserById(tbOrder.getUserId());
+                            }
+                            baseStringBuilder.append(start.toString()).append("是否会员：").append(user == null ? "" : (user.getIsVip().intValue() == 1 ? "是" : "否")).append(end.toString()).append("<BR>");
+                            baseStringBuilder.append(start.toString()).append("会员有效期：").append(user == null ? "" : user.getVipExpirationTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "coupon_id"://拿优惠券表中的优惠券名称
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
+                            break;
+                        case "expect_delivery_time":
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "activity_title"://通过订单ID去activity_part_record表中查到activity_id后再去activity表中获取活动标题
+                            baseStringBuilder.append(start.toString()).append(baseType.getPrintName()+"：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");
                             break;
                         default:
                             break;
                     }
                 }
 
-                stringBuilder.append(platform_name_type_start).append("#").append(tbOrder.getCountOrder()).append("-").append("墨轩云商").append(platform_name_type_end);
-                stringBuilder.append(shop_name_start).append(tbOrder.getShopName()).append(shop_name_end);
-                stringBuilder.append("类型：").append(order_type_extra_start).append(eOrderTypeExtra.stringOf(tbOrder.getOrderTypeExtra())).append(order_type_extra_end).append("<BR>");
-
-                //if (tbOrder.getOrderType() == 1) {
-                //    stringBuilder.append("<BOLD>类型：").append(order_type_extra_start).append(eOrderTypeExtra.stringOf(tbOrder.getOrderTypeExtra())).append(order_type_extra_end).append("<BR>");
-                //    stringBuilder.append("<BOLD>取餐号：").append(tbOrder.getOrderCode()).append("</BOLD><BR>");
-                //} else {
-                //    stringBuilder.append("<BOLD>类型：").append("外卖配送</BOLD><BR>");
-                //}
-                stringBuilder.append("订单号：").append(order_number_start).append(tbOrder.getOrderNumber()).append(order_number_end).append("<BR>");
+                if (bplatformNameType_start != null) {
+                    stringBuilder.append(bplatformNameType_start).append("#").append(tbOrder.getCountOrder()).append("-").append("墨轩云商").append(bplatformNameType_end);
+                }
+                if (bshopName_start != null) {
+                    stringBuilder.append(bshopName_start).append(tbOrder.getShopName()).append(bshopName_end);
+                }
+                if (borderTypeExtra_start != null) {
+                    stringBuilder.append(borderTypeExtra_start).append("类型：").append(eOrderTypeExtra.stringOf(tbOrder.getOrderTypeExtra())).append(borderTypeExtra_end).append("<BR>");
+                }
+                if (borderNumber_start != null) {
+                    stringBuilder.append(borderNumber_start).append("订单号：").append(tbOrder.getOrderNumber()).append(borderNumber_end).append("<BR>");
+                }
+
+                stringBuilder.append(baseStringBuilder.toString());
+
                 //endregion
                 stringBuilder.append("--------------------------------<BR>");
 
@@ -583,6 +721,7 @@ public class FeiYunUtils {
                 String sum_money_end = null;
                 //endregion
 
+                StringBuilder goodStringBuilder = new StringBuilder();
                 for (PrintModelTypeResult type : goodTypes) {
 
                     StringBuilder start = new StringBuilder();
@@ -616,6 +755,105 @@ public class FeiYunUtils {
                             sum_money_start = start.toString();
                             sum_money_end = end.toString();
                             break;
+
+                        case "platform_name":
+                            goodStringBuilder.append(start.toString()).append("#").append(tbOrder.getCountOrder()).append("-").append("墨轩云商").append(end.toString());
+                            break;
+                        case "shop_name":
+                            goodStringBuilder.append(start.toString()).append(tbOrder.getShopName()).append(end.toString());
+                            break;
+                        case "order_type_extra":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(eOrderTypeExtra.stringOf(tbOrder.getOrderTypeExtra())).append(end.toString()).append("<BR>");
+                            break;
+                        case "order_number":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getOrderNumber()).append(end.toString()).append("<BR>");
+                            break;
+                        case "user_nick_name":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
+                            break;
+                        case "shop_phone":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
+                            break;
+                        case "distribution_distance_start":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getDistributionDistance()).append(end.toString()).append("<BR>");
+                            break;
+                        case "detailed_address":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getDetailedAddress()).append(end.toString()).append("<BR>");
+                            break;
+                        case "shop_receiving_time":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getShopReceivingTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "shop_id":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(shopData != null ? shopData.getBusinessHours()+"-"+shopData.getLockHours() : "").append(end.toString()).append("<BR>");
+                            break;
+                        case "parent_user_id":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(parentUser == null ? "" : parentUser.getNickName()).append(end.toString()).append("<BR>");
+                            break;
+                        case "pay_money":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getPayMoney()).append("元").append(end.toString()).append("<BR>");
+                            break;
+                        case "auto_send_order":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getAutoSendOrder().intValue() == 0 ? "开启" : "关闭").append(end.toString()).append("<BR>");
+                            break;
+                        case "errand_money":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getErrandMoney()).append("元").append(end.toString()).append("<BR>");
+                            break;
+                        case "pack_money":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getPackMoney()).append("元").append(end.toString()).append("<BR>");
+                            break;
+                        case "order_code":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getOrderCode()).append(end.toString()).append("<BR>");
+                            break;
+                        case "pay_type":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getPayType().intValue() == 1 ? "微信支付" : (tbOrder.getPayType().intValue() == 2 ? "余额支付" : "支付宝支付")).append(end.toString()).append("<BR>");
+                            break;
+                        case "pay_time":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getPayTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "create_time":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getCreateTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "address":
+                            if (StringUtils.isNotEmpty(tbOrder.getAddress())) {
+                                JSONObject jsonObject = JSONObject.parseObject(tbOrder.getAddress());
+                                String addressDetail = jsonObject.getString("addressDetail");
+                                String city = jsonObject.getString("city");
+                                String district = jsonObject.getString("district");
+                                String province = jsonObject.getString("province");
+                                goodStringBuilder.append(start.toString()).append(province).append(city).append(district).append(addressDetail).append(end.toString()).append("<BR>");
+                            }
+                            break;
+                        case "phone":
+                            if (StringUtils.isNotEmpty(tbOrder.getAddress())) {
+                                JSONObject jsonObject = JSONObject.parseObject(tbOrder.getAddress());
+                                String phone = jsonObject.getString("userPhone");
+                                goodStringBuilder.append(start.toString()).append(phone).append(end.toString()).append("<BR>");
+                            }
+                            break;
+                        case "user_name":
+                            if (StringUtils.isNotEmpty(tbOrder.getAddress())) {
+                                JSONObject jsonObject = JSONObject.parseObject(tbOrder.getAddress());
+                                String userName = jsonObject.getString("userName");
+                                goodStringBuilder.append(start.toString()).append(userName).append(end.toString()).append("<BR>");
+                            }
+                            break;
+                        case "user_id"://显示isVip和vipExpirationTime
+                            UserEntity user = null;
+                            if(tbOrder.getUserId() != null){
+                                user = userService.selectUserById(tbOrder.getUserId());
+                            }
+                            goodStringBuilder.append(start.toString()).append("是否会员：").append(user == null ? "" : (user.getIsVip().intValue() == 1 ? "是" : "否")).append(end.toString()).append("<BR>");
+                            goodStringBuilder.append(start.toString()).append("会员有效期：").append(user == null ? "" : user.getVipExpirationTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "coupon_id"://拿优惠券表中的优惠券名称
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
+                            break;
+                        case "expect_delivery_time":
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "activity_title"://通过订单ID去activity_part_record表中查到activity_id后再去activity表中获取活动标题
+                            goodStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");
+                            break;
                         default:
                             break;
                     }
@@ -654,8 +892,11 @@ public class FeiYunUtils {
                 if (StringUtils.isEmpty(remark)) {
                     remark = "";
                 }
-                stringBuilder.append("备注：").append(remark_start).append(remark).append(remark_end).append("<BR>");
+                stringBuilder.append(remark_start).append("备注：").append(remark).append(remark_end).append("<BR>");
+
+                stringBuilder.append(goodStringBuilder.toString());
                 //endregion
+
                 stringBuilder.append("--------------------------------<BR>");
 
                 //region 支付信息：打包费 商品费 优惠券 跑腿费 优惠活动 合计
@@ -688,6 +929,7 @@ public class FeiYunUtils {
                 String pay_money_end = null;
                 //endregion
 
+                StringBuilder payStringBuilder = new StringBuilder();
                 for (PrintModelTypeResult type : payTypes) {
 
                     StringBuilder start = new StringBuilder();
@@ -725,28 +967,118 @@ public class FeiYunUtils {
                             pay_money_start = start.toString();
                             pay_money_end = end.toString();
                             break;
+                        case "platform_name":
+                            payStringBuilder.append(start.toString()).append("#").append(tbOrder.getCountOrder()).append("-").append("墨轩云商").append(end.toString());
+                            break;
+                        case "shop_name":
+                            payStringBuilder.append(start.toString()).append(tbOrder.getShopName()).append(end.toString());
+                            break;
+                        case "order_type_extra":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(eOrderTypeExtra.stringOf(tbOrder.getOrderTypeExtra())).append(end.toString()).append("<BR>");
+                            break;
+                        case "order_number":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getOrderNumber()).append(end.toString()).append("<BR>");
+                            break;
+                        case "user_nick_name":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
+                            break;
+                        case "shop_phone":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
+                            break;
+                        case "distribution_distance_start":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getDistributionDistance()).append(end.toString()).append("<BR>");
+                            break;
+                        case "detailed_address":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getDetailedAddress()).append(end.toString()).append("<BR>");
+                            break;
+                        case "remark":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getRemark()).append(end.toString()).append("<BR>");
+                            break;
+                        case "shop_receiving_time":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getShopReceivingTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "shop_id":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(shopData != null ? shopData.getBusinessHours()+"-"+shopData.getLockHours() : "").append(end.toString()).append("<BR>");
+                            break;
+                        case "parent_user_id":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(parentUser == null ? "" : parentUser.getNickName()).append(end.toString()).append("<BR>");
+                            break;
+                        case "auto_send_order":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getAutoSendOrder().intValue() == 0 ? "开启" : "关闭").append(end.toString()).append("<BR>");
+                            break;
+                        case "order_code":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getOrderCode()).append(end.toString()).append("<BR>");
+                            break;
+                        case "pay_type":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getPayType().intValue() == 1 ? "微信支付" : (tbOrder.getPayType().intValue() == 2 ? "余额支付" : "支付宝支付")).append(end.toString()).append("<BR>");
+                            break;
+                        case "pay_time":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getPayTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "create_time":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getCreateTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "address":
+                            if (StringUtils.isNotEmpty(tbOrder.getAddress())) {
+                                JSONObject jsonObject = JSONObject.parseObject(tbOrder.getAddress());
+                                String addressDetail = jsonObject.getString("addressDetail");
+                                String city = jsonObject.getString("city");
+                                String district = jsonObject.getString("district");
+                                String province = jsonObject.getString("province");
+                                payStringBuilder.append(start.toString()).append(province).append(city).append(district).append(addressDetail).append(end.toString()).append("<BR>");
+                            }
+                            break;
+                        case "phone":
+                            if (StringUtils.isNotEmpty(tbOrder.getAddress())) {
+                                JSONObject jsonObject = JSONObject.parseObject(tbOrder.getAddress());
+                                String phone = jsonObject.getString("userPhone");
+                                payStringBuilder.append(start.toString()).append(phone).append(end.toString()).append("<BR>");
+                            }
+                            break;
+                        case "user_name":
+                            if (StringUtils.isNotEmpty(tbOrder.getAddress())) {
+                                JSONObject jsonObject = JSONObject.parseObject(tbOrder.getAddress());
+                                String userName = jsonObject.getString("userName");
+                                payStringBuilder.append(start.toString()).append(userName).append(end.toString()).append("<BR>");
+                            }
+                            break;
+                        case "user_id"://显示isVip和vipExpirationTime
+                            UserEntity user = null;
+                            if(tbOrder.getUserId() != null){
+                                user = userService.selectUserById(tbOrder.getUserId());
+                            }
+                            payStringBuilder.append(start.toString()).append("是否会员：").append(user == null ? "" : (user.getIsVip().intValue() == 1 ? "是" : "否")).append(end.toString()).append("<BR>");
+                            payStringBuilder.append(start.toString()).append("会员有效期：").append(user == null ? "" : user.getVipExpirationTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "coupon_id"://拿优惠券表中的优惠券名称
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
+                            break;
+                        case "expect_delivery_time":
+                            payStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime()).append(end.toString()).append("<BR>");
+                            break;
                         default:
                             break;
                     }
                 }
                 //endregion
 
-
-                stringBuilder.append("打包费：").append(pack_money_start).append(packMoney).append(pack_money_end).append("元<BR>");
-                stringBuilder.append("商品费：").append(goods_money_start).append(goodsMoney).append(goods_money_end).append("元<BR>");
+                stringBuilder.append(pack_money_start).append("打包费：").append(packMoney).append("元").append(pack_money_end + "<BR>");
+                stringBuilder.append(goods_money_start).append("商品费：").append(goodsMoney).append("元").append(goods_money_end + "<BR>");
                 if (tbOrder.getCouponMoney() != null) {
-                    stringBuilder.append("优惠券：").append(coupon_money_start).append("-"+tbOrder.getCouponMoney()).append(coupon_money_end).append("元<BR>");
-                }else{
-                    stringBuilder.append("优惠券：").append(coupon_money_start).append("-0").append(coupon_money_end).append("元<BR>");
+                    stringBuilder.append(coupon_money_start).append("优惠券：").append("-" + tbOrder.getCouponMoney()).append("元").append(coupon_money_end + "<BR>");
+                } else {
+                    stringBuilder.append(coupon_money_start).append("优惠券：").append("-0").append("元").append(coupon_money_end + "<BR>");
                 }
                 BigDecimal errandMoney = tbOrder.getErrandMoney();
                 if (errandMoney == null) {
                     errandMoney = BigDecimal.ZERO;
                 }
-                stringBuilder.append("跑腿费：").append(errand_money_start).append(errandMoney).append(errand_money_end).append("元<BR>");
+                stringBuilder.append(errand_money_start).append("跑腿费：").append(errandMoney).append("元").append(errand_money_end + "<BR>");
                 //从这个表里拿优惠活动 activity_part_record 活动参与记录表
+                stringBuilder.append(activity_title_start).append("优惠活动：").append(activity == null ? "" : activity.getTitle()).append(activity_title_end + "<BR>");
+                stringBuilder.append(pay_money_start).append("合计：").append(tbOrder.getPayMoney()).append("元").append(pay_money_end + "<BR>");
 
-                stringBuilder.append("合计：").append(pay_money_start).append(tbOrder.getPayMoney()).append(pay_money_end).append("元<BR>");
+                stringBuilder.append(payStringBuilder.toString());
                 //endregion
                 stringBuilder.append("--------------------------------<BR>");
                 //region 用户信息：姓名 电话号 地址 订餐时间 商家联系电话
@@ -770,11 +1102,8 @@ public class FeiYunUtils {
                 String pay_time_start = null;
                 String pay_time_end = null;
                 //endregion
-                //region 商家联系电话
-                String shop_phone_start = null;
-                String shop_phone_end = null;
-                //endregion
 
+                StringBuilder userStringBuilder = new StringBuilder();
                 for (PrintModelTypeResult type : userTypes) {
 
                     StringBuilder start = new StringBuilder();
@@ -804,9 +1133,89 @@ public class FeiYunUtils {
                             pay_time_start = start.toString();
                             pay_time_end = end.toString();
                             break;
+                        case "platform_name":
+                            userStringBuilder.append(start.toString()).append("#").append(tbOrder.getCountOrder()).append("-").append("墨轩云商").append(end.toString());
+                            break;
+                        case "shop_name":
+                            userStringBuilder.append(start.toString()).append(tbOrder.getShopName()).append(end.toString());
+                            break;
+                        case "order_type_extra":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(eOrderTypeExtra.stringOf(tbOrder.getOrderTypeExtra())).append(end.toString()).append("<BR>");
+                            break;
+                        case "order_number":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getOrderNumber()).append(end.toString()).append("<BR>");
+                            break;
+                        case "user_nick_name":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
+                            break;
                         case "shop_phone":
-                            shop_phone_start = start.toString();
-                            shop_phone_end = end.toString();
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
+                            break;
+                        case "distribution_distance_start":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getDistributionDistance()).append(end.toString()).append("<BR>");
+                            break;
+                        case "detailed_address":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getDetailedAddress()).append(end.toString()).append("<BR>");
+                            break;
+                        case "remark":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getRemark()).append(end.toString()).append("<BR>");
+                            break;
+                        case "shop_receiving_time":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getShopReceivingTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "shop_id":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(shopData != null ? shopData.getBusinessHours()+"-"+shopData.getLockHours() : "").append(end.toString()).append("<BR>");
+                            break;
+                        case "parent_user_id":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(parentUser == null ? "" : parentUser.getNickName()).append(end.toString()).append("<BR>");
+                            break;
+                        case "pay_money":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getPayMoney()).append("元").append(end.toString()).append("<BR>");
+                            break;
+                        case "auto_send_order":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getAutoSendOrder().intValue() == 0 ? "开启" : "关闭").append(end.toString()).append("<BR>");
+                            break;
+                        case "errand_money":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getErrandMoney()).append("元").append(end.toString()).append("<BR>");
+                            break;
+                        case "pack_money":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getPackMoney()).append("元").append(end.toString()).append("<BR>");
+                            break;
+                        case "order_code":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getOrderCode()).append(end.toString()).append("<BR>");
+                            break;
+                        case "pay_type":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getPayType().intValue() == 1 ? "微信支付" : (tbOrder.getPayType().intValue() == 2 ? "余额支付" : "支付宝支付")).append(end.toString()).append("<BR>");
+                            break;
+                        case "create_time":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getCreateTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "address":
+                            if (StringUtils.isNotEmpty(tbOrder.getAddress())) {
+                                JSONObject jsonObject = JSONObject.parseObject(tbOrder.getAddress());
+                                String addressDetail = jsonObject.getString("addressDetail");
+                                String city = jsonObject.getString("city");
+                                String district = jsonObject.getString("district");
+                                String province = jsonObject.getString("province");
+                                userStringBuilder.append(start.toString()).append(province).append(city).append(district).append(addressDetail).append(end.toString()).append("<BR>");
+                            }
+                            break;
+                        case "user_id"://显示isVip和vipExpirationTime
+                            UserEntity user = null;
+                            if(tbOrder.getUserId() != null){
+                                user = userService.selectUserById(tbOrder.getUserId());
+                            }
+                            userStringBuilder.append(start.toString()).append("是否会员：").append(user == null ? "" : (user.getIsVip().intValue() == 1 ? "是" : "否")).append(end.toString()).append("<BR>");
+                            userStringBuilder.append(start.toString()).append("会员有效期：").append(user == null ? "" : user.getVipExpirationTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "coupon_id"://拿优惠券表中的优惠券名称
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
+                            break;
+                        case "expect_delivery_time":
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getExpectDeliveryTime()).append(end.toString()).append("<BR>");
+                            break;
+                        case "activity_title"://通过订单ID去activity_part_record表中查到activity_id后再去activity表中获取活动标题
+                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");
                             break;
                         default:
                             break;
@@ -822,84 +1231,22 @@ public class FeiYunUtils {
                     String province = jsonObject.getString("province");
                     String userName = jsonObject.getString("userName");
                     String phone = jsonObject.getString("userPhone");
-                    stringBuilder.append("").append(user_name_start).append(userName).append(user_name_end).append("").append("<BR>");
-                    stringBuilder.append("").append(phone_start).append(phone).append(phone_end).append("").append("<BR>");
-                    stringBuilder.append("").append(address_detail_start).append(province).append(city).append(district).append(addressDetail).append(address_detail_end).append("").append("<BR>");
+                    stringBuilder.append(user_name_start).append(userName).append(user_name_end).append("<BR>");
+                    stringBuilder.append(phone_start).append(phone).append(phone_end).append("<BR>");
+                    stringBuilder.append(address_detail_start).append(province).append(city).append(district).append(addressDetail).append(address_detail_end).append("<BR>");
                 } else {
-                    stringBuilder.append("").append(phone_start).append(tbOrder.getPhone()).append(phone_end).append("").append("<BR>");
+                    stringBuilder.append(phone_start).append(tbOrder.getPhone()).append(phone_end).append("<BR>");
                 }
 
-                stringBuilder.append("订餐时间：").append(pay_time_start).append(tbOrder.getPayTime()).append(pay_time_end).append("<BR>");
+                stringBuilder.append(pay_time_start).append("订餐时间：").append(tbOrder.getPayTime()).append(pay_time_end).append("<BR>");
+
+                stringBuilder.append(userStringBuilder);
+
                 stringBuilder.append("<BR>").append("<BR>").append("<BR>");
                 stringBuilder.append("<CUT>");
                 //endregion
             }
 
-            //region 以前的代码
-            /*stringBuilder.append("<BR>").append("<BR>").append("<BR>");
-            stringBuilder.append("<CB>").append(tbOrder.getShopName()).append("</CB><BR>");
-            if(tbOrder.getOrderType()==1){
-                stringBuilder.append("<BOLD>类型：").append("到店取餐</BOLD><BR>");
-                stringBuilder.append("<BOLD>取餐号：").append(tbOrder.getOrderCode()).append("</BOLD><BR>");
-            }else{
-                stringBuilder.append("<BOLD>类型：").append("外卖配送</BOLD><BR>");
-            }
-            stringBuilder.append("<BOLD>订单号：").append(tbOrder.getOrderNumber()).append("</BOLD><BR>");
-            stringBuilder.append("--------------------------------<BR>");
-            stringBuilder.append("名称　　　  单价　 数量　 金额　<BR>");
-            stringBuilder.append("--------------------------------<BR>");
-            stringBuilder.append("<BR>");
-            for(OrderGoods orderGoods:orderGoodsList){
-                BigDecimal sumMoney = orderGoods.getGoodsPrice().multiply(BigDecimal.valueOf(orderGoods.getGoodsNum()));
-                String name;
-                if(StringUtils.isNotEmpty(orderGoods.getSkuMessage())){
-                    name=orderGoods.getGoodsName()+"("+orderGoods.getSkuMessage()+")";
-                }else{
-                    name=orderGoods.getGoodsName();
-                }
-                stringBuilder.append(name).append("<BR>");
-                stringBuilder.append("　　　　　  ");
-                stringBuilder.append(orderGoods.getGoodsPrice());
-                if(orderGoods.getGoodsPrice().doubleValue()<10){
-                    stringBuilder.append("　   ");
-                }else if(orderGoods.getGoodsPrice().doubleValue()<100){
-                    stringBuilder.append("　  ");
-                }else{
-                    stringBuilder.append("　 ");
-                }
-                stringBuilder.append(orderGoods.getGoodsNum());
-                stringBuilder.append("　  ");
-                stringBuilder.append(sumMoney).append("<BR>");
-                stringBuilder.append("<BR>");
-            }
-            stringBuilder.append("--------------------------------<BR>");
-            stringBuilder.append("<BOLD>备注：").append(remark).append("</BOLD><BR>");
-            stringBuilder.append("--------------------------------<BR>");
-            stringBuilder.append("打包费：").append(packMoney).append("元<BR>");
-            stringBuilder.append("商品费：").append(goodsMoney).append("元<BR>");
-            if(tbOrder.getCouponMoney()!=null){
-                stringBuilder.append("优惠券：-").append(tbOrder.getCouponMoney()).append("元<BR>");
-            }
-            stringBuilder.append("跑腿费：").append(errandMoney).append("元<BR>");
-            stringBuilder.append("合计：").append(tbOrder.getPayMoney()).append("元<BR>");
-            stringBuilder.append("--------------------------------<BR>");
-            if(StringUtils.isNotEmpty(tbOrder.getAddress())){
-                JSONObject jsonObject = JSONObject.parseObject(tbOrder.getAddress());
-                String addressDetail = jsonObject.getString("addressDetail");
-                String city = jsonObject.getString("city");
-                String district = jsonObject.getString("district");
-                String province = jsonObject.getString("province");
-                String userName = jsonObject.getString("userName");
-                String phone = jsonObject.getString("userPhone");
-                stringBuilder.append("姓名：").append(userName).append("<BR>");
-                stringBuilder.append("联系电话：").append(phone).append("<BR>");
-                stringBuilder.append("送货地点：").append(province).append(city).append(district).append(addressDetail).append("<BR>");
-            }else{
-                stringBuilder.append("联系电话：").append(tbOrder.getPhone()).append("<BR>");
-            }
-            stringBuilder.append("订餐时间：").append(tbOrder.getPayTime()).append("<BR>");*/
-            //endregion
-
             String content = stringBuilder.toString();
             //通过POST请求，发送打印信息到服务器
             RequestConfig requestConfig = RequestConfig.custom()
@@ -993,6 +1340,7 @@ public class FeiYunUtils {
             content += "--------------------------------<BR>";
             content += "<B>饭　　　　　　 1.0    1   1.0</B><BR>";
             content += "<BOLD>炒饭　　　　　 10.0   10  10.0</BOLD><BR>";
+            content += "<B><BOLD>蛋炒饭　　　　 10.0   10  100.0</B></BOLD><BR>";
             content += "<B><BOLD>蛋炒饭　　　　 10.0   10  100.0</BOLD></B><BR>";
             content += "鸡蛋炒饭　　　 100.0  1   100.0<BR>";
             content += "番茄蛋炒饭　　 1000.0 1   100.0<BR>";