万科接口修复

mall-service/src/main/java/com/macro/mall/dao/UmsMemberDao.java

@@ -53,4 +53,6 @@ public interface UmsMemberDao {
     UmsMember selectUmsMemberByJobNo(String jobNo);
 
     UmsMemberDto selectOneByMemberId(Long memberId);
+
+    UmsMember selectOntByPhone(String phone);
 }

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

@@ -807,7 +807,12 @@ public class UmsMemberServiceImpl implements UmsMemberService {
         if(vimdList == null || vimdList.size() == 0 ){
             return  new ResultMsg(false,"传入会员集合为空 ！");
         }
-        vimdList.forEach(vimd ->{ //遍历导入会员 插入万科会员表数据中
+        for(VankeImportMemberDto vimd : vimdList){//遍历导入会员 插入万科会员表数据中
+            //判断是否已存在 此手机号
+            UmsMember umsMember = this.memberDao.selectOntByPhone(vimd.getMobile());
+            if(umsMember != null){
+                 return new ResultMsg(false,"手机号:"+vimd.getMobile()+"已存在!!");
+            }
             //将对象复制到vankevvuser里去 插入到表中
             VankeVvUser vvu = new VankeVvUser();
             //将属性赋值到另一个对象中去
@@ -841,7 +846,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
             um.setName(vimd.getUsername());
             um.setPhone(vimd.getMobile());
             this.umsMemberMapper.insertSelective(um);
-        });
+        };
         return  new ResultMsg(true,"操作成功");
     }
 

mall-service/src/main/resources/com/macro/mall/dao/UmsMemberDao.xml

@@ -872,4 +872,9 @@
         left join vanke_stock_room c ON a.stock_room_id = c.id
         where a.id = #{id}
     </select>
+
+    <select id="selectOntByPhone" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select * from ums_member
+        where phone = #{phone}
+    </select>
 </mapper>
\ No newline at end of file

mall-service/src/main/resources/com/macro/mall/dao/vanke/VankeInboundOrderDao.xml

@@ -9,8 +9,8 @@
 
   <select id="selectListByOther"  parameterType="com.macro.mall.model.dto.vanke.VankeInboundOrderDto" resultMap="BaseResultMap">
       select a.*,b.name receptName,c.name backName ,d.name stockRoomName from vanke_inbound_order a
-      left join ums_member b ON a.recept_outbound_member_id = b.id
-      left join ums_admin c ON a.back_outbound_member_id = c.id
+      left join ums_member b ON a.recept_inbound_member_id = b.id
+      left join ums_admin c ON a.back_inbound_member_id = c.id
       left join vanke_stock_room d ON b.stock_room_id = d.id
       where a.delete_status = 1
       <if test=" receptInboundMemberId != null">