需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -1079,9 +1079,16 @@ public class OrderBaseExcelLogic {
                 pgOrderProduct.setOrderBaseId(pgOrderId);
                 pgOrderProduct.setNum(Convert.toInt(totalNum));
                 pgOrderProduct.setMainId(mainGoodsCategory.getCategoryId());
-                pgOrderProduct.setMainName(mainGoodsCategory.getMainName());
+                pgOrderProduct.setMainName(categoryType);
 
-                pgOrderProduct.setBrandName("格力");
+                Brand brand = brandMap.get("格力");
+
+                if (brand == null) {
+                    pgOrderProduct.setBrandName("格力");
+                }else {
+                    pgOrderProduct.setBrandName("格力");
+                    pgOrderProduct.setBrandId(brand.getId());
+                }
 
                 pgOrderProduct.setProductName(pSize);
                 pgOrderProducts.add(pgOrderProduct);