Browse Source

修复bug

赵冬冬 4 years ago
parent
commit
1b5b7f315c

+ 3 - 0
forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsProductServiceImpl.java

@@ -89,6 +89,8 @@ public class PmsProductServiceImpl implements PmsProductService {
             throw new RuntimeException("没有绑定供应商无法新增!");
             throw new RuntimeException("没有绑定供应商无法新增!");
         }
         }
         productParam.setCompId(compId);
         productParam.setCompId(compId);
+        productParam.setCreateId((long) CurrUserUtil.getUserId());
+        productParam.setCreateTime(new Date());
         productMapper.insertSelective(product);
         productMapper.insertSelective(product);
         //根据促销类型设置价格:会员价格、阶梯价格、满减价格
         //根据促销类型设置价格:会员价格、阶梯价格、满减价格
         Long productId = product.getId();
         Long productId = product.getId();
@@ -258,6 +260,7 @@ public class PmsProductServiceImpl implements PmsProductService {
         PageHelper.startPage(pageNum, pageSize);
         PageHelper.startPage(pageNum, pageSize);
         PmsProductExample productExample = new PmsProductExample();
         PmsProductExample productExample = new PmsProductExample();
         PmsProductExample.Criteria criteria = productExample.createCriteria();
         PmsProductExample.Criteria criteria = productExample.createCriteria();
+        productExample.setOrderByClause("create_time desc");
         criteria.andDeleteStatusEqualTo(0);
         criteria.andDeleteStatusEqualTo(0);
         if(!StringUtils.isEmpty(compId)){
         if(!StringUtils.isEmpty(compId)){
             criteria.andCompIdEqualTo(compId);
             criteria.andCompIdEqualTo(compId);

+ 2 - 0
forest-admin/admin-server/src/main/resources/dao/ProductExcelDao.xml

@@ -169,6 +169,8 @@
         WHERE
         WHERE
         1 = 1
         1 = 1
         AND a.delete_status = 0
         AND a.delete_status = 0
+        AND a.publish_status = 1
+        AND a.verify_status = 1
         <if test="typeId != null">
         <if test="typeId != null">
             AND a.product_big_category_id = #{typeId}
             AND a.product_big_category_id = #{typeId}
         </if>
         </if>

+ 2 - 0
forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/PmsPortalProductServiceImpl.java

@@ -59,6 +59,8 @@ public class PmsPortalProductServiceImpl implements PmsPortalProductService {
         PmsProductExample example = new PmsProductExample();
         PmsProductExample example = new PmsProductExample();
         PmsProductExample.Criteria criteria = example.createCriteria();
         PmsProductExample.Criteria criteria = example.createCriteria();
         criteria.andDeleteStatusEqualTo(0);
         criteria.andDeleteStatusEqualTo(0);
+        criteria.andPublishStatusEqualTo(1);
+        criteria.andVerifyStatusEqualTo(1);
         if (StrUtil.isNotEmpty(keyword)) {
         if (StrUtil.isNotEmpty(keyword)) {
             criteria.andNameLike("%" + keyword + "%");
             criteria.andNameLike("%" + keyword + "%");