万科接口修复

mall-admin/src/main/java/com/macro/mall/controller/UmsMemberController.java

@@ -32,10 +32,15 @@ public class UmsMemberController {
     public CommonResult<CommonPage<UmsMemberDto>> 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 = "departId", required = false) Long departId) {
+                                                        @ApiParam(value="部门Id") @RequestParam(value = "departId", required = false) Long departId,
+                                                       @ApiParam(value="账户类型（0管理员1普通用户）") @RequestParam(value = "accountType", required = false) Integer accountType) {
         UmsMemberDto umsMemberDto = new UmsMemberDto();
         umsMemberDto.setName(name);
         umsMemberDto.setDepartId(departId);
+        if( accountType == null){
+            accountType = 1;
+        }
+        umsMemberDto.setAccouuntType(accountType);
         return CommonResult.success(CommonPage.restPage(this.umsMemberService.getUmsMemberPageList(pageNum, pageSize,umsMemberDto)));
     }
 

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

@@ -30,8 +30,10 @@ public class VankeBackLogController {
     @ResponseBody
     public CommonResult<CommonPage<VankeBackLogDto>> 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) {
-        return CommonResult.success(CommonPage.restPage(this.vankeBackLogService.getPageList(pageNum, pageSize,name)));
+                                                          @ApiParam(value="会员名称") @RequestParam(value = "name", required = false) String name,
+                                                          @ApiParam(value="起始时间") @RequestParam(value = "startTime", required = false) String startTime,
+                                                          @ApiParam(value="结束名称") @RequestParam(value = "endTime", required = false) String endTime) {
+        return CommonResult.success(CommonPage.restPage(this.vankeBackLogService.getPageList(pageNum, pageSize,name,startTime,endTime)));
     }
 
 

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

@@ -67,17 +67,13 @@ public class UmsRoleServiceImpl implements UmsRoleService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public CommonResult delete(List<Long> ids) throws Exception {
-        UmsRoleExample example = new UmsRoleExample();
-        example.createCriteria().andIdIn(ids);
-        List<UmsRole> roles = roleMapper.selectByExample(example);
-        for (UmsRole role : roles) {
-            role.setDeleteStatus(1);
-            int i = roleMapper.updateByPrimaryKey(role);
-            if (i == 0) {
-                throw new Exception();
-            }
-        }
+    public CommonResult delete(List<Long> ids) {
+        UmsRole ur = new UmsRole();
+        ur.setDeleteStatus(1);
+        ids.forEach(id ->{
+            ur.setId(id);
+            roleMapper.updateByPrimaryKey(ur);
+        });
         return CommonResult.success("删除成功");
     }
 

mall-mbg/src/main/resources/generatorConfig.xml

@@ -38,7 +38,7 @@
         <javaClientGenerator type="XMLMAPPER" targetPackage="com.macro.mall.mapper"
                              targetProject="mall-mbg/src/main/java"/>
         <!--生成全部表tableName设为%-->
-        <table tableName="vanke_vv_user">
+        <table tableName="vanke_outbound_order">
             <generatedKey column="id" sqlStatement="MySql" identity="true"/>
         </table>
 

mall-service/src/main/java/com/macro/mall/dao/vanke/VankeDepartmentController.java → mall-portal/src/main/java/com/macro/mall/portal/controller/member/VankeDepartmentController.java

-package com.macro.mall.dao.vanke;
+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.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;

mall-service/src/main/java/com/macro/mall/domain/dto/vanke/VankeBackLogDto.java

@@ -11,5 +11,8 @@ public class VankeBackLogDto extends VankeBackLog implements Serializable {
 
     @ApiModelProperty("操作人昵称")
     private String name;
-
+    @ApiModelProperty("起始时间")
+    private String startTime;
+    @ApiModelProperty("结束时间")
+    private String endTime;
 }

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

@@ -148,12 +148,7 @@ public class UmsAdminServiceImpl implements UmsAdminService {
         boolean isService = false;
         try {
             UmsAdmin admin = getAdminByUsername(username);
-            if (admin != null) {
-                Integer type1 = admin.getType();
-                if (!type.equals(type1)) {
-                    return CommonResult.failed("不是该平台的用户");
-                }
-            } else {
+            if (admin == null) {
                 return CommonResult.failed("用户不存在");
             }
             if (admin.getDeleteStatus().equals(1)) {
@@ -710,7 +705,7 @@ public class UmsAdminServiceImpl implements UmsAdminService {
         umsAdmin.setIcon(umsAdminDto.getIcon());
         umsAdmin.setPhone(umsAdminDto.getPhone());
         umsAdmin.setUsername(umsAdminDto.getUsername());
-        umsAdmin.setPassword(umsAdminDto.getPassword());
+        umsAdmin.setPassword(passwordEncoder.encode(umsAdminDto.getPassword()));
         umsAdmin.setName(umsAdminDto.getName());
         umsAdmin.setMemberId(umsAdminDto.getMemberId());
         umsAdmin.setDepartId(umsAdminDto.getDepartId());

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

@@ -14,7 +14,7 @@ public interface IVankeBackLogService {
      * @param pageSize
      * @return
      */
-    List<VankeBackLogDto> getPageList(Integer pageNum, Integer pageSize,String name);
+    List<VankeBackLogDto> getPageList(Integer pageNum, Integer pageSize,String name,String startTime,String endTime);
 
     ResultMsg insertVankeBackLog(String msg);
 }

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

@@ -31,10 +31,12 @@ public class VankeBackLogServiceImpl implements IVankeBackLogService {
     private UmsAdminService umsAdminService;
 
     @Override
-    public List<VankeBackLogDto> getPageList(Integer pageNum, Integer pageSize,String name) {
+    public List<VankeBackLogDto> getPageList(Integer pageNum, Integer pageSize,String name,String startTime,String endTime) {
         PageHelper.startPage(pageNum, pageSize);
         VankeBackLogDto vankeBackLogDto = new VankeBackLogDto();
         vankeBackLogDto.setName(name);
+        vankeBackLogDto.setStartTime(startTime);
+        vankeBackLogDto.setEndTime(endTime);
         return this.vankeBackLogDao.selectList(vankeBackLogDto);
     }
 

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

@@ -266,16 +266,16 @@ public class VankeGoodsServiceImpl implements IVankeGoodsService {
             vankeGoods.setGoodsNum(stockNum);
             this.vankeGoodsMapper.updateByPrimaryKeySelective(vankeGoods);
             //查询会员
-            umsMember = this.umsMemberMapper.selectByPrimaryKey(vg.getMemberId());
+            umsMember = this.umsMemberMapper.selectByPrimaryKey(vankeGoodsRequestParam.getMemberId());
             if(umsMember == null){
                 return new ResultMsg(false,"传入会员id"+vg.getMemberId()+"不存在");
             }
             vankeOutboundRecord.setOutboundNo(outboundNo);
-            vankeOutboundRecord.setMemberId(vg.getMemberId());
+            vankeOutboundRecord.setMemberId(vankeGoodsRequestParam.getMemberId());
             vankeOutboundRecord.setDepartId(umsMember.getDepartId());
-            vankeOutboundRecord.setGoodsId(vg.getId());
-            vankeOutboundRecord.setStockRoomId(vg.getStockRoomId());
-            vankeOutboundRecord.setOutboundNum(vg.getGoodsNum());
+            vankeOutboundRecord.setGoodsId(vankeGoods.getId());
+            vankeOutboundRecord.setStockRoomId(vankeGoods.getStockRoomId());
+            vankeOutboundRecord.setOutboundNum(vankeGoods.getGoodsNum());
             vankeOutboundRecord.setReceptOutboundMemberId(vankeGoodsRequestParam.getOutMemberId());
             this.vankeOutboundRecordMapper.insertSelective(vankeOutboundRecord);
         }

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

@@ -855,6 +855,9 @@
         select a.* from ums_member a
         left join vanke_department b ON a.depart_id = b.id
         where a.delete_status = 0
+        <if test="accouuntType != null">
+            and a.accouunt_type = #{accouuntType}
+        </if>
     </select>
 
     <select id="selectUmsMemberByJobNo" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -863,9 +866,9 @@
     </select>
 
     <select id="selectOneByMemberId" parameterType="java.lang.Long" resultMap="BaseResultMap2">
-        select a.*,b.name departmentName,c.name categoryName from ums_member a
+        select a.*,b.name departmentName,c.name stockRoomName 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}
+        left join vanke_stock_room c ON a.stock_room_id = c.id
+        where a.id = #{id}
     </select>
 </mapper>
\ No newline at end of file

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

@@ -9,10 +9,15 @@
   <select id="selectList" resultMap="BaseResultMap" parameterType="com.macro.mall.domain.dto.vanke.VankeBackLogDto">
     select  a.*,b.nick_name name from vanke_back_log a
     left join  ums_admin b ON a.create_by = b.id
-    where a.delete_status = 0
+    where a.delete_status = 1
     <if test="name != null and name != ''">
       and b.nick_name = #{name}
     </if>
+    <if test="startTime != null and startTime !='' and endTime != null and endTime != ''">
+      and #{startTime} &lt;= date_format( a.createtime, '%Y-%m-%d' )
+      and date_format( a.createtime, '%Y-%m-%d' ) &lt;= #{endTime}
+    </if>
+
     order by a.createtime desc
   </select>
 

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

@@ -27,7 +27,7 @@
        and d.id  = #{supplierId}
      </if>
        <if test="stockWarning != null">
-           and a.goodsNum &lt;=  stockWarning
+           and a.goods_num &lt;=  #{stockWarning}
        </if>
    </select>
 
@@ -54,7 +54,7 @@
           where a.delete_status = 1
         and a.goods_num &lt;=  #{goodsNum}
         <if test="stockRoomId != null">
-            a.stock_room_id = #{stockRoomId}
+           and  a.stock_room_id = #{stockRoomId}
         </if>
         order by a.goods_num asc
         limit 0,5
@@ -66,7 +66,7 @@
         where delete_status = 1
         and goods_num &lt;=  #{goodsNum}
         <if test="stockRoomId != null">
-            stock_room_id = #{stockRoomId}
+          and stock_room_id = #{stockRoomId}
         </if>
     </select>