修复

1：添加价格500
2：配置库存无响应

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/business/prodInventory/service/impl/ProdInventoryVoServiceImpl.java

@@ -94,7 +94,7 @@ public class ProdInventoryVoServiceImpl implements IProdInventoryVoService {
             prodInventory.setCreateUser(ShiroUtils.getLoginName());
             prodInventory.setCreateTime(nowDate);
             effectRows = prodInventoryMapper.insertProdInventory(prodInventory);
-            prodInventoryVo = prodInventoryVoMapper.selectProdInventoryVoByProdInventoryId(prodInventoryVo.getProdInventoryId());
+            prodInventoryVo = prodInventoryVoMapper.selectProdInventoryVoByProdInventoryId(prodInventory.getProdInventoryId());
         }
         // 更新商品出入库单
         ProdInventoryOrder prodInventoryOrder = new ProdInventoryOrder();

08.src/Xingxi/xingxi-admin/src/main/java/com/xingxi/web/controller/master/product/controller/ProdAttrPriceController.java

@@ -61,7 +61,9 @@ public class ProdAttrPriceController extends BaseController {
         prodAttrPriceVo.setBuyerName(ERoleKey.CUSTOMER.getDesc());
         prodAttrPriceVo.setBuyerRoleKey(ERoleKey.CUSTOMER.getCode());
         prodAttrPriceVo.setBuyerRoleName(ERoleKey.CUSTOMER.getDesc());
-        prodAttrPriceVo.setPrice(prodAttrPriceVo.getPrice().divide(BigDecimal.valueOf(100)));
+        if (prodAttrPriceVo.getPrice() != null) {
+            prodAttrPriceVo.setPrice(prodAttrPriceVo.getPrice().divide(BigDecimal.valueOf(100)));
+        }
         mMap.put("prodAttrPriceVo", prodAttrPriceVo);
         return prefix + "/prodAttrPrice";
     }

08.src/Xingxi/xingxi-admin/src/main/resources/mapper/ProdInventoryVoMapper.xml

@@ -29,9 +29,9 @@
              , m_prod_attr.attrName
              , m_merchant.mercName
         from m_merchant
-        inner join m_merchant_prod on m_merchant_prod.mercId = m_merchant.mercId
-        inner join m_prod on m_prod.id = m_merchant_prod.prodId
-        inner join m_prod_attr on m_prod_attr.prodId = m_merchant_prod.prodId and m_prod_attr.prodAttrId = m_merchant_prod.prodAttrId
+        inner join m_merchant_prod on m_merchant_prod.mercId = m_merchant.mercId and m_merchant_prod.delFlag = 0
+        inner join m_prod on m_prod.id = m_merchant_prod.prodId and m_prod.delFlag = 0
+        inner join m_prod_attr on m_prod_attr.prodId = m_merchant_prod.prodId and m_prod_attr.prodAttrId = m_merchant_prod.prodAttrId and m_prod_attr.delFlag = 0
         left join t_prod_inventory on t_prod_inventory.mercId = m_merchant.mercId and t_prod_inventory.prodId = m_merchant_prod.prodId and t_prod_inventory.prodAttrId = m_merchant_prod.prodAttrId
     </sql>