类目页面

ch-admin-api/src/main/java/com/wwdz/ch/admin/job/SynCategoryInfo.java

@@ -42,7 +42,7 @@ public class SynCategoryInfo {
 
 
     public void importCategory() {
-        String FILE_NAME = "wanwu_category.xlsx";
+        String FILE_NAME = "category.xlsx";
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(FILE_NAME);
         StringArrayExcelReadListener listener = new StringArrayExcelReadListener();
         ExcelReader reader = EasyExcelFactory.read(inputStream, listener).build();
@@ -59,14 +59,18 @@ public class SynCategoryInfo {
             category.setId(categoryId);
             category.setName(array.get(1));
             category.setDesc(array.get(2));
-            category.setPid(Integer.parseInt(array.get(3)));
+            category.setPid(Integer.parseInt(array.get(4)));
             category.setLevel(Integer.parseInt(array.get(5)));
+            category.setSort(Integer.parseInt(array.get(6)));
             category.setCreated(new Date());
             category.setUpdated(new Date());
+            if (array.get(12).equals("0")) {
+                category.setIsDeleted(true);
+            } else {
                 category.setIsDeleted(false);
-            category.setIsLeaf(array.get(11).equals("0")?false:true);
-            category.setIcon("https://cdn.wanwudezhi.com"+ array.get(13));
-            category.setSort(Integer.parseInt(array.get(6)));
+            }
+            category.setIsLeaf(array.get(13).equals("0")?false:true);
+            category.setIcon(array.get(14));
             categoryDao.add(category);
         });
     }

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

+package com.wwdz.ch.core.consts;
+
+public class ConsignForSaleEnum {
+
+    /**
+     * 用户端寄售单的状态
+     */
+    public enum SaleForUserStateEnum {
+        PRE_CONSIGN(1, "待寄出"),
+        CONSIGNED(3, "已寄出"),
+        CONSIGN_SALEING(10, "寄售中"),
+        PRE_PAY(16, "待结款"),
+        FINISH(20, "已完成"),
+        CANCEL(30, "已取消"),
+
+        ;
+
+        private int code;
+        private String des;
+
+        SaleForUserStateEnum(int code, String des) {
+            this.code = code;
+            this.des = des;
+        }
+
+        public static String getNameByCode(int code) {
+
+            for (ConsignForSaleEnum.SaleForUserStateEnum saleForUserStateEnum : ConsignForSaleEnum.SaleForUserStateEnum.values()) {
+                if (code == saleForUserStateEnum.getCode()) {
+                    return saleForUserStateEnum.getDes();
+                }
+            }
+            return null;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getDes() {
+            return des;
+        }
+
+    }
+
+
+
+    /**
+     * 后台寄售单的状态
+     */
+    public enum SaleForSysStateEnum {
+        VALUATE(1, "图文估价"),
+        WAIT_CONSIGN(3, "待用户寄出"),
+        WAIT_TAKE(6, "待收货"),
+        CHECK(8, "实物鉴定"),
+        CONSIGN_SALEING(10, "寄售中"),
+        PRE_PAY(16, "待结款"),
+        FINISH(20, "已完成"),
+        CANCEL(30, "已取消"),
+
+        ;
+
+        private int code;
+        private String des;
+
+        SaleForSysStateEnum(int code, String des) {
+            this.code = code;
+            this.des = des;
+        }
+
+        public static String getNameByCode(int code) {
+            for (ConsignForSaleEnum.SaleForSysStateEnum saleForSysStateEnum : ConsignForSaleEnum.SaleForSysStateEnum.values()) {
+                if (code == saleForSysStateEnum.getCode()) {
+                    return saleForSysStateEnum.getDes();
+                }
+            }
+            return null;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getDes() {
+            return des;
+        }
+
+    }
+}

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

@@ -47,6 +47,7 @@ public class CategoryDaoImpl implements CategoryDao {
 			criteria.andNameLike("%" + dto.getName() + "%");
 		}
 		criteria.andIsDeletedEqualTo(false);
+		example.orderBy(" sort asc");
 		return categoryMapper.selectByExampleWithBLOBs(example);
 	}
 

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

@@ -226,6 +226,10 @@
     </selectKey>
     insert into category
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        `id`,
+      </if>
+
       <if test="name != null">
         `name`,
       </if>
@@ -264,6 +268,10 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/request/ItemRequestDto.java

@@ -49,4 +49,9 @@ public class ItemRequestDto implements Entity {
     private Integer viewPermission;
     // 分享类型（0、藏品，1、收藏册，2、用户主页）
     private Integer shareType;
+
+    /**
+     * 是否寄售中
+     */
+    private Boolean isOnSale = false;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/CategoryResponseVo.java

@@ -20,4 +20,6 @@ public class CategoryResponseVo implements Entity {
     private List<CategoryResponseVo> child;
     // 是否选中1是0否
     private Integer isChosen;
+
+    private String image;
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/ItemResponseVo.java

@@ -67,4 +67,8 @@ public class ItemResponseVo implements Entity {
     private String viewsNumber;
     // 1展示浏览量2展示"仅自己可见"标签
     private Integer isDisplay;
+    /**
+     * 是否寄售中
+     */
+    private Boolean isOnSale;
 }

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

@@ -205,6 +205,7 @@ public class CategoryServiceImpl implements CategoryService {
         CategoryResponseVo vo = new CategoryResponseVo();
         vo.setCid(category.getId());
         vo.setPid(category.getPid());
+        vo.setImage(category.getIcon());
         vo.setCategoryName(category.getName());
         vo.setIsChosen(0);
         return vo;

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

@@ -216,6 +216,7 @@ public class ItemServiceImpl implements ItemService {
                 // 设置是否收藏和是否是自己发布的
                 itemResponseVo.setIsCollected(0);
                 itemResponseVo.setIsMine(0);
+                itemResponseVo.setIsOnSale(es.getIsOnSale());
                 if (Objects.nonNull(dto.getUserId()) && !dto.getUserId().equals(0L)) {
                     itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), es.getId(), null) ? 1 : 0);
                     itemResponseVo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), es.getId()) ? 1 : 0);
@@ -460,7 +461,6 @@ public class ItemServiceImpl implements ItemService {
                         itemResponseVo.setIsDisplay(finalIsDisplay);
                         // 设置浏览量
                         itemResponseVo.setViewsNumber(StringUtil.formatCount(footPrintDao.countByItemIds(dto.getUserId(), es.getId(), null)));
-
                         AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
                         agentTranceResponseVo.setAgentTraceInfo_("");
                         agentTranceResponseVo.setViewType(1);
@@ -519,6 +519,7 @@ public class ItemServiceImpl implements ItemService {
                     itemResponseVo.setDetail(item.getDetail());
                     itemResponseVo.setIsDeleted(item.getIsDeleted());
                     itemResponseVo.setViewPermission(item.getViewPermission());
+                    itemResponseVo.setIsOnSale(item.getIsOnSale());
                     // 设置价格
                     itemResponseVo.setPrice(getPrice(item.getPrice()));
                     // 设置是否收藏或是否是自己发布的
@@ -561,7 +562,7 @@ public class ItemServiceImpl implements ItemService {
             Item item = new Item();
             item.setName(dto.getName());
             item.setCid(Objects.isNull(dto.getCid()) ? 0 : dto.getCid());
-            item.setIsOnSale(false);
+            item.setIsOnSale(dto.getIsOnSale());
             item.setIsStd(false);
             item.setSort(100);
             item.setImages(dto.getImages());
@@ -669,6 +670,7 @@ public class ItemServiceImpl implements ItemService {
             // 设置基本信息
             itemResponseVo.setId(item.getId());
             itemResponseVo.setName(item.getName());
+            itemResponseVo.setIsOnSale(item.getIsOnSale());
             itemResponseVo.setImages(item.getImages());
             itemResponseVo.setDetail(item.getDetail());
             itemResponseVo.setSourceType(item.getSourceType());