权星相关接口修复

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

@@ -715,6 +715,12 @@ public class UmsMemberServiceImpl implements UmsMemberService {
         }
         if(umsMember.getPhone() == null || "".equals(umsMember.getPhone())){
             return new ResultMsg(false,"手机号为空");
+        }else{
+            //手机号不为空  校验是否已存在此号码
+            UmsMember um =this.getByPhone(umsMember.getPhone());
+            if(um != null){
+                return new ResultMsg(false,"已存在此手机号！");
+            }
         }
         if(umsMember.getPassword() == null || "".equals(umsMember.getPassword())){
             return new ResultMsg(false,"密码为空");

mall-service/src/main/java/com/macro/mall/service/product/impl/PmsProductServiceImpl.java

@@ -188,6 +188,7 @@ public class PmsProductServiceImpl implements PmsProductService {
             this.pmsProductSkuValueDao.updateDeleteStatusByProductId(ppsv);
 
             pmsProductRequestParam.getPmsProductSkuValueList().forEach(pmsProductSkuValue->{
+                pmsProductSkuValue.setId(null);//防止前端 传入之前id  插入主键重复数据
                 pmsProductSkuValue.setProductId(pmsProductRequestParam.getPmsProduct().getId());
                 pmsProductSkuValue.setCreateDate(new Date());
                 pmsProductSkuValue.setUpdateDate(new Date());
@@ -208,6 +209,7 @@ public class PmsProductServiceImpl implements PmsProductService {
                 for (int i = 0; i < categoryIds.length; i++) {
                     skuCode = skuCode+"_"+ categoryIds[i];
                 }
+                pmsSkuStock.setId(null);//防止前端传入之前id  插入报主键重复
                 pmsSkuStock.setSkuCode(skuCode);
                 pmsSkuStock.setProductId(pmsProductRequestParam.getPmsProduct().getId());
                 pmsSkuStock.setCreateDate(new Date());
@@ -938,6 +940,7 @@ public class PmsProductServiceImpl implements PmsProductService {
         //获取已审核的
         pmsProduct = new PmsProduct();
         pmsProduct.setMchtId(memberId);
+        pmsProduct.setPublishStatus(1);//上架状态：0->下架；1->上架
         pmsProduct.setVerifyStatus(1);//审核状态：0->未审核；1->审核通过 2->驳回 3->审核失败
         dataMap.put("已审核",this.productDao.getProductCount(pmsProduct));
         //获取未通过