修复相关接口

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

@@ -43,7 +43,7 @@ public class PmsProductController {
     @RequestMapping(value = "/getProductInfo", method = RequestMethod.GET)
     @ResponseBody
     //@PreAuthorize("hasAuthority('pms:product:read')")
-    public CommonResult getUpdateInfo( @ApiParam("商品Id") @RequestParam(value="id") Long id) {
+    public CommonResult<PmsProductRequestParam> getUpdateInfo( @ApiParam("商品Id") @RequestParam(value="id") Long id) {
         PmsProductRequestParam pmsProductRequestParam = productService.getProductById(id);
         return CommonResult.success(pmsProductRequestParam);
     }

mall-admin/src/main/java/com/macro/mall/controller/quanxing/PmsSupplierAuditController.java

@@ -35,9 +35,10 @@ public class PmsSupplierAuditController {
     @ApiOperation("权星后台_申请供应商分页数据")
     @ResponseBody
     @RequestMapping(value = "/getPageList", method = RequestMethod.POST)
-    public CommonResult<CommonPage<PmsSupplierAuditDto>> getPageList(@ApiParam("页数") @RequestParam("page")Integer page, @ApiParam("每页大小")@RequestParam("size")Integer size,
-                                                                    @ApiParam("供应商名称")@RequestParam("name") String name, @ApiParam("手机号")@RequestParam("phone") String phone){
-        return  CommonResult.success(CommonPage.restPage(this.pmsSupplierAuditService.getPageList(page,size,name,phone)));
+    public CommonResult getPageList(@ApiParam("页数") @RequestParam("page")Integer page, @ApiParam("每页大小")@RequestParam("size")Integer size,
+                                                                    @ApiParam("供应商名称")@RequestParam("name") String name, @ApiParam("手机号")@RequestParam("phone") String phone,
+                                                                     @ApiParam("(非必传)审核状态 0待审核 1审核通过 2审核不通过")@RequestParam("status") Integer status){
+        return  CommonResult.success(this.pmsSupplierAuditService.getPageList(page,size,name,phone,status));
     }
 
     @ApiOperation("权星后台_通过审核Id得到 相关数据")

mall-mbg/src/main/java/com/macro/mall/model/PmsSupplierAudit.java

@@ -46,6 +46,9 @@ public class PmsSupplierAudit implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    @ApiModelProperty(value = "关联会员id")
+    private Long memberId;
+
     @ApiModelProperty(value = "删除标识0 未删除 1已删除")
     private Integer deleteStatus;
 
@@ -155,6 +158,14 @@ public class PmsSupplierAudit implements Serializable {
         this.remarks = remarks;
     }
 
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
     public Integer getDeleteStatus() {
         return deleteStatus;
     }
@@ -197,6 +208,7 @@ public class PmsSupplierAudit implements Serializable {
         sb.append(", password=").append(password);
         sb.append(", status=").append(status);
         sb.append(", remarks=").append(remarks);
+        sb.append(", memberId=").append(memberId);
         sb.append(", deleteStatus=").append(deleteStatus);
         sb.append(", createtime=").append(createtime);
         sb.append(", updatetime=").append(updatetime);

mall-mbg/src/main/java/com/macro/mall/model/PmsSupplierAuditExample.java

@@ -925,6 +925,66 @@ public class PmsSupplierAuditExample {
             return (Criteria) this;
         }
 
+        public Criteria andMemberIdIsNull() {
+            addCriterion("member_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdIsNotNull() {
+            addCriterion("member_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdEqualTo(Long value) {
+            addCriterion("member_id =", value, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdNotEqualTo(Long value) {
+            addCriterion("member_id <>", value, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdGreaterThan(Long value) {
+            addCriterion("member_id >", value, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("member_id >=", value, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdLessThan(Long value) {
+            addCriterion("member_id <", value, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdLessThanOrEqualTo(Long value) {
+            addCriterion("member_id <=", value, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdIn(List<Long> values) {
+            addCriterion("member_id in", values, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdNotIn(List<Long> values) {
+            addCriterion("member_id not in", values, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdBetween(Long value1, Long value2) {
+            addCriterion("member_id between", value1, value2, "memberId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMemberIdNotBetween(Long value1, Long value2) {
+            addCriterion("member_id not between", value1, value2, "memberId");
+            return (Criteria) this;
+        }
+
         public Criteria andDeleteStatusIsNull() {
             addCriterion("delete_status is null");
             return (Criteria) this;

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsSupplierAuditMapper.xml

@@ -14,6 +14,7 @@
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="member_id" jdbcType="BIGINT" property="memberId" />
     <result column="delete_status" jdbcType="INTEGER" property="deleteStatus" />
     <result column="createtime" jdbcType="TIMESTAMP" property="createtime" />
     <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
@@ -78,7 +79,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, name, brand_name, company_name, business_license, business, trademark, other_materials, 
-    phone, password, status, remarks, delete_status, createtime, updatetime
+    phone, password, status, remarks, member_id, delete_status, createtime, updatetime
   </sql>
   <select id="selectByExample" parameterType="com.macro.mall.model.PmsSupplierAuditExample" resultMap="BaseResultMap">
     select
@@ -115,14 +116,14 @@
       company_name, business_license, business, 
       trademark, other_materials, phone, 
       password, status, remarks, 
-      delete_status, createtime, updatetime
-      )
+      member_id, delete_status, createtime, 
+      updatetime)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{brandName,jdbcType=VARCHAR}, 
       #{companyName,jdbcType=VARCHAR}, #{businessLicense,jdbcType=VARCHAR}, #{business,jdbcType=VARCHAR}, 
       #{trademark,jdbcType=VARCHAR}, #{otherMaterials,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, 
       #{password,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, 
-      #{deleteStatus,jdbcType=INTEGER}, #{createtime,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP}
-      )
+      #{memberId,jdbcType=BIGINT}, #{deleteStatus,jdbcType=INTEGER}, #{createtime,jdbcType=TIMESTAMP}, 
+      #{updatetime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.macro.mall.model.PmsSupplierAudit">
     insert into pms_supplier_audit
@@ -163,6 +164,9 @@
       <if test="remarks != null">
         remarks,
       </if>
+      <if test="memberId != null">
+        member_id,
+      </if>
       <if test="deleteStatus != null">
         delete_status,
       </if>
@@ -210,6 +214,9 @@
       <if test="remarks != null">
         #{remarks,jdbcType=VARCHAR},
       </if>
+      <if test="memberId != null">
+        #{memberId,jdbcType=BIGINT},
+      </if>
       <if test="deleteStatus != null">
         #{deleteStatus,jdbcType=INTEGER},
       </if>
@@ -266,6 +273,9 @@
       <if test="record.remarks != null">
         remarks = #{record.remarks,jdbcType=VARCHAR},
       </if>
+      <if test="record.memberId != null">
+        member_id = #{record.memberId,jdbcType=BIGINT},
+      </if>
       <if test="record.deleteStatus != null">
         delete_status = #{record.deleteStatus,jdbcType=INTEGER},
       </if>
@@ -294,6 +304,7 @@
       password = #{record.password,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=INTEGER},
       remarks = #{record.remarks,jdbcType=VARCHAR},
+      member_id = #{record.memberId,jdbcType=BIGINT},
       delete_status = #{record.deleteStatus,jdbcType=INTEGER},
       createtime = #{record.createtime,jdbcType=TIMESTAMP},
       updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
@@ -337,6 +348,9 @@
       <if test="remarks != null">
         remarks = #{remarks,jdbcType=VARCHAR},
       </if>
+      <if test="memberId != null">
+        member_id = #{memberId,jdbcType=BIGINT},
+      </if>
       <if test="deleteStatus != null">
         delete_status = #{deleteStatus,jdbcType=INTEGER},
       </if>
@@ -362,6 +376,7 @@
       password = #{password,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
       remarks = #{remarks,jdbcType=VARCHAR},
+      member_id = #{memberId,jdbcType=BIGINT},
       delete_status = #{deleteStatus,jdbcType=INTEGER},
       createtime = #{createtime,jdbcType=TIMESTAMP},
       updatetime = #{updatetime,jdbcType=TIMESTAMP}

mall-service/src/main/java/com/macro/mall/dao/quanxing/PmsSupplierAuditDao.java

+package com.macro.mall.dao.quanxing;
+
+import com.macro.mall.model.PmsSupplierAudit;
+
+import java.util.List;
+
+public interface PmsSupplierAuditDao {
+
+    PmsSupplierAudit selectOneByMemberId(Long memberId);
+}

mall-service/src/main/java/com/macro/mall/service/quanxing/IPmsSupplierAuditService.java

 package com.macro.mall.service.quanxing;
 
+import com.macro.mall.common.api.CommonPage;
 import com.macro.mall.model.common.ResultMsg;
 import com.macro.mall.model.dto.PmsSupplierAuditDto;
 
@@ -34,7 +35,7 @@ public interface IPmsSupplierAuditService {
      * @param phone
      * @return
      */
-    List<PmsSupplierAuditDto> getPageList(Integer page,Integer size,String name,String phone);
+    CommonPage<PmsSupplierAuditDto> getPageList(Integer page, Integer size, String name, String phone, Integer status);
 
     /**
      * 根据id获取一条审核记录

mall-service/src/main/java/com/macro/mall/service/quanxing/impl/PmsSupplierAuditServiceImpl.java

 package com.macro.mall.service.quanxing.impl;
 
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.macro.mall.common.api.CommonPage;
 import com.macro.mall.dao.quanxing.PmsSupplierAuditProductDao;
 import com.macro.mall.mapper.PmsSupplierAuditMapper;
 import com.macro.mall.mapper.PmsSupplierAuditProductMapper;
@@ -60,8 +62,7 @@ public class PmsSupplierAuditServiceImpl implements IPmsSupplierAuditService {
         pmsSupplierAudit.setId(id);
         pmsSupplierAudit.setStatus(status);
         pmsSupplierAudit.setRemarks(remarks);
-        //更新审核状态
-        this.pmsSupplierAuditMapper.updateByPrimaryKeySelective(pmsSupplierAudit);
+
         if(status == 1){//审核通过还需将信息写入会员表
             //补充会员信息
             UmsMember umsMember = new UmsMember();
@@ -83,7 +84,11 @@ public class PmsSupplierAuditServiceImpl implements IPmsSupplierAuditService {
             umsMember.setCreateTime(new Date());
             //插入操作
             this.umsMemberMapper.insert(umsMember);
+            //插入会员id
+            pmsSupplierAudit.setMemberId(umsMember.getId());
         }
+        //更新审核状态
+        this.pmsSupplierAuditMapper.updateByPrimaryKeySelective(pmsSupplierAudit);
 
         return new ResultMsg(true,"操作成功");
     }
@@ -166,7 +171,7 @@ public class PmsSupplierAuditServiceImpl implements IPmsSupplierAuditService {
 
 
     @Override
-    public List<PmsSupplierAuditDto> getPageList(Integer pageNum, Integer pageSize, String name,String phone){
+    public CommonPage<PmsSupplierAuditDto> getPageList(Integer pageNum, Integer pageSize, String name, String phone, Integer status){
         PageHelper.startPage(pageNum, pageSize);
         PmsSupplierAuditExample example = new PmsSupplierAuditExample();
         PmsSupplierAuditExample.Criteria criteria = example.createCriteria();
@@ -176,9 +181,14 @@ public class PmsSupplierAuditServiceImpl implements IPmsSupplierAuditService {
         if(phone != null && !"".equals(phone)){
             criteria.andPhoneEqualTo(phone);
         }
+        if(status != null){
+            criteria.andStatusEqualTo(status);
+        }
         //过滤已删除的数据
         criteria.andDeleteStatusEqualTo(0);//删除标识0 未删除 1已删除
         List<PmsSupplierAudit> dataList = this.pmsSupplierAuditMapper.selectByExample(example);
+        //记录下 pagehelper第一次分页查询的 返回得总条数 等信息
+        PageInfo<PmsSupplierAudit> pageInfo = new PageInfo<>(dataList);
         List<PmsSupplierAuditDto> psadList = new ArrayList<>();
         dataList.forEach(pmsSupplierAudit->{
             PmsSupplierAuditDto dto = new PmsSupplierAuditDto();
@@ -188,7 +198,14 @@ public class PmsSupplierAuditServiceImpl implements IPmsSupplierAuditService {
             dto.setPmsSupplierAuditProductList(this.pmsSupplierAuditProductDao.selectListByAuditId(pmsSupplierAudit.getId()));
             psadList.add(dto);
         });
-        return psadList;
+        //因为进行了第二次查询 所以pageHelp得分页总数得到了变化 导致不准确 因此我们需要手动校准一下
+        CommonPage<PmsSupplierAuditDto> result = new CommonPage<PmsSupplierAuditDto>();
+        result.setTotalPage(pageInfo.getPages());
+        result.setPageNum(pageInfo.getPageNum());
+        result.setPageSize(pageInfo.getPageSize());
+        result.setTotal(pageInfo.getTotal());
+        result.setList(psadList);
+        return result;
     }
 
     /**

mall-service/src/main/resources/com/macro/mall/dao/quanxing/PmsSupplierAuditDao.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.quanxing.PmsSupplierAuditDao">
+    <resultMap id="BaseResultMap" type="com.macro.mall.model.PmsSupplierAudit" extends="com.macro.mall.mapper.PmsSupplierAuditMapper.BaseResultMap">
+
+    </resultMap>
+
+    <select id="selectOneByMemberId" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select * from pms_supplier_audit
+        where member_id = #{memberId}
+    </select>
+    
+</mapper>
\ No newline at end of file