万科接口修复

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

@@ -29,8 +29,8 @@ public class VankeDepartmentController {
     @ApiOperation("万科后台_部门分页操作")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ResponseBody
-    public CommonResult<CommonPage<VankeDepartment>> list(@ApiParam(value="分页大小") @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
-                                                           @ApiParam(value="分页页数") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
+    public CommonResult<CommonPage<VankeDepartment>> list(@ApiParam(value="分页大小") @RequestParam(value = "pageSize", required = false) Integer pageSize,
+                                                           @ApiParam(value="分页页数") @RequestParam(value = "pageNum", required = false) Integer pageNum) {
         return CommonResult.success(CommonPage.restPage(this.vankeDepartmentSerive.getPageList(pageNum, pageSize)));
     }
 

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

@@ -35,7 +35,13 @@ public class VankeGoodsController {
                                                         @ApiParam(value="供应商id") @RequestParam(value = "supplierId",required = false) Long supplierId,
                                                         @ApiParam(value="库房id") @RequestParam(value = "stockRoomId",required = false) Long stockRoomId
                                                      ) {
-        return CommonResult.success(CommonPage.restPage(this.vankeGoodsService.selectList(pageNum,pageSize,name,goodsCategoryId,supplierId,stockRoomId)));
+
+        VankeGoodsDto vankeGoodsDto = new VankeGoodsDto();
+        vankeGoodsDto.setName(name);
+        vankeGoodsDto.setGoodsCategoryId(goodsCategoryId);
+        vankeGoodsDto.setSupplierId(supplierId);
+        vankeGoodsDto.setStockRoomId(stockRoomId);
+        return CommonResult.success(CommonPage.restPage(this.vankeGoodsService.selectList(pageNum,pageSize,vankeGoodsDto)));
     }
 
     @ApiOperation("万科后台_物品插入操作")

mall-mbg/src/main/java/com/macro/mall/model/dto/quanxing/UmsMemberDto.java

@@ -16,4 +16,6 @@ public class UmsMemberDto extends UmsMember implements Serializable {
     private String departName;
     @ApiModelProperty(value="库房名称")
     private String stockRoomName;
+    @ApiModelProperty(value = "分类名称")
+    private String categoryName;
 }

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

@@ -16,4 +16,6 @@ public class VankeGoodsDto extends VankeGoods {
     private String goodsCategoryName;
     @ApiModelProperty("出库会员id")
     private Long memberId;
+    @ApiModelProperty("库存预警值")
+    private Integer stockWarning;
 }

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

@@ -11,7 +11,10 @@ public class VankeGoodsRequestParam {
 
     @ApiModelProperty("物品集合")
     private List<VankeGoods> vankeGoodsList;
-
     @ApiModelProperty("物品出库集合")
     private List<VankeGoodsDto> vankeGoodsDtoList;
+    @ApiModelProperty("申领人的会员Id")
+    private Long memberId;
+    @ApiModelProperty("出库人的会员id")
+    private Long outMemberId;
 }

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

+package com.macro.mall.model.dto.vanke;
+
+import com.macro.mall.model.VankeInboundOrder;
+import com.macro.mall.model.VankeInboundRecord;
+import com.macro.mall.model.VankeOutboundOrder;
+import com.macro.mall.model.VankeOutboundRecord;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VankeInboundOrderDto extends VankeInboundOrder {
+
+    @ApiModelProperty("出库单详情")
+    private List<VankeInboundRecord> vorList;
+
+}

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

+package com.macro.mall.model.dto.vanke;
+
+import com.macro.mall.model.VankeOutboundOrder;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class VankeOutboundOrderDto extends VankeOutboundOrder {
+
+    @ApiModelProperty("出库单详情")
+    private List<VankeOutboundRecordDto> vorList;
+    @ApiModelProperty("会员名称")
+    private String memberName;
+    @ApiModelProperty("部门名称")
+    private String departmentName;
+    @ApiModelProperty("万科员工编号")
+    private String jobNo;
+    @ApiModelProperty("部门id")
+    private Long departId;
+    @ApiModelProperty("查询时间")
+    private  String queryTime;
+}

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

@@ -11,6 +11,8 @@ public class VankeOutboundRecordDto extends VankeOutboundRecord {
     private String receptOutboundName;
     @ApiModelProperty("后台出库员名称")
     private String backOutboundName;
+    @ApiModelProperty("货号")
+    private String goodsNo;
     @ApiModelProperty("物品名称")
     private String goodsName;
     @ApiModelProperty("库房名称")

mall-portal/src/main/java/com/macro/mall/portal/controller/member/StaffController.java

@@ -43,4 +43,6 @@ public class StaffController {
         }
         return  CommonResult.failed(res.getMsg());
     }
+
+
 }

mall-portal/src/main/java/com/macro/mall/portal/controller/member/UmsMemberController.java

@@ -3,6 +3,7 @@ package com.macro.mall.portal.controller.member;
 import com.macro.mall.common.api.CommonResult;
 import com.macro.mall.model.UmsMember;
 import com.macro.mall.model.common.ResultMsg;
+import com.macro.mall.model.dto.quanxing.UmsMemberDto;
 import com.macro.mall.model.dto.quanxing.UmsMemberRequestParam;
 import com.macro.mall.portal.domain.UmsMemberPhoneReviewAddParam;
 import com.macro.mall.domain.UmsMemberVerified;
@@ -48,6 +49,17 @@ public class UmsMemberController {
         return  CommonResult.failed(res.getMsg());
     }
 
+    @ApiOperation("万科h5_通过ticket更新万科用户信息 返回UmsMember对象 ")
+    @RequestMapping(value = "/updateVankeVvUser", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult updateVankeVvUser(@ApiParam("传入前端通过url获取的ticket(必传)")@RequestParam(value = "ticket") String ticket){
+        ResultMsg res = this.vankeMemberLoginService.updateVankeVvUser(ticket);
+        if(res.isFlag()){
+            return  CommonResult.success(res.getContext(),res.getMsg());
+        }
+        return  CommonResult.failed(res.getMsg());
+    }
+
     @ApiOperation("万科h5_测试使用测试通过jobNo登录 返回token ")
     @RequestMapping(value = "/testToken", method = RequestMethod.GET)
     @ResponseBody
@@ -95,7 +107,12 @@ public class UmsMemberController {
         return CommonResult.success(currentMember);
     }
 
-
+    @ApiOperation("根据会员id查询一条数据")
+    @RequestMapping(value = "/selectOneByMemberId", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<UmsMemberDto> selectOneByMemberId(@ApiParam("会员memberId")@RequestParam(value = "memberId") Long memberId) {
+        return CommonResult.success(this.memberService.selectOneByMemberId(memberId));
+    }
 
 
 }
\ No newline at end of file

mall-portal/src/main/java/com/macro/mall/portal/controller/member/VankeConfigController.java

+package com.macro.mall.portal.controller.member;
+
+
+import com.macro.mall.common.api.CommonResult;
+import com.macro.mall.model.VankeConfig;
+import com.macro.mall.service.vanke.IVankeConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@Api(tags = "万科h5_配置相关接口", description = "配置控制器")
+@RequestMapping("/vankeConfig")
+public class VankeConfigController {
+
+    @Autowired
+    private IVankeConfigService vankeConfigService;
+
+    @ApiOperation("万科后台_得到一条系统配置信息")
+    @RequestMapping(value = "/getOne", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<VankeConfig> getOne(){
+        return CommonResult.success(this.vankeConfigService.getConfig());
+    }
+
+}

mall-portal/src/main/java/com/macro/mall/portal/controller/member/VankeGoodsCategoryController.java

+package com.macro.mall.portal.controller.member;
+
+import com.macro.mall.common.api.CommonPage;
+import com.macro.mall.common.api.CommonResult;
+import com.macro.mall.model.VankeGoodsCategory;
+import com.macro.mall.model.common.ResultMsg;
+import com.macro.mall.service.vanke.IVankeGoodsCategoryService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@Api(tags = "万科h5_物品类别相关接口", description = "物品类别控制器")
+@RequestMapping("/vankeGoodsCategory")
+public class VankeGoodsCategoryController {
+
+    @Autowired
+    private IVankeGoodsCategoryService vankeGoodsCategoryService;
+
+    @ApiOperation("万科h5_物品类别分页操作")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<CommonPage<VankeGoodsCategory>> list(@ApiParam(value="分页大小") @RequestParam(value = "pageSize", required = false) Integer pageSize,
+                                                             @ApiParam(value="分页页数") @RequestParam(value = "pageNum", required = false) Integer pageNum) {
+        return CommonResult.success(CommonPage.restPage(this.vankeGoodsCategoryService.getPageList(pageNum, pageSize)));
+    }
+
+}

mall-portal/src/main/java/com/macro/mall/portal/controller/member/VankeGoodsController.java

+package com.macro.mall.portal.controller.member;
+
+import com.macro.mall.common.api.CommonPage;
+import com.macro.mall.common.api.CommonResult;
+import com.macro.mall.model.common.ResultMsg;
+import com.macro.mall.model.dto.vanke.VankeGoodsDto;
+import com.macro.mall.model.dto.vanke.VankeGoodsRequestParam;
+import com.macro.mall.service.vanke.IVankeGoodsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+@Controller
+@Api(tags = "万科h5_物品相关接口", description = "物品控制器")
+@RequestMapping("/vankeGoods")
+public class VankeGoodsController {
+
+    @Autowired
+    private IVankeGoodsService vankeGoodsService;
+
+
+    @ApiOperation("万科h5_出库操作")
+    @ResponseBody
+    @RequestMapping(value = "/selectOneByOutBoundNo", method = RequestMethod.POST)
+    public CommonResult outStock(@ApiParam("传入出库商品集合以及出库人会员id以及申领人的会员id") @RequestBody VankeGoodsRequestParam vankeGoodsRequestParam){
+        ResultMsg res = this.vankeGoodsService.outVankeGoodsList(vankeGoodsRequestParam);
+        if(res.isFlag()){
+            return CommonResult.success(null,res.getMsg());
+        }
+        return CommonResult.failed(res.getMsg());
+    }
+
+    @ApiOperation("万科h5_查询一条商品记录")
+    @ResponseBody
+    @RequestMapping(value = "/selectOneByOter", method = RequestMethod.POST)
+    public CommonResult selectOneByOter(@ApiParam("传入需要查询的参数") @RequestBody VankeGoodsDto vankeGoodsDto){
+        return CommonResult.success( this.vankeGoodsService.selectOneByOther(vankeGoodsDto),"查询成功");
+    }
+
+    @ApiOperation("万科h5_物品分页操作")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<CommonPage<VankeGoodsDto>> list(@ApiParam(value="分页大小") @RequestParam(value = "pageSize", required = false) Integer pageSize,
+                                                        @ApiParam(value="分页页数") @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                                        @ApiParam(value="物品名称") @RequestParam(value = "name",required = false) String name,
+                                                        @ApiParam(value="物品分类id") @RequestParam(value = "goodsCategoryId",required = false) Long goodsCategoryId,
+                                                        @ApiParam(value="供应商id") @RequestParam(value = "supplierId",required = false) Long supplierId,
+                                                        @ApiParam(value="库房id") @RequestParam(value = "stockRoomId",required = false) Long stockRoomId,
+                                                        @ApiParam(value="库存预警值") @RequestParam(value = "stockWarning",required = false) Integer stockWarning
+    ) {
+        VankeGoodsDto vankeGoodsDto = new VankeGoodsDto();
+        vankeGoodsDto.setName(name);
+        vankeGoodsDto.setGoodsCategoryId(goodsCategoryId);
+        vankeGoodsDto.setSupplierId(supplierId);
+        vankeGoodsDto.setStockRoomId(stockRoomId);
+        vankeGoodsDto.setStockWarning(stockWarning);
+        return CommonResult.success(CommonPage.restPage(this.vankeGoodsService.selectList(pageNum,pageSize,vankeGoodsDto)));
+    }
+}

mall-portal/src/main/java/com/macro/mall/portal/controller/member/VankeOutboundOrderController.java

+package com.macro.mall.portal.controller.member;
+
+import com.macro.mall.common.api.CommonPage;
+import com.macro.mall.common.api.CommonResult;
+import com.macro.mall.model.UmsMember;
+import com.macro.mall.model.common.ResultMsg;
+import com.macro.mall.model.dto.vanke.VankeGoodsDto;
+import com.macro.mall.model.dto.vanke.VankeGoodsRequestParam;
+import com.macro.mall.model.dto.vanke.VankeOutboundOrderDto;
+import com.macro.mall.service.vanke.IVankeGoodsService;
+import com.macro.mall.service.vanke.IVankeOutboundOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Controller
+@Api(tags = "万科h5_出库单相关接口", description = "出库单控制器")
+@RequestMapping("/vankeOutboundOrder")
+public class VankeOutboundOrderController {
+
+    @Autowired
+    private IVankeOutboundOrderService vankeOutboundOrderService;
+
+    @ApiOperation("万科h5_领用记录分页查询")
+    @ResponseBody
+    @RequestMapping(value = "/getPageList", method = RequestMethod.GET)
+    public CommonResult getPageList(@ApiParam("页数") @RequestParam("pageNum")Integer pageNum, @ApiParam("每页大小")@RequestParam("pageSize")Integer pageSize
+            , @ApiParam("部门id")@RequestParam(value = "departId",required = false)Long departId, @ApiParam("查询时间")@RequestParam(value = "queryTime",required = false)String queryTime){
+        VankeOutboundOrderDto vankeOutboundOrderDto = new VankeOutboundOrderDto();
+        vankeOutboundOrderDto.setDepartId(departId);
+        vankeOutboundOrderDto.setQueryTime(queryTime);
+        return  CommonResult.success(this.vankeOutboundOrderService.getPageList(pageNum,pageSize,vankeOutboundOrderDto));
+    }
+
+
+    @ApiOperation("万科h5_根据出库单号查询一条出库详情")
+    @ResponseBody
+    @RequestMapping(value = "/selectOneByOutBoundNo", method = RequestMethod.GET)
+    public CommonResult selectOneByOutBoundNo(@ApiParam("出库单号") @RequestParam("outboundNo")String outboundNo){
+        return  CommonResult.success(this.vankeOutboundOrderService.selectOneByOutBoundNo(outboundNo));
+    }
+
+
+
+}

mall-portal/src/main/java/com/macro/mall/portal/controller/member/VankeStatisticalChartController.java

+package com.macro.mall.portal.controller.member;
+
+import com.macro.mall.common.api.CommonResult;
+import com.macro.mall.model.dto.vanke.StatiscalQueryParam;
+import com.macro.mall.model.dto.vanke.VankeInboundRecordDto;
+import com.macro.mall.model.dto.vanke.VankeOutboundRecordDto;
+import com.macro.mall.model.dto.vanke.VankeStatisticalRequestParam;
+import com.macro.mall.service.vanke.IVankeGoodsStockService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Controller
+@Api(tags = "万科h5_统计图表相关接口", description = "统计图表控制器")
+@RequestMapping("/vankeStatisticalChart")
+public class VankeStatisticalChartController {
+
+    @Autowired
+    private IVankeGoodsStockService vankeGoodsStockService;
+
+
+
+
+    @ApiOperation("万科h5_获取管理员今日数据")
+    @RequestMapping(value = "/getHomeData", method = RequestMethod.POST)
+    @ResponseBody
+    public CommonResult getHomeData(@ApiParam(value="传入今日查询时间 eg：2020-06-29") @RequestParam(value = "queryTime") String queryTime){
+        return CommonResult.success(this.vankeGoodsStockService.getH5HomeData(queryTime));
+    }
+
+}

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

@@ -51,4 +51,6 @@ public interface UmsMemberDao {
     List<UmsMemberDto> selectUmsMember(UmsMemberDto umsMemberDto);
 
     UmsMember selectUmsMemberByJobNo(String jobNo);
+
+    UmsMemberDto selectOneByMemberId(Long memberId);
 }

mall-service/src/main/java/com/macro/mall/dao/vanke/VankeDepartmentController.java

+package com.macro.mall.dao.vanke;
+
+import com.macro.mall.common.api.CommonPage;
+import com.macro.mall.common.api.CommonResult;
+import com.macro.mall.model.VankeDepartment;
+import com.macro.mall.model.common.ResultMsg;
+import com.macro.mall.service.vanke.IVankeDepartmentSerive;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@Api(tags = "万科h5_部门相关接口", description = "部门控制器")
+@RequestMapping("/vankeDepartment")
+public class VankeDepartmentController {
+
+    @Autowired
+    private IVankeDepartmentSerive vankeDepartmentSerive;
+
+    @ApiOperation("万科h5_部门分页操作")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<CommonPage<VankeDepartment>> list(@ApiParam(value="分页大小") @RequestParam(value = "pageSize", required = false) Integer pageSize,
+                                                           @ApiParam(value="分页页数") @RequestParam(value = "pageNum", required = false) Integer pageNum) {
+        return CommonResult.success(CommonPage.restPage(this.vankeDepartmentSerive.getPageList(pageNum, pageSize)));
+    }
+
+}

mall-service/src/main/java/com/macro/mall/dao/vanke/VankeGoodsDao.java

@@ -35,4 +35,12 @@ public interface VankeGoodsDao {
     * @return
     */
    Integer selectLowStock(StatiscalQueryParam statiscalQueryParam);
+
+   /**
+    * 根据传入参数查询一条数据
+    * @param vankeGoodsDto
+    * @return
+    */
+   VankeGoodsDto selectOneByOther(VankeGoodsDto vankeGoodsDto);
+
 }

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

+package com.macro.mall.dao.vanke;
+
+import com.macro.mall.model.dto.vanke.VankeInboundOrderDto;
+import com.macro.mall.model.dto.vanke.VankeOutboundOrderDto;
+
+import java.util.List;
+
+public interface VankeInboundOrderDao {
+
+}

mall-service/src/main/java/com/macro/mall/dao/vanke/VankeOutBoundRecordDao.java

@@ -36,4 +36,11 @@ public interface VankeOutBoundRecordDao {
      * @return
      */
     List<VankeOutboundRecordDto> selectOutBoundByDepartId(StatiscalQueryParam statiscalQueryParam);
+
+    /**
+     * 根据订单号查询多条出库记录数据
+     * @param outboundNo
+     * @return
+     */
+    List<VankeOutboundRecordDto> selectListByOutboundNo(String outboundNo);
 }

mall-service/src/main/java/com/macro/mall/dao/vanke/VankeOutboundOrderDao.java

+package com.macro.mall.dao.vanke;
+
+import com.macro.mall.model.dto.vanke.VankeOutboundOrderDto;
+
+import java.util.List;
+
+public interface VankeOutboundOrderDao {
+
+    /**
+     * 根据会员查询出库单
+     * @param vankeOutboundOrderDto
+     * @return
+     */
+    List<VankeOutboundOrderDto> selectListByOther(VankeOutboundOrderDto vankeOutboundOrderDto);
+
+    /**
+     * 根据出库单号查询一条出库记录
+     * @param outboundNo
+     * @return
+     */
+    VankeOutboundOrderDto selectListByOutboundNo(String outboundNo);
+}

mall-service/src/main/java/com/macro/mall/service/member/UmsMemberService.java

@@ -206,4 +206,11 @@ public interface UmsMemberService {
      * @return
      */
     List<UmsMemberDto> getUmsMemberPageList(Integer pageNum,Integer pageSize,UmsMemberDto umsMemberDto);
+
+    /**
+     * 根据memberId 查询一条会员信息
+     * @param memberId
+     * @return
+     */
+    UmsMemberDto selectOneByMemberId(Long memberId);
 }

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

@@ -784,4 +784,14 @@ public class UmsMemberServiceImpl implements UmsMemberService {
         return this.memberDao.selectUmsMember(umsMemberDto);
     }
 
+
+    /**
+     * 根据memberId 查询一条会员信息
+     * @param memberId
+     * @return
+     */
+    @Override
+    public UmsMemberDto selectOneByMemberId(Long memberId){
+        return  this.memberDao.selectOneByMemberId(memberId);
+    }
 }

mall-service/src/main/java/com/macro/mall/service/vanke/IVankeGoodsService.java

@@ -27,10 +27,10 @@ public interface IVankeGoodsService {
      *
      * @param pageNum 页数
      * @param pageSize 页数大小
-     * @param name 物品名称
+     * @param vankeGoodsDto
      * @return
      */
-    List<VankeGoodsDto> selectList(Integer pageNum,Integer pageSize,String name, Long goodsCategoryId, Long supplierId, Long stockRoomId);
+    List<VankeGoodsDto> selectList(Integer pageNum,Integer pageSize,VankeGoodsDto vankeGoodsDto);
 
     /**
      * 根据供应商id 获得旗下物品类别
@@ -59,4 +59,13 @@ public interface IVankeGoodsService {
      * @return
      */
     ResultMsg outVankeGoodsList(VankeGoodsRequestParam vankeGoodsRequestParam);
+
+    /**
+     * 根据其他参数查询一条数据
+      * @param vankeGoodsDto
+     * @return
+     */
+    VankeGoodsDto selectOneByOther(VankeGoodsDto vankeGoodsDto);
+
+
 }

mall-service/src/main/java/com/macro/mall/service/vanke/IVankeGoodsStockService.java

@@ -71,4 +71,11 @@ public interface IVankeGoodsStockService {
      * @return
      */
     List<VankeInboundRecordDto> selectInBoundByCategory(StatiscalQueryParam statiscalQueryParam);
+
+    /**
+     * 获取h5端的管理员页数据
+     * @param queryTime
+     * @return
+     */
+    Map<String,Object> getH5HomeData(String queryTime);
 }

mall-service/src/main/java/com/macro/mall/service/vanke/IVankeMemberLoginService.java

@@ -26,4 +26,11 @@ public interface IVankeMemberLoginService {
      * @return
      */
    UmsMember handleSuccessInfo(Map<String,Object> map);
+
+    /**
+     * 通过ticket更新万科用户信息
+     * @param ticket
+     * @return
+     */
+   ResultMsg updateVankeVvUser(String ticket);
 }

mall-service/src/main/java/com/macro/mall/service/vanke/IVankeOutboundOrderService.java

+package com.macro.mall.service.vanke;
+
+import com.macro.mall.common.api.CommonPage;
+import com.macro.mall.model.dto.vanke.VankeOutboundOrderDto;
+
+import java.util.List;
+
+public interface IVankeOutboundOrderService {
+
+
+    /**
+     * 分页查询出库记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    CommonPage<VankeOutboundOrderDto> getPageList(Integer pageNum, Integer pageSize, VankeOutboundOrderDto vankeOutboundOrderDto);
+
+
+    /**
+     * 根据出库单号查询一条出库记录
+     * @param outboundNo
+     * @return
+     */
+    VankeOutboundOrderDto selectOneByOutBoundNo(String outboundNo);
+
+}

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

@@ -32,7 +32,9 @@ public class VankeDepartmentSeriveImpl implements IVankeDepartmentSerive {
 
     @Override
     public List<VankeDepartment> getPageList(Integer pageNum, Integer pageSize){
-        PageHelper.startPage(pageNum, pageSize);
+        if(pageNum != null &&  pageSize != null){
+            PageHelper.startPage(pageNum, pageSize);
+        }
         VankeDepartmentExample example = new VankeDepartmentExample();
         VankeDepartmentExample.Criteria criteria = example.createCriteria();
         criteria.andDeleteStatusEqualTo(1);//'1未删除 0已删除'

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

@@ -3,14 +3,12 @@ package com.macro.mall.service.vanke.impl;
 import com.github.pagehelper.PageHelper;
 import com.macro.mall.common.utils.TimeUtils;
 import com.macro.mall.dao.vanke.VankeGoodsDao;
-import com.macro.mall.mapper.UmsMemberMapper;
-import com.macro.mall.mapper.VankeGoodsMapper;
-import com.macro.mall.mapper.VankeInboundRecordMapper;
-import com.macro.mall.mapper.VankeOutboundRecordMapper;
+import com.macro.mall.mapper.*;
 import com.macro.mall.model.*;
 import com.macro.mall.model.common.ResultMsg;
 import com.macro.mall.model.dto.vanke.VankeGoodsDto;
 import com.macro.mall.model.dto.vanke.VankeGoodsRequestParam;
+import com.macro.mall.service.member.UmsMemberService;
 import com.macro.mall.service.system.UmsAdminService;
 import com.macro.mall.service.vanke.IVankeBackLogService;
 import com.macro.mall.service.vanke.IVankeGoodsService;
@@ -47,24 +45,26 @@ public class VankeGoodsServiceImpl implements IVankeGoodsService {
     private UmsMemberMapper umsMemberMapper;
     @Resource
     private VankeOutboundRecordMapper vankeOutboundRecordMapper;
+    @Resource
+    private VankeInboundOrderMapper vankeInboundOrderMapper;
+    @Resource
+    private VankeOutboundOrderMapper vankeOutboundOrderMapper;
+    @Autowired
+    private UmsMemberService umsMemberService;
+
     /**
      *
      * @param pageNum 页数
      * @param pageSize 页数大小
-     * @param name 物品名称
+     * @param vankeGoodsDto
      * @return
      */
     @Override
-    public List<VankeGoodsDto> selectList(Integer pageNum, Integer pageSize, String name, Long goodsCategoryId, Long supplierId, Long stockRoomId){
+    public List<VankeGoodsDto> selectList(Integer pageNum, Integer pageSize,VankeGoodsDto vankeGoodsDto){
         //分页操作
         if(pageNum != null && pageSize!= null){
             PageHelper.startPage(pageNum, pageSize);
         }
-        VankeGoodsDto vankeGoodsDto = new VankeGoodsDto();
-        vankeGoodsDto.setName(name);
-        vankeGoodsDto.setGoodsCategoryId(goodsCategoryId);
-        vankeGoodsDto.setSupplierId(supplierId);
-        vankeGoodsDto.setStockRoomId(stockRoomId);
         return this.vankeGoodsDao.selectList(vankeGoodsDto);
     }
 
@@ -177,15 +177,25 @@ public class VankeGoodsServiceImpl implements IVankeGoodsService {
         VankeInboundRecord vankeInboundRecord = new VankeInboundRecord();
         //获取管理员对象
         UmsAdmin ua  = umsAdminService.getCurrentUmsAdmin();
+        //插入入库单
+        String inboundNo=TimeUtils.getOrderNo();
+        VankeInboundOrder vio = new VankeInboundOrder();
+        vio.setInboundNo(inboundNo);
+        if(ua!= null && ua.getType()== 2){ //如果不为空 并且账户类型为2 则是普通管理员 账户类型 1超级管理员 2普通管理员
+            vio.setReceptInboundMemberId(ua.getMemberId());
+        }else {//否则是超管
+            vio.setBackInboundMemberId(ua.getId());
+        }
+        this.vankeInboundOrderMapper.insertSelective(vio);
         //遍历传入物品集合
         for(VankeGoods vg : vankeGoodsRequestParam.getVankeGoodsList()){
             int stockNum = 0;
             //插入入库记录表
             vankeInboundRecord.setGoodsId(vg.getId());
-            vankeInboundRecord.setInboundNo(TimeUtils.getOrderNo());
+            vankeInboundRecord.setInboundNo(inboundNo);
             vankeInboundRecord.setStockRoomId(vg.getStockRoomId());
             vankeInboundRecord.setInboundNum(vg.getGoodsNum());
-            if(ua!= null && ua.getMemberId()!=null){ //如果不为空则是普通管理员
+            if(ua!= null && ua.getType()== 2){ //如果不为空 并且账户类型为2 则是普通管理员 账户类型 1超级管理员 2普通管理员
                 vankeInboundRecord.setReceptInboundMemberId(ua.getMemberId());
             }else {//否则是超管
                 vankeInboundRecord.setBackInboundMemberId(ua.getId());
@@ -220,14 +230,25 @@ public class VankeGoodsServiceImpl implements IVankeGoodsService {
         if(vankeGoodsRequestParam.getVankeGoodsDtoList() == null || vankeGoodsRequestParam.getVankeGoodsDtoList().size()==0){
             return  new ResultMsg(false,"传入物品集合为空");
         }
+        if(vankeGoodsRequestParam.getMemberId() == null){
+            return new ResultMsg(false,"传入申领人的会员id为空！");
+        }
+        if(vankeGoodsRequestParam.getOutMemberId() == null){
+            return new ResultMsg(false,"传入出库会员的id为空");
+        }
         //用来存取 根据id查询得到的物品对象
         VankeGoods vankeGoods;
         //用来建立入库记录对象
         VankeOutboundRecord vankeOutboundRecord = new VankeOutboundRecord();
-        //获取管理员对象
-        UmsAdmin ua  = umsAdminService.getCurrentUmsAdmin();
         //建立会员对象
         UmsMember umsMember;
+        //生成出库单
+        String outboundNo=TimeUtils.getOrderNo();
+        VankeOutboundOrder vankeOutboundOrder = new VankeOutboundOrder();
+        vankeOutboundOrder.setOutboundNo(outboundNo);
+        vankeOutboundOrder.setMemberId(vankeGoodsRequestParam.getMemberId());
+        vankeOutboundOrder.setReceptOutboundMemberId(vankeGoodsRequestParam.getOutMemberId());
+        this.vankeOutboundOrderMapper.insertSelective(vankeOutboundOrder);
         //遍历传入物品集合
         for(VankeGoodsDto vg : vankeGoodsRequestParam.getVankeGoodsDtoList()){
             int stockNum = 0;
@@ -249,20 +270,27 @@ public class VankeGoodsServiceImpl implements IVankeGoodsService {
             if(umsMember == null){
                 return new ResultMsg(false,"传入会员id"+vg.getMemberId()+"不存在");
             }
-            vankeOutboundRecord.setOutboundNo(TimeUtils.getOrderNo());
+            vankeOutboundRecord.setOutboundNo(outboundNo);
             vankeOutboundRecord.setMemberId(vg.getMemberId());
             vankeOutboundRecord.setDepartId(umsMember.getDepartId());
             vankeOutboundRecord.setGoodsId(vg.getId());
             vankeOutboundRecord.setStockRoomId(vg.getStockRoomId());
             vankeOutboundRecord.setOutboundNum(vg.getGoodsNum());
-            if(ua!= null && ua.getMemberId()!=null){ //如果不为空则是普通管理员
-                vankeOutboundRecord.setReceptOutboundMemberId(ua.getMemberId());
-            }else {//否则是超管
-                vankeOutboundRecord.setBackOutboundMemberId(ua.getId());
-            }
+            vankeOutboundRecord.setReceptOutboundMemberId(vankeGoodsRequestParam.getOutMemberId());
             this.vankeOutboundRecordMapper.insertSelective(vankeOutboundRecord);
         }
             return new ResultMsg(true,"操作成功");
     }
 
+    /**
+     * 根据其他参数查询一条数据
+     * @param vankeGoodsDto
+     * @return
+     */
+    @Override
+    public VankeGoodsDto selectOneByOther(VankeGoodsDto vankeGoodsDto){
+        return this.vankeGoodsDao.selectOneByOther(vankeGoodsDto);
+    }
+
+
 }

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

@@ -7,6 +7,7 @@ import com.macro.mall.dao.vanke.VankeOutBoundRecordDao;
 import com.macro.mall.mapper.VankeConfigMapper;
 import com.macro.mall.mapper.VankeGoodsStockMapper;
 import com.macro.mall.model.UmsAdmin;
+import com.macro.mall.model.UmsMember;
 import com.macro.mall.model.VankeConfig;
 import com.macro.mall.model.VankeGoodsStock;
 import com.macro.mall.model.common.ResultMsg;
@@ -14,6 +15,7 @@ import com.macro.mall.model.dto.vanke.StatiscalQueryParam;
 import com.macro.mall.model.dto.vanke.VankeGoodsStockDto;
 import com.macro.mall.model.dto.vanke.VankeInboundRecordDto;
 import com.macro.mall.model.dto.vanke.VankeOutboundRecordDto;
+import com.macro.mall.service.member.UmsMemberService;
 import com.macro.mall.service.system.UmsAdminService;
 import com.macro.mall.service.vanke.IVankeConfigService;
 import com.macro.mall.service.vanke.IVankeGoodsStockService;
@@ -44,6 +46,8 @@ public class VankeGoodsStockServiceImpl implements IVankeGoodsStockService {
     private UmsAdminService umsAdminService;
     @Resource
     private VankeGoodsDao vankeGoodsDao;
+    @Autowired
+    private UmsMemberService umsMemberService;
     /**
      * 插入商品库存变化信息
      * @param goodsId
@@ -146,6 +150,35 @@ public class VankeGoodsStockServiceImpl implements IVankeGoodsStockService {
     }
 
     /**
+     * 获取h5端的管理员页数据
+     * @param queryTime
+     * @return
+     */
+    @Override
+    public Map<String,Object> getH5HomeData(String queryTime){
+        //获取当前会员对象
+        UmsMember um = umsMemberService.getCurrentMember();
+        //查询对象
+        StatiscalQueryParam statiscalQueryParam = new StatiscalQueryParam();
+        statiscalQueryParam.setMemberId(um.getId());
+        statiscalQueryParam.setStockRoomId(um.getStockRoomId());
+        Map<String,Object> dataMap = new HashMap<>();
+        dataMap.put("今日出库",this.vankeOutBoundRecordDao.selectOutboundCountByQueryTime(statiscalQueryParam));
+        dataMap.put("今日入库",this.vankeInboundRecordDao.selectInboundCountByQueryTime(statiscalQueryParam));
+        dataMap.put("今日申领人",this.vankeOutBoundRecordDao.selectMemberCountByQueryTime(statiscalQueryParam));
+        dataMap.put("剩余库存",this.vankeGoodsStockDao.selectGoodsStockCount(statiscalQueryParam));
+        //计算库存预警的数量
+        VankeConfig vc = this.vankeConfigService.getConfig();
+        if(vc == null){
+            vc = new VankeConfig();
+            vc.setStockWarning(0);
+        }
+        statiscalQueryParam.setGoodsNum(vc.getStockWarning());
+        dataMap.put("库存预警",this.vankeGoodsDao.selectLowStock(statiscalQueryParam));
+        return dataMap;
+    }
+
+    /**
      * 根据时间和物品id查询物品领用情况
      * @param dateList
      * @param goodsId

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

@@ -21,6 +21,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -89,10 +90,49 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
     }
 
     /**
+     * 通过ticket更新万科用户信息
+     * @param ticket
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ResultMsg updateVankeVvUser(String ticket){
+        if(ticket == null || "".equals(ticket)){
+            return new ResultMsg(false,"传入ticket为空");
+        }
+        //通过appId 和 ticket 以及 token发起获取用户身份信息请求
+        String params ="{\n" +
+                "    \"appid\": \""+this.appId+"\",\n" +
+                "    \"ticket\": \""+ticket+"\"\n" +
+                "}";
+        String res = null;
+        Map<String,Object> map = new HashMap<>();
+        try {
+            res = HttpUtil.postGeneralUrl("https://vvtest.vanke.com/gateway/ticket/user/acquirecontext?accessToken="+this.getVankeAccessToken(),"application/json",params,"UTF-8");
+            map = MyJsonUtil.getMapChangeJson(res);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage(), e);
+        }
+        if((boolean)map.get("success")){ //如果成功 执行成功的业务
+            //得到通过返回的map数据 更新umsMember
+            ResultMsg result = this.updateUmsMember(map);
+            if(result.isFlag()){
+                return new ResultMsg(true,"更新成功",result.getContext());
+            }
+            return new ResultMsg(false,result.getMsg());
+        }else{//否则获取失败  打印失败信息 return出去
+            log.info("更新用户获取信息失败失败" + res);
+            return new ResultMsg(false,res);
+        }
+    }
+
+    /**
      * 得到万科用户信息
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResultMsg getVankeUserInfo(String ticket){
         if(ticket == null || "".equals(ticket)){
             return new ResultMsg(false,"传入ticket为空");
@@ -122,7 +162,6 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
         }
     }
 
-
     /**
      * 处理回调成功的会员数据信息 得到Ums_member
      */
@@ -170,6 +209,7 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
             um = new UmsMember();
             um.setUsername(vankeVvUser.getAccount());
             um.setPhone(vankeVvUser.getMobile());
+            um.setIcon(vankeVvUser.getPhotourl());
             um.setCreateTime(new Date());
             um.setUpdateDate(new Date());
             um.setCreateDate(new Date());
@@ -185,6 +225,65 @@ public class VankeMemberLoginServiceImpl implements IVankeMemberLoginService {
     }
 
 
+    private ResultMsg updateUmsMember(Map<String,Object> map){
+        //通过job_no（员工编号）判断表中是否已经存在数据  不存在插入 存在则返回已登录  同时需要登录通过 返回自己系统token给前端
+        UmsMember um = this.umsMemberDao.selectUmsMemberByJobNo( map.get("jobNo")+"");
+        if(um == null){
+            log.error("查询会员错误,不存在此会员，返回会员信息数据为:"+map);
+            return new ResultMsg(false,"ticket获取用户信息错误。"+map);
+        }else{
+            VankeVvUser vankeVvUser = new VankeVvUser();
+            vankeVvUser.setAccount( map.get("account")+"");
+            vankeVvUser.setAppid( map.get("appid")+"");
+            vankeVvUser.setDepartOrgName( map.get("departOrgName")+"");
+            vankeVvUser.setDepartment(map.get("department")+"");
+            vankeVvUser.setDeviceId( map.get("deviceId")+"");
+            vankeVvUser.setEid( map.get("eid")+"");
+            vankeVvUser.setEmail( map.get("email")+"");
+            vankeVvUser.setJobNo( map.get("jobNo")+"");
+            vankeVvUser.setLongName( map.get("longName")+"");
+            vankeVvUser.setMobile( map.get("mobile")+"");
+            vankeVvUser.setNetworkid( map.get("networkid")+"");
+            vankeVvUser.setOid( map.get("oid")+"");
+            vankeVvUser.setOpenid( map.get("openid")+"");
+            vankeVvUser.setOrgid( map.get("orgId")+"");
+            vankeVvUser.setPhotourl( map.get("photoUrl")+"");
+            vankeVvUser.setTid( map.get("tid")+"");
+            vankeVvUser.setUid( map.get("uid")+"");
+            vankeVvUser.setUserid( map.get("userid")+"");
+            vankeVvUser.setUsername( map.get("username")+"");
+            vankeVvUser.setXtid( map.get("xtid")+"");
+            vankeVvUser.setIsAdmin( map.get("isAdmin")+"");
+            this.vankeVvUserMapper.insertSelective(vankeVvUser);
+            //根据部门名称判断是否存在此部门
+            VankeDepartmentExample example = new VankeDepartmentExample();
+            VankeDepartmentExample.Criteria criteria = example.createCriteria();
+            criteria.andNameEqualTo(vankeVvUser.getDepartment());
+            List<VankeDepartment> vdList = this.vankeDepartmentMapper.selectByExample(example);
+            //初始化部门对象
+            VankeDepartment vd = new VankeDepartment();
+            if(vdList == null || vdList.size() == 0 ){ // 如果不存在此部门 则新增部门
+                vd.setName(vankeVvUser.getDepartment());
+            }else{//否则存在
+                vd = vdList.get(0);
+            }
+            um.setUsername(vankeVvUser.getAccount());
+            um.setPhone(vankeVvUser.getMobile());
+            um.setIcon(vankeVvUser.getPhotourl());
+            um.setCreateTime(new Date());
+            um.setUpdateDate(new Date());
+            um.setCreateDate(new Date());
+            um.setName(vankeVvUser.getUsername());
+            um.setEmail(vankeVvUser.getEmail());
+            um.setLoginTime(new Date());
+            um.setJobNo(vankeVvUser.getJobNo());
+            um.setDepartId(vd.getId());
+            this.umsMemberMapper.updateByPrimaryKeySelective(um);
+        }
+        return new ResultMsg(true,"更新成功",um);
+
+    }
+
 
 
 }

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

+package com.macro.mall.service.vanke.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.macro.mall.common.api.CommonPage;
+import com.macro.mall.dao.vanke.VankeOutBoundRecordDao;
+import com.macro.mall.dao.vanke.VankeOutboundOrderDao;
+import com.macro.mall.model.UmsMember;
+import com.macro.mall.model.dto.vanke.VankeOutboundOrderDto;
+import com.macro.mall.service.member.UmsMemberService;
+import com.macro.mall.service.vanke.IVankeOutboundOrderService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class VankeOutboundOrderServiceImpl implements IVankeOutboundOrderService {
+
+    @Resource
+    private VankeOutboundOrderDao vankeOutboundOrderDao;
+    @Resource
+    private UmsMemberService umsMemberService;
+    @Resource
+    private VankeOutBoundRecordDao vankeOutBoundRecordDao;
+
+
+    /**
+     * 分页查询出库记录
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @Override
+    public CommonPage<VankeOutboundOrderDto> getPageList(Integer pageNum, Integer pageSize, VankeOutboundOrderDto vankeOutboundOrderDto){
+        //判断当前调用此接口的角色 是管理员还是普通用户
+        UmsMember um = umsMemberService.getCurrentMember();
+        if(um.getAccouuntType() == 1){ //如果是普通用户
+            vankeOutboundOrderDto.setMemberId(um.getId());
+        }else{ //否则如果是管理员
+            vankeOutboundOrderDto.setReceptOutboundMemberId(um.getId());
+        }
+        //分页操作
+        PageHelper.startPage(pageNum, pageSize);
+        List<VankeOutboundOrderDto> voodList = this.vankeOutboundOrderDao.selectListByOther(vankeOutboundOrderDto);
+        //记录下 pagehelper第一次分页查询的 返回得总条数 等信息
+        PageInfo<VankeOutboundOrderDto> pageInfo = new PageInfo<>(voodList);
+        //遍历出库单 得到所有出库单  通过出库单号 查询旗下出库记录集合
+        voodList.forEach(voo ->{
+            voo.setVorList(this.vankeOutBoundRecordDao.selectListByOutboundNo(voo.getOutboundNo()));
+        });
+        //因为进行了第二次查询 所以pageHelp得分页总数得到了变化 导致不准确 因此我们需要手动校准一下
+        CommonPage<VankeOutboundOrderDto> result = new CommonPage<VankeOutboundOrderDto>();
+        result.setTotalPage(pageInfo.getPages());
+        result.setPageNum(pageInfo.getPageNum());
+        result.setPageSize(pageInfo.getPageSize());
+        result.setTotal(pageInfo.getTotal());
+        result.setList(voodList);
+        return result;
+    }
+
+    /**
+     * 根据出库单号查询一条出库记录
+     * @param outboundNo
+     * @return
+     */
+    @Override
+    public VankeOutboundOrderDto selectOneByOutBoundNo(String outboundNo){
+        VankeOutboundOrderDto vood = this.vankeOutboundOrderDao.selectListByOutboundNo(outboundNo);
+        vood.setVorList(this.vankeOutBoundRecordDao.selectListByOutboundNo(outboundNo));
+        return vood;
+    }
+
+}

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

@@ -44,6 +44,7 @@
     
     <resultMap id="BaseResultMap2" type="com.macro.mall.model.dto.quanxing.UmsMemberDto" extends="com.macro.mall.mapper.UmsMemberMapper.BaseResultMap">
         <result column="departName" jdbcType="VARCHAR" property="departName"/>
+        <result column="categoryName" jdbcType="VARCHAR" property="categoryName"/>
         <result column="stockRoomName" jdbcType="VARCHAR" property="stockRoomName"/>
     </resultMap>
     
@@ -860,4 +861,11 @@
         select * from ums_member
         where job_no = #{jobNo}
     </select>
+
+    <select id="selectOneByMemberId" parameterType="java.lang.Long" resultMap="BaseResultMap2">
+        select a.*,b.name departmentName,c.name categoryName from ums_member a
+        left join vanke_department b ON a.depart_id = b.id
+        left join vanke_goods_category c ON a.depart_id = b.id
+        where id = #{id}
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -26,6 +26,9 @@
      <if test="supplierId != null and supplierId!=''">
        and d.id  = #{supplierId}
      </if>
+       <if test="stockWarning != null">
+           and a.goodsNum &lt;=  stockWarning
+       </if>
    </select>
 
     <select id="selectSupplierCategory" parameterType="com.macro.mall.model.dto.vanke.VankeGoodsDto" resultMap="BaseResultMap">
@@ -67,5 +70,16 @@
         </if>
     </select>
 
+    <select id="selectOneByOther" parameterType="com.macro.mall.model.dto.vanke.VankeGoodsDto" resultMap="BaseResultMap">
+        select  a.* ,b.name goodsCategoryName from vanke_goods a
+        left join vanke_goods_category b ON a.goods_category_id = b.id
+        where a.delete_status = 1
+        <if test="id != null">
+            and a.id = #{id}
+        </if>
+        <if test="barCode != null and barCode != ''">
+          and a.bar_code = #{barCode}
+        </if>
+    </select>
 
 </mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.macro.mall.dao.vanke.VankeInboundOrderDao">
+  <resultMap id="BaseResultMap" type="com.macro.mall.model.dto.vanke.VankeInboundOrderDto" extends="com.macro.mall.mapper.VankeInboundOrderMapper.BaseResultMap">
+
+  </resultMap>
+
+
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.macro.mall.dao.vanke.VankeOutboundOrderDao">
+  <resultMap id="BaseResultMap" type="com.macro.mall.model.dto.vanke.VankeOutboundOrderDto" extends="com.macro.mall.mapper.VankeOutboundOrderMapper.BaseResultMap">
+      <result column="memberName" jdbcType="VARCHAR" property="memberName" />
+      <result column="departmentName" jdbcType="VARCHAR" property="departmentName" />
+      <result column="jobNo" jdbcType="VARCHAR" property="jobNo" />
+  </resultMap>
+
+    <select id="selectListByOther" resultMap="BaseResultMap" parameterType="com.macro.mall.model.dto.vanke.VankeOutboundOrderDto">
+        select a.* ,b.name memberName,c.name departmentName   from  vanke_outbound_order a
+        left join ums_member b ON a.member_id = b.id
+        left join vanke_department c ON b.depart_id = c.id
+        where a.delete_status = 1
+        <if test="receptOutboundMemberId != null">
+            and a.recept_outbound_member_id = #{receptOutboundMemberId}
+        </if>
+        <if test="memberId != null">
+            and a.member_id = #{memberId}
+        </if>
+        <if test="departId != null">
+            and b.depart_id = #{departId}
+        </if>
+        <if test="queryTime != null and queryTime != ''">
+            and date_format(a.createtime, '%Y-%m-%d' ) = #{queryTime}
+        </if>
+    </select>
+
+    <select id="selectListByOutboundNo" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select a.* ,b.name memberName,c.name departmentName   from  vanke_outbound_order a
+        left join ums_member b ON a.member_id = b.id
+        left join vanke_department c ON b.depart_id = c.id
+        where a.delete_status = 1
+        and a.outbound_no  = #{outboundNo}
+    </select>
+
+
+</mapper>
\ No newline at end of file

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

@@ -4,6 +4,7 @@
   <resultMap id="BaseResultMap" type="com.macro.mall.model.dto.vanke.VankeOutboundRecordDto" extends="com.macro.mall.mapper.VankeOutboundRecordMapper.BaseResultMap">
       <result column="receptOutboundName" jdbcType="VARCHAR" property="receptOutboundName" />
       <result column="backOutboundName" jdbcType="VARCHAR" property="backOutboundName" />
+      <result column="goodsNo" jdbcType="VARCHAR" property="goodsNo" />
       <result column="goodsName" jdbcType="VARCHAR" property="goodsName" />
       <result column="stockRoomName" jdbcType="VARCHAR" property="stockRoomName" />
       <result column="memberName" jdbcType="VARCHAR" property="memberName" />
@@ -104,4 +105,11 @@
         GROUP BY b.depart_id
     </select>
 
+    <select id="selectListByOutboundNo" parameterType="java.lang.String" resultMap="BaseResultMap">
+      select a.*,b.name goodsName,b.goods_no goodsNo,c.name categoryName   from  vanke_outbound_record a
+      left join vanke_goods b ON a.goods_id = b.id
+      left join vanke_goods_category c ON a.goods_category_id = c.id
+      where  a.outbound_no =#{outboundNo}
+    </select>
+
 </mapper>
\ No newline at end of file