修复权星相关接口

mall-admin/src/main/java/com/macro/mall/service/impl/PmsProductAttributeCategoryServiceImpl.java

@@ -6,6 +6,7 @@ import com.macro.mall.dto.PmsProductAttributeCategoryItem;
 import com.macro.mall.mapper.PmsProductAttributeCategoryMapper;
 import com.macro.mall.model.PmsProductAttributeCategory;
 import com.macro.mall.model.PmsProductAttributeCategoryExample;
+import com.macro.mall.model.UmsMemberExample;
 import com.macro.mall.model.dto.quanxing.PmsProductAttributeTypeDto;
 import com.macro.mall.service.PmsProductAttributeCategoryService;
 import org.springframework.stereotype.Service;
@@ -80,13 +81,14 @@ public class PmsProductAttributeCategoryServiceImpl implements PmsProductAttribu
      */
     public List<PmsProductAttributeCategory> getAttributeCategoryList(Integer page, Integer size, Long parentId){
         PmsProductAttributeCategoryExample example = new PmsProductAttributeCategoryExample();
+        PmsProductAttributeCategoryExample.Criteria criteria = example.createCriteria();
         if( (page !=null && size!=null )||(page ==0 && size!=null ) ){//如果传入分页参数  则调用pageHelper
             PageHelper.startPage(page,size);
         }
         if(parentId != null){
-            example.createCriteria().andParentIdEqualTo(parentId);
+            criteria.andParentIdEqualTo(parentId);
         }
-        example.createCriteria().andDeleteStatusEqualTo(0);//查询未删除的
+        criteria.andDeleteStatusEqualTo(0);//查询未删除的
         //根据sort asc升序
         example.setOrderByClause("sort asc");
         return productAttributeCategoryMapper.selectByExample(example);

mall-service/src/main/java/com/macro/mall/service/member/impl/UmsMemberServiceImpl.java

@@ -707,6 +707,9 @@ public class UmsMemberServiceImpl implements UmsMemberService {
         if(umsMember.getPassword() == null || "".equals(umsMember.getPassword())){
             return new ResultMsg(false,"密码为空");
         }
+        if(umsMember.getDeleteStatus() == null){
+            umsMember.setDeleteStatus(0);//默认未删除
+        }
         if(umsMember.getBirthday() == null ){
             umsMember.setBirthday(new Date());
         }
@@ -733,11 +736,13 @@ public class UmsMemberServiceImpl implements UmsMemberService {
     @Override
    public  List<UmsMember> getMemberListByAccountType(Integer accouuntType){
         UmsMemberExample example = new UmsMemberExample();
+        UmsMemberExample.Criteria criteria = example.createCriteria();
         //账号启用状态
-        example.createCriteria().andStatusEqualTo(1);//帐号启用状态:0->禁用；1->启用
+        criteria.andStatusEqualTo(1);//帐号启用状态:0->禁用；1->启用
         //账号删除状态
-        example.createCriteria().andDeleteStatusEqualTo(0);//删除标识0 未删除 1已删除
-        example.createCriteria().andAccouuntTypeEqualTo(accouuntType);
+        criteria.andDeleteStatusEqualTo(0);//删除标识0 未删除 1已删除
+
+        criteria.andAccouuntTypeEqualTo(accouuntType);
         return this.umsMemberMapper.selectByExample(example);
     }
 }

mall-service/src/main/java/com/macro/mall/service/quanxing/impl/PmsSupplierAuditServiceImpl.java

@@ -70,6 +70,7 @@ public class PmsSupplierAuditServiceImpl implements IPmsSupplierAuditService {
             umsMember.setPassword(psa.getPassword());
             umsMember.setStatus(1);//帐号启用状态:0->禁用；1->启用
             umsMember.setAccouuntType(1);//账户类型（0管理员1供应商2分销商）
+            umsMember.setDeleteStatus(0);
             umsMember.setBirthday(new Date());
             umsMember.setCreateDate(new Date());
             umsMember.setUpdateDate(new Date());