增加万科 从微V导入 功能

mall-admin/src/main/java/com/macro/mall/controller/vanke/VankeGoodsCategoryController.java

@@ -28,7 +28,7 @@ public class VankeGoodsCategoryController {
     @ApiOperation("万科后台_物品类别分页操作")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
-    public CommonResult<CommonPage<VankeGoodsCategoryDto>> list(@ApiParam(value="分页大小") @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
+    public CommonResult<CommonPage<VankeGoodsCategoryDto>> list(@ApiParam(value="分页大小") @RequestParam(value = "pageSize", defaultValue = "999") Integer pageSize,
                                                                 @ApiParam(value="分页页数") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
         return CommonResult.success(CommonPage.restPage(this.vankeGoodsCategoryService.getPageList(pageNum, pageSize)));
     }

mall-mbg/src/main/java/com/macro/mall/model/dto/vanke/VankeGoodsRequestParam.java

@@ -17,4 +17,6 @@ public class VankeGoodsRequestParam {
     private Long memberId;
     @ApiModelProperty("出库人的会员id")
     private Long outMemberId;
+    @ApiModelProperty(value = "后台出库人管理员id")
+    private Long backOutMemberId;
 }

mall-mbg/src/main/java/com/macro/mall/model/dto/vanke/VankeInboundOrderDto.java

@@ -16,6 +16,8 @@ public class VankeInboundOrderDto extends VankeInboundOrder {
     private List<VankeInboundRecordDto> vorList;
     @ApiModelProperty("库房名称")
     private String stockRoomName;
+    @ApiModelProperty(value = "后台管理员库房名称")
+    private String backStockRoomName;
     @ApiModelProperty("普通管理员名称")
     private String receptName;
     @ApiModelProperty("超级管理员名称")

mall-mbg/src/main/java/com/macro/mall/model/dto/vanke/VankeOutboundRecordDto.java

@@ -19,6 +19,8 @@ public class VankeOutboundRecordDto extends VankeOutboundRecord {
     private String goodsName;
     @ApiModelProperty("库房名称")
     private String stockRoomName;
+    @ApiModelProperty(value = "后台出库名称")
+    private String backStockRoomName;
     @ApiModelProperty("出库会员名称")
     private String memberName;
     @ApiModelProperty("会员所属部门")

mall-service/src/main/java/com/macro/mall/service/system/impl/UmsAdminServiceImpl.java

@@ -705,6 +705,11 @@ public class UmsAdminServiceImpl implements UmsAdminService {
         if( !res.isFlag() ){
             return new ResultMsg(false,res.getMsg());
         }
+        //查询C端会员
+        UmsMember queryUmsMember = this.umsMemberMapper.selectByPrimaryKey(umsAdminDto.getMemberId());
+        if(queryUmsMember == null){
+            return new ResultMsg(false,"传入会员id有误" );
+        }
         //初始化前端会员
         UmsMember umsMember = new UmsMember();
         UmsAdmin ua =this.adminDao.selectByMemberId(umsAdminDto.getMemberId());
@@ -719,10 +724,10 @@ public class UmsAdminServiceImpl implements UmsAdminService {
         umsAdmin.setCreateTime(new Date());
         umsAdmin.setUpdateDate(new Date());
         umsAdmin.setCreateDate(new Date());
-        umsAdmin.setIcon(umsAdminDto.getIcon());
-        umsAdmin.setPhone(umsAdminDto.getPhone());
+        umsAdmin.setIcon(queryUmsMember.getIcon());
+        umsAdmin.setPhone(queryUmsMember.getPhone());
         umsAdmin.setUsername(umsAdminDto.getUsername());
-        umsAdmin.setName(umsAdminDto.getName());
+        umsAdmin.setName(queryUmsMember.getName());
         umsAdmin.setMemberId(umsAdminDto.getMemberId());
         umsAdmin.setDepartId(umsAdminDto.getDepartId());
         umsAdmin.setStockRoomId(umsAdminDto.getStockRoomId());
@@ -738,11 +743,11 @@ public class UmsAdminServiceImpl implements UmsAdminService {
         umsMember.setStockRoomId(umsAdminDto.getStockRoomId());
         }else{ // 否则之前存在 后来解绑了  解绑就默认状态为删除状态  将删除状态修改回来
             ua.setDeleteStatus(0);//删除标识0 未删除 1已删除
-            ua.setIcon(umsAdminDto.getIcon());
-            ua.setPhone(umsAdminDto.getPhone());
+            ua.setIcon(queryUmsMember.getIcon());
+            ua.setPhone(queryUmsMember.getPhone());
             ua.setUsername(umsAdminDto.getUsername());
             ua.setPassword(umsAdminDto.getPassword());
-            ua.setName(umsAdminDto.getName());
+            ua.setName(queryUmsMember.getName());
             ua.setMemberId(umsAdminDto.getMemberId());
             ua.setDepartId(umsAdminDto.getDepartId());
             ua.setStockRoomId(umsAdminDto.getStockRoomId());

mall-service/src/main/java/com/macro/mall/service/vanke/impl/VankeGoodsServiceImpl.java

@@ -295,7 +295,11 @@ public class VankeGoodsServiceImpl implements IVankeGoodsService {
         VankeOutboundOrder vankeOutboundOrder = new VankeOutboundOrder();
         vankeOutboundOrder.setOutboundNo(outboundNo);
         vankeOutboundOrder.setMemberId(vankeGoodsRequestParam.getMemberId());
-        vankeOutboundOrder.setReceptOutboundMemberId(vankeGoodsRequestParam.getOutMemberId());
+        if(vankeGoodsRequestParam.getBackOutMemberId() == null ){
+            vankeOutboundOrder.setReceptOutboundMemberId(vankeGoodsRequestParam.getOutMemberId());
+        }else{
+            vankeOutboundOrder.setBackOutboundMemberId(vankeGoodsRequestParam.getBackOutMemberId());
+        }
         this.vankeOutboundOrderMapper.insertSelective(vankeOutboundOrder);
         //遍历传入物品集合
         for(VankeGoodsDto vg : vankeGoodsRequestParam.getVankeGoodsDtoList()){

mall-service/src/main/java/com/macro/mall/service/vanke/impl/VankeMemberLoginServiceImpl.java

@@ -336,6 +336,9 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
         }
         String resJson = map.get("persons") + "";
         JSONArray json = JSONArray.parseArray(resJson);
+        if(json == null || json.isEmpty()){
+            return null;
+        }
         List<VankeVvUserImportVo> list = json.toJavaList(VankeVvUserImportVo.class);
         return list;
     }

mall-service/src/main/java/com/macro/mall/service/vanke/impl/VankeStockRoomServiceImpl.java

@@ -98,10 +98,12 @@ public class VankeStockRoomServiceImpl implements IVankeStockRoomService {
             List<AdminManageParam> ampList = this.umsAdminDao.selectListByOther(adminManageParam);
             String adminNames = "";
             for (AdminManageParam amp : ampList){
-                if(adminNames.equals("")){
-                    adminNames = amp.getMemberName();
-                }else {
-                    adminNames = adminNames+"/"+amp.getMemberName();
+                if(adminNames != null){
+                    if(adminNames.equals("")){
+                        adminNames = amp.getMemberName();
+                    }else {
+                        adminNames = adminNames+"/"+amp.getMemberName();
+                    }
                 }
             }
             vsr.setAdminName(adminNames);

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

@@ -864,6 +864,7 @@
         <if test="name != null and name != ''">
             and a.name  like CONCAT('%',#{name},'%')
         </if>
+        order by a.create_date desc
     </select>
 
     <select id="selectUmsMemberByJobNo" parameterType="java.lang.String" resultMap="BaseResultMap">

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

@@ -15,15 +15,17 @@
 
 <select id="getPageList" parameterType="com.macro.mall.model.dto.vanke.VankeOutboundRecordDto" resultMap="BaseResultMap">
     select
-        a.*,b.name receptOutboundName,c.name backOutboundName,d.name goodsName,d.goods_no goodsNo,e.name stockRoomName,f.name memberName,g.name departmentName,h.name categoryName
+        a.*,b.name receptOutboundName,c.name backOutboundName,d.name goodsName,d.goods_no goodsNo,e.name stockRoomName,f.name memberName,g.name departmentName,h.name categoryName,
+        i.name backStockRoomName
     from vanke_outbound_record a
     left join ums_member b ON a.recept_outbound_member_id = b.id
-    left join ums_member c ON a.back_outbound_member_id = c.id
+    left join ums_admin c ON a.back_outbound_member_id = c.id
     left join vanke_goods d ON a.goods_id = d.id
     left join vanke_stock_room e ON a.stock_room_id = e.id
     left join ums_member f ON a.member_id = f.id
     left join vanke_department g ON a.depart_id = g.id
     left join vanke_goods_category h ON a.goods_category_id = h.id
+    left join vanke_stock_room i ON c.stock_room_id = i.id
     where a.delete_status = 1
     <if test="goodsCategoryId != null">
         and a.goods_category_id = #{goodsCategoryId}

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

@@ -8,10 +8,11 @@
   </resultMap>
 
   <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
+      select a.*,b.name receptName,c.name backName ,d.name stockRoomName,e.name backStockRoomName from vanke_inbound_order a
       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
+      left join vanke_stock_room e ON c.stock_room_id = e.id
       where a.delete_status = 1
       <if test=" receptInboundMemberId != null">
           and a.recept_inbound_member_id = #{receptInboundMemberId}

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

@@ -58,7 +58,7 @@
     </select>
 
     <select id="selectListByInboundNo" parameterType="java.lang.String" resultMap="BaseResultMap">
-      select a.*,b.name goodsName,b.goods_no goodsNo,b.price,c.name categoryName ,d.name supplierName from  vanke_inbound_record a
+      select a.*,b.name goodsName,b.goods_no goodsNo,b.price,c.name categoryName ,d.supplier_name supplierName from  vanke_inbound_record a
       left join vanke_goods b ON a.goods_id = b.id
       left join vanke_goods_category c ON b.goods_category_id = c.id
       left join vanke_supplier d ON d.id = b.supplier_id