|
|
@@ -568,28 +568,23 @@ public class FeiYunUtils {
|
|
|
}
|
|
|
switch (baseType.getPrintField()) {
|
|
|
case "platform_name":
|
|
|
- if (isCheck == 1) {
|
|
|
- bplatformNameType_start = "<C>" + start.toString();
|
|
|
- bplatformNameType_end = end.toString() + "</C>";
|
|
|
- }
|
|
|
+ bplatformNameType_start = "<C>" + start.toString();
|
|
|
+ bplatformNameType_end = end.toString() + "</C>";
|
|
|
break;
|
|
|
case "shop_name":
|
|
|
- if (isCheck == 1) {
|
|
|
- bshopName_start = "<C>" + start.toString();
|
|
|
- bshopName_end = end.toString() + "</C>";
|
|
|
- }
|
|
|
+ bshopName_start = "<C>" + start.toString();
|
|
|
+ bshopName_end = end.toString() + "</C>";
|
|
|
break;
|
|
|
case "order_type_extra":
|
|
|
- if (isCheck == 1) {
|
|
|
- borderTypeExtra_start = start.toString();
|
|
|
- borderTypeExtra_end = end.toString();
|
|
|
- }
|
|
|
+ borderTypeExtra_start = start.toString();
|
|
|
+ borderTypeExtra_end = end.toString();
|
|
|
break;
|
|
|
case "order_number":
|
|
|
- if (isCheck == 1) {
|
|
|
- borderNumber_start = start.toString();
|
|
|
- borderNumber_end = end.toString();
|
|
|
- }
|
|
|
+ borderNumber_start = start.toString();
|
|
|
+ borderNumber_end = end.toString();
|
|
|
+ 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>");
|
|
|
break;
|
|
|
case "user_nick_name":
|
|
|
if (isCheck == 1) {
|
|
|
@@ -712,11 +707,7 @@ public class FeiYunUtils {
|
|
|
baseStringBuilder.append(start.toString()).append(baseType.getPrintName() + "：").append(tbCoupon == null ? "" : tbCoupon.getCouponName()).append(end.toString()).append("<BR>");
|
|
|
}
|
|
|
break;
|
|
|
- case "expect_delivery_time":
|
|
|
- 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表中获取活动标题
|
|
|
if (isCheck == 1) {
|
|
|
baseStringBuilder.append(start.toString()).append(baseType.getPrintName() + "：").append(activity == null ? "" : activity.getTitle()).append(end.toString()).append("<BR>");
|
|
|
@@ -746,11 +737,6 @@ public class FeiYunUtils {
|
|
|
stringBuilder.append("--------------------------------<BR>");
|
|
|
|
|
|
//region 商品信息：商品名称 单价 数量 备注 金额
|
|
|
- stringBuilder.append("名称 单价 数量 金额 <BR>");
|
|
|
- stringBuilder.append("--------------------------------<BR>");
|
|
|
- BigDecimal packMoney = BigDecimal.ZERO;
|
|
|
- BigDecimal goodsMoney = BigDecimal.ZERO;
|
|
|
- //stringBuilder.append("<BR>");
|
|
|
|
|
|
//region 字号样式
|
|
|
Optional<PrintModelResult> oGoodInfo = resultData.stream().filter(e -> e.getId().intValue() == ePrintStatu.Good.getValue()).findFirst();
|
|
|
@@ -796,28 +782,20 @@ public class FeiYunUtils {
|
|
|
}
|
|
|
switch (type.getPrintField()) {
|
|
|
case "goods_name":
|
|
|
- if (isCheck == 1) {
|
|
|
- goods_name_start = start.toString();
|
|
|
- goods_name_end = end.toString();
|
|
|
- }
|
|
|
+ goods_name_start = start.toString();
|
|
|
+ goods_name_end = end.toString();
|
|
|
break;
|
|
|
case "goods_price":
|
|
|
- if (isCheck == 1) {
|
|
|
- goods_price_start = start.toString();
|
|
|
- goods_price_end = end.toString();
|
|
|
- }
|
|
|
+ goods_price_start = start.toString();
|
|
|
+ goods_price_end = end.toString();
|
|
|
break;
|
|
|
case "goods_num":
|
|
|
- if (isCheck == 1) {
|
|
|
- goods_num_start = start.toString();
|
|
|
- goods_num_end = end.toString();
|
|
|
- }
|
|
|
+ goods_num_start = start.toString();
|
|
|
+ goods_num_end = end.toString();
|
|
|
break;
|
|
|
case "remark":
|
|
|
- if (isCheck == 1) {
|
|
|
- remark_start = start.toString();
|
|
|
- remark_end = end.toString();
|
|
|
- }
|
|
|
+ remark_start = start.toString();
|
|
|
+ remark_end = end.toString();
|
|
|
break;
|
|
|
case "sum_money":
|
|
|
if (isCheck == 1) {
|
|
|
@@ -977,7 +955,15 @@ public class FeiYunUtils {
|
|
|
}
|
|
|
}
|
|
|
//endregion
|
|
|
+ if(sum_money_start != null){
|
|
|
+ stringBuilder.append("名称 单价 数量 金额 <BR>");
|
|
|
+ }else{
|
|
|
+ stringBuilder.append("名称 单价 数量<BR>");
|
|
|
+ }
|
|
|
|
|
|
+ stringBuilder.append("--------------------------------<BR>");
|
|
|
+ BigDecimal packMoney = BigDecimal.ZERO;
|
|
|
+ BigDecimal goodsMoney = BigDecimal.ZERO;
|
|
|
for (OrderGoods orderGoods : orderGoodsList) {
|
|
|
BigDecimal sumMoney = orderGoods.getGoodsPrice().multiply(BigDecimal.valueOf(orderGoods.getGoodsNum()));
|
|
|
BigDecimal sumPack = orderGoods.getGoodsPack().multiply(BigDecimal.valueOf(orderGoods.getGoodsNum()));
|
|
|
@@ -1001,7 +987,9 @@ public class FeiYunUtils {
|
|
|
}
|
|
|
stringBuilder.append(goods_num_start).append(orderGoods.getGoodsNum()).append(goods_num_end);
|
|
|
stringBuilder.append(" ");
|
|
|
- stringBuilder.append(sum_money_start).append(sumMoney).append(sum_money_end);
|
|
|
+ if(sum_money_start != null){
|
|
|
+ stringBuilder.append(sum_money_start).append(sumMoney).append(sum_money_end);
|
|
|
+ }
|
|
|
stringBuilder.append("<BR>");
|
|
|
//stringBuilder.append("<BR>");
|
|
|
}
|
|
|
@@ -1067,40 +1055,28 @@ public class FeiYunUtils {
|
|
|
}
|
|
|
switch (type.getPrintField()) {
|
|
|
case "pack_money":
|
|
|
- if (isCheck == 1) {
|
|
|
- pack_money_start = start.toString();
|
|
|
- pack_money_end = end.toString();
|
|
|
- }
|
|
|
+ pack_money_start = start.toString();
|
|
|
+ pack_money_end = end.toString();
|
|
|
break;
|
|
|
case "goods_money":
|
|
|
- if (isCheck == 1) {
|
|
|
- goods_money_start = start.toString();
|
|
|
- goods_money_end = end.toString();
|
|
|
- }
|
|
|
+ goods_money_start = start.toString();
|
|
|
+ goods_money_end = end.toString();
|
|
|
break;
|
|
|
case "coupon_money":
|
|
|
- if (isCheck == 1) {
|
|
|
- coupon_money_start = start.toString();
|
|
|
- coupon_money_end = end.toString();
|
|
|
- }
|
|
|
+ coupon_money_start = start.toString();
|
|
|
+ coupon_money_end = end.toString();
|
|
|
break;
|
|
|
case "errand_money":
|
|
|
- if (isCheck == 1) {
|
|
|
- errand_money_start = start.toString();
|
|
|
- errand_money_end = end.toString();
|
|
|
- }
|
|
|
+ errand_money_start = start.toString();
|
|
|
+ errand_money_end = end.toString();
|
|
|
break;
|
|
|
case "activity_title":
|
|
|
- if (isCheck == 1) {
|
|
|
- activity_title_start = start.toString();
|
|
|
- activity_title_end = end.toString();
|
|
|
- }
|
|
|
+ activity_title_start = start.toString();
|
|
|
+ activity_title_end = end.toString();
|
|
|
break;
|
|
|
case "pay_money":
|
|
|
- if (isCheck == 1) {
|
|
|
- pay_money_start = start.toString();
|
|
|
- pay_money_end = end.toString();
|
|
|
- }
|
|
|
+ pay_money_start = start.toString();
|
|
|
+ pay_money_end = end.toString();
|
|
|
break;
|
|
|
case "platform_name":
|
|
|
if (isCheck == 1) {
|
|
|
@@ -1309,32 +1285,20 @@ public class FeiYunUtils {
|
|
|
}
|
|
|
switch (type.getPrintField()) {
|
|
|
case "user_name":
|
|
|
-
|
|
|
- if (isCheck == 1) {
|
|
|
- user_name_start = start.toString();
|
|
|
- user_name_end = end.toString();
|
|
|
- }
|
|
|
+ user_name_start = start.toString();
|
|
|
+ user_name_end = end.toString();
|
|
|
break;
|
|
|
case "phone":
|
|
|
-
|
|
|
- if (isCheck == 1) {
|
|
|
- phone_start = start.toString();
|
|
|
- phone_end = end.toString();
|
|
|
- }
|
|
|
+ phone_start = start.toString();
|
|
|
+ phone_end = end.toString();
|
|
|
break;
|
|
|
case "address_detail":
|
|
|
-
|
|
|
- if (isCheck == 1) {
|
|
|
- address_detail_start = start.toString();
|
|
|
- address_detail_end = end.toString();
|
|
|
- }
|
|
|
+ address_detail_start = start.toString();
|
|
|
+ address_detail_end = end.toString();
|
|
|
break;
|
|
|
case "pay_time":
|
|
|
-
|
|
|
- if (isCheck == 1) {
|
|
|
- pay_time_start = start.toString();
|
|
|
- pay_time_end = end.toString();
|
|
|
- }
|
|
|
+ pay_time_start = start.toString();
|
|
|
+ pay_time_end = end.toString();
|
|
|
break;
|
|
|
case "platform_name":
|
|
|
|
夏文涛