后台盲袋专区订单商品加上福袋编码

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysDistributionOrderServiceImpl.java

@@ -115,7 +115,11 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                     distributionOrderVo.setReturnAddress(returnInfo);
                 }
                 SupplierItem supplierItem = supplierItemDao.findById(distributionOrder.getItemId());
-                distributionOrderVo.setItemName(supplierItem.getName());
+                if (DistributionEnum.DistributionTypeEnum.BLACK_COLLECTION.getCode() == distributionOrder.getType()) {
+                    distributionOrderVo.setItemName(supplierItem.getName() + "_" + distributionOrder.getRemark());
+                } else {
+                    distributionOrderVo.setItemName(supplierItem.getName());
+                }
                 long itemPrice = distributionOrder.getAmount() / distributionOrder.getItemNum();
                 distributionOrderVo.setAmount(PriceUtil.convertPriceFenToYuan(distributionOrder.getAmount()));
                 distributionOrderVo.setItemPrice(PriceUtil.convertPriceFenToYuan(itemPrice));