增加后台管理产品列表查询和导出，增加详情查询

src/main/java/com/uas/platform/b2c/prod/commodity/controller/ProductController.java

@@ -509,7 +509,7 @@ public class ProductController {
 	@RequestMapping(value = "/background/page", method = RequestMethod.POST)
 	public Page<V_ProductPrivate> getPageDataOfBackground(PageParams params, @RequestBody GoodsFilter goodsFilter) {
 		PageInfo info = new PageInfo(params);
-		logger.info("后台产品管理", "分页获取Goods信息");
+		logger.info("后台产品管理", "分页获取Product信息");
 		return productService.getPageDataOfBackground(info, goodsFilter);
 	}
 
@@ -538,8 +538,19 @@ public class ProductController {
         modelAndView.addObject("dateFormat", dateFormat);
         modelAndView.addObject("data", page.getContent());
         modelAndView.addObject("title", "优软商城--产品库列表");
-        modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/background", "优软商城--产品库列表"));
+        modelAndView.setView(new JxlsExcelView("classpath:jxls-tpl/trade/product_background", "优软商城--产品库列表"));
         session.setAttribute("loading", false);
         return modelAndView;
     }
+
+    /**
+     * 根据id返回一个Goods数据
+     * @param goodsId
+     * @return
+     */
+    @RequestMapping(value = "/one", method = RequestMethod.GET)
+    public V_ProductPrivate getGoodsById(Long goodsId) {
+        logger.info("后台产品管理", "根据id: " + goodsId + "返回goods数据");
+        return productService.getProductAndGoodsById(goodsId);
+    }
 }

src/main/java/com/uas/platform/b2c/prod/commodity/model/V_ProductPrivate.java

@@ -314,6 +314,9 @@ public class V_ProductPrivate implements Serializable {
     @Transient
     private Goods goods;
 
+    @Transient
+    private String enterpriseName;
+
     public Long getId() {
         return id;
     }
@@ -677,4 +680,12 @@ public class V_ProductPrivate implements Serializable {
         this.goods = goods;
         return this;
     }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/GoodsService.java

@@ -858,4 +858,12 @@ public interface GoodsService {
      * @param goods Goods
      */
     void defineGoodsInfo(Goods goods);
+
+    /**
+     * 封装goods信息
+     *
+     * @param goods goods
+     * @return Goods
+     */
+    Goods covertGoodsInfo(Goods goods);
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/ProductService.java

@@ -413,4 +413,12 @@ public interface ProductService {
      * @return Page<Product>
      */
     Page<V_ProductPrivate> getPageDataOfBackground(PageInfo info, GoodsFilter goodsFilter);
+
+    /**
+     * 通过物料id查询 V_ProductPrivate
+     * @param id 物料id
+     *
+     * @return V_ProductPrivate
+     */
+    V_ProductPrivate getProductAndGoodsById(Long id);
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -3450,13 +3450,25 @@ public class GoodsServiceImpl implements GoodsService {
     public Goods getGoodsById(Long id) {
         Goods goods = goodsDao.findOne(id);
         if (goods != null) {
-            if (sysConf.getStoreid().equals(goods.getStoreid())) {
-                goods.setSelfSale("寄售");
-            } else {
-                goods.setSelfSale("自营");
-            }
-            goods.setFrozen(getFrozenCount(goods.getBatchCode()));
+            goods = covertGoodsInfo(goods);
+        }
+        return goods;
+    }
+
+    /**
+     * 封装goods信息
+     *
+     * @param goods goods
+     * @return Goods
+     */
+    @Override
+    public Goods covertGoodsInfo(Goods goods) {
+        if (sysConf.getStoreid().equals(goods.getStoreid())) {
+            goods.setSelfSale("寄售");
+        } else {
+            goods.setSelfSale("自营");
         }
+        goods.setFrozen(getFrozenCount(goods.getBatchCode()));
         if (StringUtils.isEmpty(goods.getAttach()) && goods.getUuid() != null) {
             Component component = componentDao.findByUuid(goods.getUuid());
             if (component != null) {

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -2904,6 +2904,8 @@ public class ProductServiceImpl implements ProductService {
                 -> query.where(info.getPredicates(root, query, builder)).getRestriction(), info);
         page.getContent().forEach(product -> {
             List<Goods> goodsList = goodsDao.findByProductId(product.getId());
+            Enterprise enterprise = enterpriseService.getEnterpriseInfo(product.getEnUU());
+            product.setEnterpriseName(enterprise.getEnName());
             if (CollectionUtils.isNotEmpty(goodsList)) {
                 Goods goods = goodsList.get(0);
                 goodsService.defineGoodsInfo(goods);
@@ -2959,4 +2961,24 @@ public class ProductServiceImpl implements ProductService {
             info.filter("standard", goodsFilter.getStandard() ? Constant.YES : Constant.NO);
         }
     }
+
+    /**
+     * 通过物料id查询 V_ProductPrivate
+     *
+     * @param id 物料id
+     * @return V_ProductPrivate
+     */
+    @Override
+    public V_ProductPrivate getProductAndGoodsById(Long id) {
+        V_ProductPrivate productPrivate = v_productPrivateDao.findOne(id);
+        List<Goods> goodsList = goodsDao.findByProductId(productPrivate.getId());
+        if (CollectionUtils.isNotEmpty(goodsList)) {
+            Goods goods = goodsList.get(0);
+            if (goods != null) {
+                goods = goodsService.covertGoodsInfo(goods);
+                productPrivate.setGoods(goods);
+            }
+        }
+        return null;
+    }
 }