Merge remote-tracking branch 'origin/dev-xwt' into dev-secure

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

@@ -560,113 +560,170 @@ public class FeiYunUtils {
                         start.append("<BOLD>");
                         end.append("</BOLD>");
                     }
+                    int isCheck = 0;
+                    Optional<PrintModelDetailResult> oCheck = oBaseInfo.get().getDetails().stream().filter(e -> e.getPrintField().equals(baseType.getPrintField())).findFirst();
+                    if (oCheck != null && oCheck.isPresent()) {
+                        isCheck = oCheck.get().getIsCheck().intValue();
+                    }
                     switch (baseType.getPrintField()) {
                         case "platform_name":
-                            bplatformNameType_start = "<C>" + start.toString();
-                            bplatformNameType_end = end.toString()+"</C>";
+                            if (isCheck == 1) {
+                                bplatformNameType_start = "<C>" + start.toString();
+                                bplatformNameType_end = end.toString() + "</C>";
+                            }
                             break;
                         case "shop_name":
-                            bshopName_start = "<C>" + start.toString();
-                            bshopName_end = end.toString()+"</C>";
+                            if (isCheck == 1) {
+                                bshopName_start = "<C>" + start.toString();
+                                bshopName_end = end.toString() + "</C>";
+                            }
                             break;
                         case "order_type_extra":
-                            borderTypeExtra_start = start.toString();
-                            borderTypeExtra_end = end.toString();
+                            if (isCheck == 1) {
+                                borderTypeExtra_start = start.toString();
+                                borderTypeExtra_end = end.toString();
+                            }
                             break;
                         case "order_number":
-                            borderNumber_start = start.toString();
-                            borderNumber_end = end.toString();
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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());
+                            if (isCheck == 1) {
+                                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>");
                             }
-                            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>");
+                            if (isCheck == 1) {
+                                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() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
+                            if (isCheck == 1) {
+                                baseStringBuilder.append(start.toString()).append(baseType.getPrintName() + "：").append(tbOrder.getExpectDeliveryTime() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(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>");
+                            if (isCheck == 1) {
+                                baseStringBuilder.append(start.toString()).append(baseType.getPrintName() + "：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");
+                            }
                             break;
                         default:
                             break;
@@ -735,125 +792,192 @@ public class FeiYunUtils {
                         start.append("<BOLD>");
                         end.append("</BOLD>");
                     }
+                    int isCheck = 0;
+                    Optional<PrintModelDetailResult> oCheck = oGoodInfo.get().getDetails().stream().filter(e -> e.getPrintField().equals(type.getPrintField())).findFirst();
+                    if (oCheck != null && oCheck.isPresent()) {
+                        isCheck = oCheck.get().getIsCheck().intValue();
+                    }
                     switch (type.getPrintField()) {
                         case "goods_name":
-                            goods_name_start = start.toString();
-                            goods_name_end = end.toString();
+                            if (isCheck == 1) {
+                                goods_name_start = start.toString();
+                                goods_name_end = end.toString();
+                            }
                             break;
                         case "goods_price":
-                            goods_price_start = start.toString();
-                            goods_price_end = end.toString();
+                            if (isCheck == 1) {
+                                goods_price_start = start.toString();
+                                goods_price_end = end.toString();
+                            }
                             break;
                         case "goods_num":
-                            goods_num_start = start.toString();
-                            goods_num_end = end.toString();
+                            if (isCheck == 1) {
+                                goods_num_start = start.toString();
+                                goods_num_end = end.toString();
+                            }
                             break;
                         case "remark":
-                            remark_start = start.toString();
-                            remark_end = end.toString();
+                            if (isCheck == 1) {
+                                remark_start = start.toString();
+                                remark_end = end.toString();
+                            }
                             break;
                         case "sum_money":
-                            sum_money_start = start.toString();
-                            sum_money_end = end.toString();
+                            if (isCheck == 1) {
+                                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());
+                            if (isCheck == 1) {
+                                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());
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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());
+                            if (isCheck == 1) {
+                                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>");
                             }
-                            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>");
+                            if (isCheck == 1) {
+                                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() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
+                            if (isCheck == 1) {
+                                goodStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getExpectDeliveryTime() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(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>");
+                            if (isCheck == 1) {
+                                goodStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");
+                            }
                             break;
                         default:
                             break;
@@ -943,119 +1067,190 @@ public class FeiYunUtils {
                         start.append("<BOLD>");
                         end.append("</BOLD>");
                     }
+                    int isCheck = 0;
+                    Optional<PrintModelDetailResult> oCheck = oPayInfo.get().getDetails().stream().filter(e -> e.getPrintField().equals(type.getPrintField())).findFirst();
+                    if (oCheck != null && oCheck.isPresent()) {
+                        isCheck = oCheck.get().getIsCheck().intValue();
+                    }
                     switch (type.getPrintField()) {
                         case "pack_money":
-                            pack_money_start = start.toString();
-                            pack_money_end = end.toString();
+                            if (isCheck == 1) {
+                                pack_money_start = start.toString();
+                                pack_money_end = end.toString();
+                            }
                             break;
                         case "goods_money":
-                            goods_money_start = start.toString();
-                            goods_money_end = end.toString();
+                            if (isCheck == 1) {
+                                goods_money_start = start.toString();
+                                goods_money_end = end.toString();
+                            }
                             break;
                         case "coupon_money":
-                            coupon_money_start = start.toString();
-                            coupon_money_end = end.toString();
+                            if (isCheck == 1) {
+                                coupon_money_start = start.toString();
+                                coupon_money_end = end.toString();
+                            }
                             break;
                         case "errand_money":
-                            errand_money_start = start.toString();
-                            errand_money_end = end.toString();
+                            if (isCheck == 1) {
+                                errand_money_start = start.toString();
+                                errand_money_end = end.toString();
+                            }
                             break;
                         case "activity_title":
-                            activity_title_start = start.toString();
-                            activity_title_end = end.toString();
+                            if (isCheck == 1) {
+                                activity_title_start = start.toString();
+                                activity_title_end = end.toString();
+                            }
                             break;
                         case "pay_money":
-                            pay_money_start = start.toString();
-                            pay_money_end = end.toString();
+                            if (isCheck == 1) {
+                                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());
+                            if (isCheck == 1) {
+                                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());
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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());
+
+                            if (isCheck == 1) {
+                                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>");
                             }
-                            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>");
+
+                            if (isCheck == 1) {
+                                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() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
+
+                            if (isCheck == 1) {
+                                payStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getExpectDeliveryTime() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
+                            }
                             break;
                         default:
                             break;
@@ -1117,106 +1312,195 @@ public class FeiYunUtils {
                         start.append("<BOLD>");
                         end.append("</BOLD>");
                     }
+                    int isCheck = 0;
+                    Optional<PrintModelDetailResult> oCheck = oUserInfo.get().getDetails().stream().filter(e -> e.getPrintField().equals(type.getPrintField())).findFirst();
+                    if (oCheck != null && oCheck.isPresent()) {
+                        isCheck = oCheck.get().getIsCheck().intValue();
+                    }
                     switch (type.getPrintField()) {
                         case "user_name":
-                            user_name_start = start.toString();
-                            user_name_end = end.toString();
+
+                            if (isCheck == 1) {
+                                user_name_start = start.toString();
+                                user_name_end = end.toString();
+                            }
                             break;
                         case "phone":
-                            phone_start = start.toString();
-                            phone_end = end.toString();
+
+                            if (isCheck == 1) {
+                                phone_start = start.toString();
+                                phone_end = end.toString();
+                            }
                             break;
                         case "address_detail":
-                            address_detail_start = start.toString();
-                            address_detail_end = end.toString();
+
+                            if (isCheck == 1) {
+                                address_detail_start = start.toString();
+                                address_detail_end = end.toString();
+                            }
                             break;
                         case "pay_time":
-                            pay_time_start = start.toString();
-                            pay_time_end = end.toString();
+
+                            if (isCheck == 1) {
+                                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());
+
+                            if (isCheck == 1) {
+                                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());
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                userStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
+                            }
                             break;
                         case "shop_phone":
-                            userStringBuilder.append(start.toString()).append(type.getPrintName()+"：").append(tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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>");
+
+                            if (isCheck == 1) {
+                                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());
+
+                            if (isCheck == 1) {
+                                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>");
                             }
-                            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>");
+
+                            if (isCheck == 1) {
+                                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() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tbOrder.getExpectDeliveryTime())).append(end.toString()).append("<BR>");
+
+                            if (isCheck == 1) {
+                                userStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getExpectDeliveryTime() == null ? "即时送达" : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(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>");
+
+                            if (isCheck == 1) {
+                                userStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");
+                            }
                             break;
                         default:
                             break;
@@ -1482,7 +1766,7 @@ public class FeiYunUtils {
                     log.info("utils方法打印开始23");
                 }
             } catch (Exception e) {
-                log.info("utils方法打印开始24"+e.getMessage());
+                log.info("utils方法打印开始24" + e.getMessage());
                 e.printStackTrace();
             } finally {
                 try {
@@ -1490,19 +1774,19 @@ public class FeiYunUtils {
                         response.close();
                     }
                 } catch (IOException e) {
-                    log.info("utils方法打印开始25"+e.getMessage());
+                    log.info("utils方法打印开始25" + e.getMessage());
                     e.printStackTrace();
                 }
                 try {
                     post.abort();
                 } catch (Exception e) {
-                    log.info("utils方法打印开始26"+e.getMessage());
+                    log.info("utils方法打印开始26" + e.getMessage());
                     e.printStackTrace();
                 }
                 try {
                     httpClient.close();
                 } catch (IOException e) {
-                    log.info("utils方法打印开始27"+e.getMessage());
+                    log.info("utils方法打印开始27" + e.getMessage());
                     e.printStackTrace();
                 }
             }