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

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

@@ -346,6 +346,7 @@ public class FeiYunUtils {
             UserEntity parentUser = userService.selectUserById(tbOrder.getParentUserId());
             TbCoupon tbCoupon = tbCouponService.selectCoupon(tbOrder.getCouponId());
             ActivityOrderVO activity = tbOrder.getOrderId() == null ? null : activityService.selectByOrder(tbOrder.getOrderId());
+            UserEntity user = userService.selectUserById(tbOrder.getUserId());//用户
 
             List<PrintModelResult> resultData = new ArrayList<>();
             List<PrintInfo> infos = printInfoService.printInfos();
@@ -592,22 +593,22 @@ public class FeiYunUtils {
                             break;
                         case "user_nick_name":
                             if (isCheck == 1) {
-                                baseStringBuilder.append(start.toString()).append(baseType.getPrintName() + "：").append(tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
+                                baseStringBuilder.append(start.toString()).append(baseType.getPrintName() + "：").append(tbOrder.getUserNickName() == null ? (user == null ? "" : user.getNickName()) : tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "shop_phone":
                             if (isCheck == 1) {
-                                baseStringBuilder.append(start.toString()).append(baseType.getPrintName() + "：").append(tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
+                                baseStringBuilder.append(start.toString()).append(baseType.getPrintName() + "：").append(tbOrder.getShopPhone() == null ? (shopData == null ? "" : shopData.getPhone()) : tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "distribution_distance_start":
                             if (isCheck == 1) {
-                                baseStringBuilder.append(start.toString()).append(baseType.getPrintName() + "：").append(tbOrder.getDistributionDistance()).append(end.toString()).append("<BR>");
+                                baseStringBuilder.append(start.toString()).append(baseType.getPrintName() + "：").append(tbOrder.getDistributionDistance() == null ? (shopData == null ? "" : String.valueOf(shopData.getDistributionDistance())) : tbOrder.getDistributionDistance()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "detailed_address":
                             if (isCheck == 1) {
-                                baseStringBuilder.append(start.toString()).append(baseType.getPrintName() + "：").append(tbOrder.getDetailedAddress()).append(end.toString()).append("<BR>");
+                                baseStringBuilder.append(start.toString()).append(baseType.getPrintName() + "：").append(tbOrder.getDetailedAddress() == null ? (tbOrder == null ? "" : shopData.getDetailedAddress()) : tbOrder.getDetailedAddress()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "remark":
@@ -702,10 +703,6 @@ public class FeiYunUtils {
                             break;
                         case "user_id"://显示isVip和vipExpirationTime
                             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>");
                             }
@@ -851,22 +848,22 @@ public class FeiYunUtils {
                             break;
                         case "user_nick_name":
                             if (isCheck == 1) {
-                                goodStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
+                                goodStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getUserNickName() == null ? (user == null ? "" : user.getNickName()) : tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "shop_phone":
                             if (isCheck == 1) {
-                                goodStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
+                                goodStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getShopPhone() == null ? (shopData == null ? "" : shopData.getPhone()) : tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "distribution_distance_start":
                             if (isCheck == 1) {
-                                goodStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getDistributionDistance()).append(end.toString()).append("<BR>");
+                                goodStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getDistributionDistance() == null ? (shopData == null ? "" : String.valueOf(shopData.getDistributionDistance())) : tbOrder.getDistributionDistance()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "detailed_address":
                             if (isCheck == 1) {
-                                goodStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getDetailedAddress()).append(end.toString()).append("<BR>");
+                                goodStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getDetailedAddress() == null ? (tbOrder == null ? "" : shopData.getDetailedAddress()) : tbOrder.getDetailedAddress()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "shop_receiving_time":
@@ -956,10 +953,6 @@ public class FeiYunUtils {
                             break;
                         case "user_id"://显示isVip和vipExpirationTime
                             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>");
                             }
@@ -1131,22 +1124,22 @@ public class FeiYunUtils {
                             break;
                         case "user_nick_name":
                             if (isCheck == 1) {
-                                payStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
+                                payStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getUserNickName() == null ? (user == null ? "" : user.getNickName()) : tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "shop_phone":
                             if (isCheck == 1) {
-                                payStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
+                                payStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getShopPhone() == null ? (shopData == null ? "" : shopData.getPhone()) : tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "distribution_distance_start":
                             if (isCheck == 1) {
-                                payStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getDistributionDistance()).append(end.toString()).append("<BR>");
+                                payStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getDistributionDistance() == null ? (shopData == null ? "" : String.valueOf(shopData.getDistributionDistance())) : tbOrder.getDistributionDistance()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "detailed_address":
                             if (isCheck == 1) {
-                                payStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getDetailedAddress()).append(end.toString()).append("<BR>");
+                                payStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getDetailedAddress() == null ? (tbOrder == null ? "" : shopData.getDetailedAddress()) : tbOrder.getDetailedAddress()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "remark":
@@ -1232,10 +1225,7 @@ public class FeiYunUtils {
                         case "user_id"://显示isVip和vipExpirationTime
 
                             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>");
                             }
@@ -1373,25 +1363,25 @@ public class FeiYunUtils {
                         case "user_nick_name":
 
                             if (isCheck == 1) {
-                                userStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
+                                userStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getUserNickName() == null ? (user == null ? "" : user.getNickName()) : tbOrder.getUserNickName()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "shop_phone":
 
                             if (isCheck == 1) {
-                                userStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
+                                userStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getShopPhone() == null ? (shopData == null ? "" : shopData.getPhone()) : tbOrder.getShopPhone()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "distribution_distance_start":
 
                             if (isCheck == 1) {
-                                userStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getDistributionDistance()).append(end.toString()).append("<BR>");
+                                userStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getDistributionDistance() == null ? (shopData == null ? "" : String.valueOf(shopData.getDistributionDistance())) : tbOrder.getDistributionDistance()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "detailed_address":
 
                             if (isCheck == 1) {
-                                userStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getDetailedAddress()).append(end.toString()).append("<BR>");
+                                userStringBuilder.append(start.toString()).append(type.getPrintName() + "：").append(tbOrder.getDetailedAddress() == null ? (tbOrder == null ? "" : shopData.getDetailedAddress()) : tbOrder.getDetailedAddress()).append(end.toString()).append("<BR>");
                             }
                             break;
                         case "remark":
@@ -1476,10 +1466,6 @@ public class FeiYunUtils {
                         case "user_id"://显示isVip和vipExpirationTime
 
                             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>");
                             }