后台订单管理

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysDistributionOrderServiceImpl.java

@@ -3,6 +3,7 @@ package com.wwdz.ch.admin.impl;
 import com.github.pagehelper.PageInfo;
 import com.wwdz.ch.admin.entity.vo.SysDistributionOrderVo;
 import com.wwdz.ch.admin.service.SysDistributionOrderService;
+import com.wwdz.ch.core.consts.CommConsts;
 import com.wwdz.ch.core.consts.DistributionEnum;
 import com.wwdz.ch.core.type.PageSearchResult;
 import com.wwdz.ch.core.type.Result;
@@ -79,12 +80,9 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                     return Result.success();
                 }
             }
-            if (dto.getType() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
-                dto.setType(DistributionEnum.DistributionTypeEnum.COLLECT.getCode());
-            } else {
+            if (dto.getType() == null) {
                 dto.setTypeList(Arrays.asList(DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode(), DistributionEnum.DistributionTypeEnum.AUCTION.getCode()));
             }
-
             List<DistributionOrder> distributionOrderList = distributionOrderDao.findByPage(dto);
             PageInfo pageInfo = new PageInfo<>(distributionOrderList);
 
@@ -100,7 +98,7 @@ public class SysDistributionOrderServiceImpl implements SysDistributionOrderServ
                 distributionOrderVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(distributionOrder.getType()));
                 distributionOrderVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
                 distributionOrderVo.setBuyerName(cacheUtil.getAppletUserNameById(distributionOrder.getBuyerId()));
-                distributionOrderVo.setSellerName(cacheUtil.getAppletUserNameById(distributionOrder.getSellerId()));
+                distributionOrderVo.setSellerName(distributionOrder.getSellerId() == CommConsts.SYSTEM_ACCOUNT.longValue()? "系统账号" : cacheUtil.getAppletUserNameById(distributionOrder.getSellerId()));
                 //支付截止时间，下单后半小时内
                 Date date = distributionOrder.getCreateTime();
                 Instant instant = date.toInstant().plus(Duration.ofMinutes(30));

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -31,7 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.util.CollectionUtils;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
@@ -165,6 +164,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
                 supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
                 supplierItemVo.setTypeName(DistributionEnum.DistributionTypeEnum.getNameByCode(supplierItem.getType()));
                 supplierItemVo.setCreatorName(cacheUtil.getAppletUserById(supplierItem.getCreatorId()).getNickname());
+                supplierItemVo.setStatusName(SupplierItemEnum.StatusEnum.getNameByCode(supplierItem.getStatus()));
                 if (supplierItem.getBuyLimitNum() == -1) {
                     supplierItemVo.setIsLimitBuy(false);
                 }
@@ -211,6 +211,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
             supplierItemVo.setSupplyPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getSupplyPrice()));
             supplierItemVo.setDistributionPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getDistributionPrice()));
             supplierItemVo.setHomePageImage(MediaUtil.getHomePageImage(supplierItem.getImages(), supplierItem.getVideos()));
+            supplierItemVo.setCreatorName(cacheUtil.getAppletUserById(supplierItem.getCreatorId()).getNickname());
             //拍卖品需要查询拍卖配置信息
             if (supplierItem.getType() == DistributionEnum.DistributionTypeEnum.AUCTION.getCode()) {
                 AuctionConfig auctionConfig = auctionConfigDao.findByItemId(itemId);
@@ -219,6 +220,9 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
                 supplierItemVo.setStartPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getStartPrice()));
                 supplierItemVo.setAddExtent(PriceUtil.convertPriceFenToYuan(auctionConfig.getAddExtent()));
             }
+            if (supplierItem.getStock() == 0 || supplierItem.getIsOnSale()) {
+                supplierItemVo.setIsAbleSale(true);
+            }
             return Result.success(supplierItemVo);
         } catch (Exception e) {
             logger.error("商品详情查询失败 error : {}", e);
@@ -344,7 +348,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
             SupplierItem supplierItem = new SupplierItem();
             supplierItem.setId(dto.getId());
             supplierItem.setIsDeleted(true);
-            supplierItem.setState(SupplierItemEnum.StateEnum.IRREGULAR.getCode());
+            supplierItem.setStatus(SupplierItemEnum.StatusEnum.IRREGULAR.getCode());
             supplierItemDao.update(supplierItem);
             //发送短息通知用户商品违规被下架，跳转到个人藏馆
             String url = wxAppletApi.getUrlLink("/pages/saleSelf/index","userId=" + oldItem.getCreatorId() + "&shareRecordId=");

ch-core/src/main/java/com/wwdz/ch/core/consts/SupplierItemEnum.java

@@ -5,7 +5,7 @@ public class SupplierItemEnum {
     /**
      * 商品状态
      */
-    public enum StateEnum {
+    public enum StatusEnum {
         COMMON(0, "正常"),
         IRREGULAR(1, "违规"),
         ;
@@ -13,15 +13,15 @@ public class SupplierItemEnum {
         private int code;
         private String des;
 
-        StateEnum(int code, String des) {
+        StatusEnum(int code, String des) {
             this.code = code;
             this.des = des;
         }
 
         public static String getNameByCode(int code) {
-            for (SupplierItemEnum.StateEnum levelEnum : SupplierItemEnum.StateEnum.values()) {
-                if (code == levelEnum.getCode()) {
-                    return levelEnum.getDes();
+            for (StatusEnum statusEnum : StatusEnum.values()) {
+                if (code == statusEnum.getCode()) {
+                    return statusEnum.getDes();
                 }
             }
             return null;

ch-core/src/main/java/com/wwdz/ch/core/entity/SupplierItemVo.java

@@ -261,4 +261,11 @@ public class SupplierItemVo implements Entity {
      * 是否可以出售
      */
     private Boolean isAbleSale;
+
+    /**
+     * 藏品状态
+     */
+    private Integer status;
+
+    private String statusName;
 }

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/SupplierItem.java

@@ -95,7 +95,7 @@ public class SupplierItem implements Entity {
     /**
      * 状态0正常1违规
      */
-    private Integer state;
+    private Integer status;
 
     /**
      * 商品图片,分号分隔
@@ -136,7 +136,7 @@ public class SupplierItem implements Entity {
         sb.append(", type=").append(type);
         sb.append(", rebate=").append(rebate);
         sb.append(", creatorId=").append(creatorId);
-        sb.append(", state=").append(state);
+        sb.append(", status=").append(status);
         sb.append(", images=").append(images);
         sb.append(", videos=").append(videos);
         sb.append(", description=").append(description);
@@ -173,7 +173,7 @@ public class SupplierItem implements Entity {
             && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
             && (this.getRebate() == null ? other.getRebate() == null : this.getRebate().equals(other.getRebate()))
             && (this.getCreatorId() == null ? other.getCreatorId() == null : this.getCreatorId().equals(other.getCreatorId()))
-            && (this.getState() == null ? other.getState() == null : this.getState().equals(other.getState()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getImages() == null ? other.getImages() == null : this.getImages().equals(other.getImages()))
             && (this.getVideos() == null ? other.getVideos() == null : this.getVideos().equals(other.getVideos()))
             && (this.getDescription() == null ? other.getDescription() == null : this.getDescription().equals(other.getDescription()));
@@ -199,7 +199,7 @@ public class SupplierItem implements Entity {
         result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
         result = prime * result + ((getRebate() == null) ? 0 : getRebate().hashCode());
         result = prime * result + ((getCreatorId() == null) ? 0 : getCreatorId().hashCode());
-        result = prime * result + ((getState() == null) ? 0 : getState().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
         result = prime * result + ((getImages() == null) ? 0 : getImages().hashCode());
         result = prime * result + ((getVideos() == null) ? 0 : getVideos().hashCode());
         result = prime * result + ((getDescription() == null) ? 0 : getDescription().hashCode());
@@ -230,7 +230,7 @@ public class SupplierItem implements Entity {
         type("type", "type", "INTEGER", true),
         rebate("rebate", "rebate", "DECIMAL", false),
         creatorId("creator_id", "creatorId", "BIGINT", false),
-        state("state", "state", "INTEGER", true),
+        status("status", "status", "INTEGER", true),
         images("images", "images", "LONGVARCHAR", false),
         videos("videos", "videos", "LONGVARCHAR", false),
         description("description", "description", "LONGVARCHAR", false);

ch-dao/src/main/java/com/wwdz/ch/db/domain/distribution/SupplierItemExample.java

@@ -2281,18 +2281,18 @@ public class SupplierItemExample {
             return (Criteria) this;
         }
 
-        public Criteria andStateIsNull() {
-            addCriterion("`state` is null");
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
             return (Criteria) this;
         }
 
-        public Criteria andStateIsNotNull() {
-            addCriterion("`state` is not null");
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStateEqualTo(Integer value) {
-            addCriterion("`state` =", value, "state");
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("`status` =", value, "status");
             return (Criteria) this;
         }
 
@@ -2303,13 +2303,13 @@ public class SupplierItemExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        public Criteria andStateEqualToColumn(SupplierItem.Column column) {
-            addCriterion(new StringBuilder("`state` = ").append(column.getEscapedColumnName()).toString());
+        public Criteria andStatusEqualToColumn(SupplierItem.Column column) {
+            addCriterion(new StringBuilder("`status` = ").append(column.getEscapedColumnName()).toString());
             return (Criteria) this;
         }
 
-        public Criteria andStateNotEqualTo(Integer value) {
-            addCriterion("`state` <>", value, "state");
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("`status` <>", value, "status");
             return (Criteria) this;
         }
 
@@ -2320,13 +2320,13 @@ public class SupplierItemExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        public Criteria andStateNotEqualToColumn(SupplierItem.Column column) {
-            addCriterion(new StringBuilder("`state` <> ").append(column.getEscapedColumnName()).toString());
+        public Criteria andStatusNotEqualToColumn(SupplierItem.Column column) {
+            addCriterion(new StringBuilder("`status` <> ").append(column.getEscapedColumnName()).toString());
             return (Criteria) this;
         }
 
-        public Criteria andStateGreaterThan(Integer value) {
-            addCriterion("`state` >", value, "state");
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("`status` >", value, "status");
             return (Criteria) this;
         }
 
@@ -2337,13 +2337,13 @@ public class SupplierItemExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        public Criteria andStateGreaterThanColumn(SupplierItem.Column column) {
-            addCriterion(new StringBuilder("`state` > ").append(column.getEscapedColumnName()).toString());
+        public Criteria andStatusGreaterThanColumn(SupplierItem.Column column) {
+            addCriterion(new StringBuilder("`status` > ").append(column.getEscapedColumnName()).toString());
             return (Criteria) this;
         }
 
-        public Criteria andStateGreaterThanOrEqualTo(Integer value) {
-            addCriterion("`state` >=", value, "state");
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`status` >=", value, "status");
             return (Criteria) this;
         }
 
@@ -2354,13 +2354,13 @@ public class SupplierItemExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        public Criteria andStateGreaterThanOrEqualToColumn(SupplierItem.Column column) {
-            addCriterion(new StringBuilder("`state` >= ").append(column.getEscapedColumnName()).toString());
+        public Criteria andStatusGreaterThanOrEqualToColumn(SupplierItem.Column column) {
+            addCriterion(new StringBuilder("`status` >= ").append(column.getEscapedColumnName()).toString());
             return (Criteria) this;
         }
 
-        public Criteria andStateLessThan(Integer value) {
-            addCriterion("`state` <", value, "state");
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("`status` <", value, "status");
             return (Criteria) this;
         }
 
@@ -2371,13 +2371,13 @@ public class SupplierItemExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        public Criteria andStateLessThanColumn(SupplierItem.Column column) {
-            addCriterion(new StringBuilder("`state` < ").append(column.getEscapedColumnName()).toString());
+        public Criteria andStatusLessThanColumn(SupplierItem.Column column) {
+            addCriterion(new StringBuilder("`status` < ").append(column.getEscapedColumnName()).toString());
             return (Criteria) this;
         }
 
-        public Criteria andStateLessThanOrEqualTo(Integer value) {
-            addCriterion("`state` <=", value, "state");
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("`status` <=", value, "status");
             return (Criteria) this;
         }
 
@@ -2388,28 +2388,28 @@ public class SupplierItemExample {
          * @mbg.generated
          * @project https://github.com/itfsw/mybatis-generator-plugin
          */
-        public Criteria andStateLessThanOrEqualToColumn(SupplierItem.Column column) {
-            addCriterion(new StringBuilder("`state` <= ").append(column.getEscapedColumnName()).toString());
+        public Criteria andStatusLessThanOrEqualToColumn(SupplierItem.Column column) {
+            addCriterion(new StringBuilder("`status` <= ").append(column.getEscapedColumnName()).toString());
             return (Criteria) this;
         }
 
-        public Criteria andStateIn(List<Integer> values) {
-            addCriterion("`state` in", values, "state");
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("`status` in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStateNotIn(List<Integer> values) {
-            addCriterion("`state` not in", values, "state");
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("`status` not in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStateBetween(Integer value1, Integer value2) {
-            addCriterion("`state` between", value1, value2, "state");
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("`status` between", value1, value2, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStateNotBetween(Integer value1, Integer value2) {
-            addCriterion("`state` not between", value1, value2, "state");
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("`status` not between", value1, value2, "status");
             return (Criteria) this;
         }
     }

ch-dao/src/main/java/com/wwdz/ch/db/dto/request/distribution/SupplierItemRequestDto.java

@@ -4,7 +4,6 @@ import com.wwdz.ch.db.dto.request.BaseRequestDto;
 import com.xxdxxs.entity.Entity;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -47,6 +46,11 @@ public class SupplierItemRequestDto extends BaseRequestDto implements Entity {
      */
     private String name;
 
+    /**
+     * 状态0正常1违规
+     */
+    private Integer status;
+
     /**
      * 置顶图片
      */

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SupplierItemDaoImpl.java

@@ -14,7 +14,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 @Repository
 public class SupplierItemDaoImpl implements SupplierItemDao {
@@ -39,6 +38,7 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         }
         JdbcHelper.ifPresent(dto.getTypeList(), criteria::andTypeIn);
         JdbcHelper.ifPresent(dto.getType(), criteria::andTypeEqualTo);
+        JdbcHelper.ifPresent(dto.getStatus(), criteria::andStatusEqualTo);
         JdbcHelper.ifPresent(dto.getStock(), criteria::andStockGreaterThan);
         JdbcHelper.ifPresent(dto.getIsOnSale(), criteria::andIsOnSaleEqualTo);
         JdbcHelper.ifPresent(dto.getIsDeleted(), criteria::andIsDeletedEqualTo);

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/distribution/SupplierItemMapper.xml

@@ -18,7 +18,7 @@
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="rebate" jdbcType="DECIMAL" property="rebate" />
     <result column="creator_id" jdbcType="BIGINT" property="creatorId" />
-    <result column="state" jdbcType="INTEGER" property="state" />
+    <result column="status" jdbcType="INTEGER" property="status" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.wwdz.ch.db.domain.distribution.SupplierItem">
     <result column="images" jdbcType="LONGVARCHAR" property="images" />
@@ -86,7 +86,7 @@
   <sql id="Base_Column_List">
     id, `name`, supplier_id, is_on_sale, sort, top_image, distribution_price, supply_price, 
     stock, create_time, update_time, is_deleted, buy_limit_num, `type`, rebate, creator_id, 
-    `state`
+    `status`
   </sql>
   <sql id="Blob_Column_List">
     images, videos, description
@@ -143,7 +143,7 @@
       <otherwise>
         id, `name`, supplier_id, is_on_sale, sort, top_image, distribution_price, supply_price, 
           stock, create_time, update_time, is_deleted, buy_limit_num, `type`, rebate, creator_id, 
-          `state`, images, videos, description
+          `status`, images, videos, description
       </otherwise>
     </choose>
     from supplier_item
@@ -178,7 +178,7 @@
       <otherwise>
         id, `name`, supplier_id, is_on_sale, sort, top_image, distribution_price, supply_price, 
           stock, create_time, update_time, is_deleted, buy_limit_num, `type`, rebate, creator_id, 
-          `state`, images, videos, description
+          `status`, images, videos, description
       </otherwise>
     </choose>
     from supplier_item
@@ -203,14 +203,14 @@
       supply_price, stock, create_time, 
       update_time, is_deleted, buy_limit_num, 
       `type`, rebate, creator_id, 
-      `state`, images, videos, 
+      `status`, images, videos, 
       description)
     values (#{name,jdbcType=VARCHAR}, #{supplierId,jdbcType=BIGINT}, #{isOnSale,jdbcType=BIT}, 
       #{sort,jdbcType=INTEGER}, #{topImage,jdbcType=VARCHAR}, #{distributionPrice,jdbcType=BIGINT}, 
       #{supplyPrice,jdbcType=BIGINT}, #{stock,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{isDeleted,jdbcType=BIT}, #{buyLimitNum,jdbcType=INTEGER}, 
       #{type,jdbcType=INTEGER}, #{rebate,jdbcType=DECIMAL}, #{creatorId,jdbcType=BIGINT}, 
-      #{state,jdbcType=INTEGER}, #{images,jdbcType=LONGVARCHAR}, #{videos,jdbcType=LONGVARCHAR}, 
+      #{status,jdbcType=INTEGER}, #{images,jdbcType=LONGVARCHAR}, #{videos,jdbcType=LONGVARCHAR}, 
       #{description,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.distribution.SupplierItem">
@@ -264,8 +264,8 @@
       <if test="creatorId != null">
         creator_id,
       </if>
-      <if test="state != null">
-        `state`,
+      <if test="status != null">
+        `status`,
       </if>
       <if test="images != null">
         images,
@@ -323,8 +323,8 @@
       <if test="creatorId != null">
         #{creatorId,jdbcType=BIGINT},
       </if>
-      <if test="state != null">
-        #{state,jdbcType=INTEGER},
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
       </if>
       <if test="images != null">
         #{images,jdbcType=LONGVARCHAR},
@@ -394,8 +394,8 @@
       <if test="record.creatorId != null">
         creator_id = #{record.creatorId,jdbcType=BIGINT},
       </if>
-      <if test="record.state != null">
-        `state` = #{record.state,jdbcType=INTEGER},
+      <if test="record.status != null">
+        `status` = #{record.status,jdbcType=INTEGER},
       </if>
       <if test="record.images != null">
         images = #{record.images,jdbcType=LONGVARCHAR},
@@ -429,7 +429,7 @@
       `type` = #{record.type,jdbcType=INTEGER},
       rebate = #{record.rebate,jdbcType=DECIMAL},
       creator_id = #{record.creatorId,jdbcType=BIGINT},
-      `state` = #{record.state,jdbcType=INTEGER},
+      `status` = #{record.status,jdbcType=INTEGER},
       images = #{record.images,jdbcType=LONGVARCHAR},
       videos = #{record.videos,jdbcType=LONGVARCHAR},
       description = #{record.description,jdbcType=LONGVARCHAR}
@@ -455,7 +455,7 @@
       `type` = #{record.type,jdbcType=INTEGER},
       rebate = #{record.rebate,jdbcType=DECIMAL},
       creator_id = #{record.creatorId,jdbcType=BIGINT},
-      `state` = #{record.state,jdbcType=INTEGER}
+      `status` = #{record.status,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -508,8 +508,8 @@
       <if test="creatorId != null">
         creator_id = #{creatorId,jdbcType=BIGINT},
       </if>
-      <if test="state != null">
-        `state` = #{state,jdbcType=INTEGER},
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
       </if>
       <if test="images != null">
         images = #{images,jdbcType=LONGVARCHAR},
@@ -540,7 +540,7 @@
       `type` = #{type,jdbcType=INTEGER},
       rebate = #{rebate,jdbcType=DECIMAL},
       creator_id = #{creatorId,jdbcType=BIGINT},
-      `state` = #{state,jdbcType=INTEGER},
+      `status` = #{status,jdbcType=INTEGER},
       images = #{images,jdbcType=LONGVARCHAR},
       videos = #{videos,jdbcType=LONGVARCHAR},
       description = #{description,jdbcType=LONGVARCHAR}
@@ -563,7 +563,7 @@
       `type` = #{type,jdbcType=INTEGER},
       rebate = #{rebate,jdbcType=DECIMAL},
       creator_id = #{creatorId,jdbcType=BIGINT},
-      `state` = #{state,jdbcType=INTEGER}
+      `status` = #{status,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <select id="selectOneByExample" parameterType="com.wwdz.ch.db.domain.distribution.SupplierItemExample" resultMap="BaseResultMap">
@@ -621,7 +621,7 @@
       <otherwise>
         id, `name`, supplier_id, is_on_sale, sort, top_image, distribution_price, supply_price, 
           stock, create_time, update_time, is_deleted, buy_limit_num, `type`, rebate, creator_id, 
-          `state`, images, videos, description
+          `status`, images, videos, description
       </otherwise>
     </choose>
     from supplier_item

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -204,6 +204,7 @@ public class UserServiceImpl implements UserService {
             ShopWhiteList shopWhiteList = shopWhiteListDao.findByUserId(dto.getUserId());
             result.put("isShop", true);
             result.put("shopId", shopWhiteList.getShopId() == null ? dto.getUserId() : shopWhiteList.getShopId());
+
         } else {
             try {
                 CloudServerResponse<ShopDTO> cloudServerResponse = shopReadService.getShopByUserId(dto.getUserId(), new ShopQueryOption());