改表

src/main/java/com/caimei/modules/order/dao/CmProductSnDao.java

@@ -1,13 +0,0 @@
-package com.caimei.modules.order.dao;
-
-import com.caimei.modules.club.entity.CmProductSn;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface CmProductSnDao {
-
-    List<CmProductSn> getListSignByOrderProduct(@Param("orderProductId") Integer orderProductId, @Param("shopOrderId") Integer shopOrderId);
-}

src/main/java/com/caimei/modules/order/service/impl/NewOrderServiceImpl.java

@@ -30,8 +30,6 @@ public class NewOrderServiceImpl implements NewOrderService {
     @Resource
     private NewOrderDao newOrderDao;
     @Resource
-    private CmReturnedPurchaseDao cmReturnedPurchaseDao;
-    @Resource
     private NewShopOrderDao newShopOrderDao;
     @Resource
     private OrderUserInfoService orderUserInfoService;

src/main/java/com/caimei/modules/products/controller/CmMallOrganizeProductsController.java

@@ -1,26 +1,14 @@
 package com.caimei.modules.products.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.caimei.modules.club.entity.Page;
 import com.caimei.modules.products.entity.CmMallOrganizeProducts;
-import com.caimei.modules.products.entity.CmMallPageModules;
-import com.caimei.modules.products.entity.CmMallProductsClassify;
 import com.caimei.modules.products.service.CmMallOrganizeProductsService;
-import com.caimei.modules.products.service.CmMallProductsClassifyService;
-import com.caimei.modules.shiro.entity.CmMallAdminUser;
-import com.caimei.modules.shiro.service.ShiroService;
 import com.caimei.utils.JsonModel;
-import com.caimei.utils.TokenEncryptUtils;
 import com.github.pagehelper.PageHelper;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.thymeleaf.util.StringUtils;
 
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,7 +25,6 @@ import java.util.Map;
 public class CmMallOrganizeProductsController {
 
     private final CmMallOrganizeProductsService cmMallOrganizeProductsService;
-    private final CmMallProductsClassifyService cmMallProductsClassifyService;
 
     /**
      * 商品列表
@@ -50,15 +37,6 @@ public class CmMallOrganizeProductsController {
         return JsonModel.newInstance().success(organizeProductsPage);
     }
 
-    /**
-     * 商品模块列表
-     */
-    @GetMapping("/module")
-    public JsonModel findAllModule(Integer organizeId) {
-        List<CmMallPageModules> mallPageModulesList = cmMallOrganizeProductsService.findAllModule(organizeId);
-        return JsonModel.newInstance().success(mallPageModulesList);
-    }
-
     /**
      * 编辑回显
      */
@@ -99,89 +77,23 @@ public class CmMallOrganizeProductsController {
         return JsonModel.newInstance().success();
     }
 
-    /**
-     * 批量更新排序值
-     *
-     * @param newProducSorttList (商品id-排序值,...)
-     * @return
-     */
-    @GetMapping(value = "batchSaveSort")
-    public JsonModel batchSaveSort(String newProducSorttList, Integer modules) {
-        JsonModel jsonModel = JsonModel.newInstance();
-        try {
-            String[] newPageLists = newProducSorttList.split(",");
-            for (String list : newPageLists) {
-                String[] split = list.split("-");
-                if (split.length == 1 || split.length < 1) {
-                    String id = split[0];
-                    String sort = null;
-                    cmMallOrganizeProductsService.saveSort(modules, sort, id);
-                } else {
-                    String id = split[0];
-                    String sort = split[1];
-                    if (CmMallProductsClassifyController.isInteger(sort)) {
-                        if (StringUtils.equals("0", sort)) {
-                            return jsonModel.error("排序值只能填写大于等于1的整数");
-                        }
-                        cmMallOrganizeProductsService.saveSort(modules, sort, id);
-                    } else {
-                        return jsonModel.error("排序值只能为数字");
-                    }
-                }
-            }
-            return jsonModel.success("更新排序成功", "");
-        } catch (Exception e) {
-            return jsonModel.error("更新排序失败");
-        }
-    }
-
-    /**
-     * 添加商品数据
-     *
-     * @param cmMallOrganizeProducts
-     * @param page                   分页数据
-     * @return
-     */
-    @GetMapping(value = "toAddProduct1")
-    public JsonModel toAddProduct1(CmMallOrganizeProducts cmMallOrganizeProducts, Page page) {
-        //获取采美所有商品
-        Map<String, Object> map = new HashMap();
-        PageHelper.startPage(page.getIndex(), page.getPageSize());
-        List<CmMallOrganizeProducts> listBuyMall = cmMallOrganizeProductsService.findListBuyMall(cmMallOrganizeProducts);
-        Page<CmMallOrganizeProducts> productsPage = new Page<>(listBuyMall);
-        //获取商品分类列表
-        List<CmMallProductsClassify> listByEffective = cmMallProductsClassifyService.findListByEffective(cmMallOrganizeProducts.getOrganizeId());
-        map.put("productsPage", productsPage);
-        map.put("listByEffective", listByEffective);
-        return JsonModel.newInstance().success(map);
-    }
+//
+//    /**
+//     * 添加商品数据
+//     *
+//     * @param cmMallOrganizeProducts
+//     * @param page                   分页数据
+//     * @return
+//     */
+//    @GetMapping(value = "toAddProduct1")
+//    public JsonModel toAddProduct1(CmMallOrganizeProducts cmMallOrganizeProducts, Page page) {
+//        //获取采美所有商品
+//        Map<String, Object> map = new HashMap();
+//        PageHelper.startPage(page.getIndex(), page.getPageSize());
+//        List<CmMallOrganizeProducts> listBuyMall = cmMallOrganizeProductsService.findListBuyMall(cmMallOrganizeProducts);
+//        Page<CmMallOrganizeProducts> productsPage = new Page<>(listBuyMall);
+//        map.put("productsPage", productsPage);
+//        return JsonModel.newInstance().success(map);
+//    }
 
-    /**
-     * 添加商品
-     *
-     * @param cmMallOrganizeProducts
-     * @return
-     */
-    @PostMapping(value = "saveAddProductInfo")
-    public JsonModel saveAddProductInfo(@RequestBody CmMallOrganizeProducts cmMallOrganizeProducts) {
-        JsonModel jsonModel = JsonModel.newInstance();
-        try {
-
-            return jsonModel.success("添加成功", "");
-        } catch (Exception e) {
-            return jsonModel.error("添加失败");
-        }
-    }
-
-    /**
-     * //取消模块内商品
-     *
-     * @param cmMallOrganizeProducts
-     * @return
-     */
-    @PostMapping(value = "canncelProduct")
-    public JsonModel canncelProduct(@RequestBody CmMallOrganizeProducts cmMallOrganizeProducts) {
-        cmMallOrganizeProductsService.canncelPreferredProduct(cmMallOrganizeProducts);
-        return JsonModel.newInstance().success();
-    }
 }

src/main/java/com/caimei/modules/products/controller/CmMallProductsClassifyController.java

@@ -1,158 +0,0 @@
-package com.caimei.modules.products.controller;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.caimei.modules.club.entity.Page;
-import com.caimei.modules.products.entity.CmMallOrganizeProducts;
-import com.caimei.modules.products.entity.CmMallProductsClassify;
-import com.caimei.modules.products.service.CmMallOrganizeProductsService;
-import com.caimei.modules.products.service.CmMallProductsClassifyService;
-import com.caimei.utils.JsonModel;
-import com.github.pagehelper.PageHelper;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-import java.util.regex.Pattern;
-
-/**
- * 小程序商品分类Controller
- *
- * @author lijun
- * @version 2019-12-03
- */
-@RestController
-@RequiredArgsConstructor
-@RequestMapping(value = "/product/cmMallProductsClassify")
-public class CmMallProductsClassifyController {
-
-    private final CmMallProductsClassifyService cmMallProductsClassifyService;
-    private final CmMallOrganizeProductsService cmMallOrganizeProductsService;
-
-    /**
-     * 商品分类列表
-     */
-    @GetMapping(value = {"list"})
-    public JsonModel list(CmMallProductsClassify cmMallProductsClassify, Page page) {
-        PageHelper.startPage(page.getIndex(), page.getPageSize());
-        List<CmMallProductsClassify> productsClassifyList = cmMallProductsClassifyService.findList(cmMallProductsClassify);
-        Page<CmMallProductsClassify> classifyPage = new Page<>(productsClassifyList);
-        return JsonModel.newInstance().success(classifyPage);
-    }
-
-    /**
-     * 编辑回显
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping(value = "form")
-    public JsonModel form(Integer id) {
-        CmMallProductsClassify mallProductsClassify = cmMallProductsClassifyService.get(id);
-        return JsonModel.newInstance().success(mallProductsClassify);
-    }
-
-    /**
-     * 编辑,保存
-     *
-     * @param cmMallProductsClassify
-     * @return
-     */
-    @PostMapping(value = "save")
-    public JsonModel save(@RequestBody CmMallProductsClassify cmMallProductsClassify) {
-        JsonModel jsonModel = JsonModel.newInstance();
-        //保存商品名字不能重复
-        List<CmMallProductsClassify> productsClassifyListByName = cmMallProductsClassifyService.getProductsClassifyListByName(cmMallProductsClassify);
-        if (CollectionUtils.isNotEmpty(productsClassifyListByName) && productsClassifyListByName.size() > 0) {
-            return jsonModel.error("分类名称不能重复");
-        }
-        //判断该商品是是否选择的是停用，如果停用判断该分类下是否存在商品
-        if (StringUtils.equals("2", cmMallProductsClassify.getStatus())) {
-            CmMallOrganizeProducts cmMallOrganizeProducts = new CmMallOrganizeProducts();
-            cmMallOrganizeProducts.setOrganizeId(cmMallProductsClassify.getOrganizeId());
-            List<CmMallOrganizeProducts> list1 = cmMallOrganizeProductsService.findList(cmMallOrganizeProducts);
-            if (CollectionUtils.isNotEmpty(list1)) {
-                return jsonModel.error("该分类中还存在商品，请把该分类的商品转移到别的分类后，再停用该分类");
-            }
-        }
-
-        Date date = new Date();
-        if (cmMallProductsClassify.getId() == null) {//是新增
-            cmMallProductsClassify.setAddTime(date);
-            cmMallProductsClassify.setDelFlag("0");
-        }
-        cmMallProductsClassify.setUpdateTime(date);
-        cmMallProductsClassifyService.save(cmMallProductsClassify);
-        return jsonModel.success();
-    }
-
-    /**
-     * 启用,关闭
-     *
-     * @param id 分类id
-     * @return
-     */
-    @GetMapping(value = "switchClassify")
-    public JsonModel switchClassify(Integer id) {
-        JsonModel jsonModel = JsonModel.newInstance();
-        CmMallProductsClassify mallProductsClassify = cmMallProductsClassifyService.get(id);
-        CmMallOrganizeProducts cmMallOrganizeProducts = new CmMallOrganizeProducts();
-        cmMallOrganizeProducts.setOrganizeId(mallProductsClassify.getOrganizeId());
-        List<CmMallOrganizeProducts> list = cmMallOrganizeProductsService.findList(cmMallOrganizeProducts);
-        if (CollectionUtils.isNotEmpty(list)) {
-            return jsonModel.error("该分类中还存在商品，请把该分类的商品转移到别的分类后，再停用该分类");
-        }
-        if (mallProductsClassify.getStatus().equals("1")) {
-            mallProductsClassify.setStatus("2");//1启用,2停用
-        } else {
-            mallProductsClassify.setStatus("1");//1启用,2停用
-        }
-        mallProductsClassify.setUpdateTime(new Date());
-        cmMallProductsClassifyService.updateStatus(mallProductsClassify);//更新会所表数据
-        return jsonModel.success();
-    }
-
-    /**
-     * 批量更新排序值
-     *
-     * @param newProducSorttList (分类id-排序值,...)
-     * @return
-     */
-    @GetMapping(value = "batchSaveSort")
-    public JsonModel batchSaveSort(String newProducSorttList) {
-        JsonModel jsonModel = JsonModel.newInstance();
-        try {
-            String[] newPageLists = newProducSorttList.split(",");
-            for (String list : newPageLists) {
-                String[] split = list.split("-");
-                if (split.length == 1 || split.length < 1) {
-                    return jsonModel.error("排序值不能为空！");
-                }
-                String s = split[1];//判断是否是数字，或者为空
-                if (StringUtils.isNotEmpty(s)) {
-                    if (isInteger(s)) {
-                        if (StringUtils.equals("0", s)) {
-                            return jsonModel.error("排序值只能填写大于等于1的整数");
-                        }
-                        String id = split[0];
-                        String sort = split[1];
-                        cmMallProductsClassifyService.saveSort(sort, id);
-                    } else {
-                        return jsonModel.error("排序值只能为数字");
-                    }
-                } else {
-                    return jsonModel.error("排序值不能为空！");
-                }
-            }
-            return jsonModel.success("更新排序成功", "");
-        } catch (Exception e) {
-            return jsonModel.error("更新排序失败");
-        }
-    }
-
-    public static boolean isInteger(String str) {
-        Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
-        return pattern.matcher(str).matches();
-    }
-}

src/main/java/com/caimei/modules/products/dao/CmMallOrganizeProductsDao.java

@@ -16,23 +16,13 @@ public interface CmMallOrganizeProductsDao {
 
     List<CmMallOrganizeProducts> findList(CmMallOrganizeProducts cmMallOrganizeProducts);
 
-    List<CmMallPageModules> findAllModule(Integer organizeId);
-
     void updateProductInfo(CmMallOrganizeProducts cmMallOrganizeProducts);
 
     CmMallOrganizeProducts get(Integer id);
 
-    void updateValidFlag(CmMallOrganizeProducts organizeProducts);
-
-    void saveSort(@Param("modules") Integer modules, @Param("sort") String sort, @Param("id") String id);
-
     List<CmMallOrganizeProducts> findListBuyMall(CmMallOrganizeProducts cmMallOrganizeProducts);
 
-    List<Integer> getAllExistsProductList(Integer modules);
-
-    void canncelPreferredProduct(CmMallOrganizeProducts cmMallOrganizeProducts);
-
-    List<Sku> findSkus(String productId);
+    List<Sku> findSkus(String productId,String organizeId);
 
     void updateSku(Sku s);
 }

src/main/java/com/caimei/modules/products/dao/CmMallProductLadderPriceDao.java

@@ -1,28 +0,0 @@
-package com.caimei.modules.products.dao;
-
-import com.caimei.modules.products.entity.CmMallProductLadderPrice;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface CmMallProductLadderPriceDao {
-
-    int deleteByPrimaryKey(Long id);
-
-    int insert(CmMallProductLadderPrice record);
-
-    int insertSelective(CmMallProductLadderPrice record);
-
-    CmMallProductLadderPrice selectByPrimaryKey(Long id);
-
-    int updateByPrimaryKeySelective(CmMallProductLadderPrice record);
-
-    int updateByPrimaryKey(CmMallProductLadderPrice record);
-
-    List<CmMallProductLadderPrice> selectByProductId(Long productId);
-
-    Long selectIdByProductIdAndLadderNum(@Param("productId") Long productId, @Param("ladderNum") Long ladderNum);
-
-}

src/main/java/com/caimei/modules/products/dao/CmMallProductsClassifyDao.java

@@ -1,27 +0,0 @@
-package com.caimei.modules.products.dao;
-
-import com.caimei.modules.products.entity.CmMallProductsClassify;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface CmMallProductsClassifyDao {
-
-    List<CmMallProductsClassify> findList(CmMallProductsClassify cmMallProductsClassify);
-
-    CmMallProductsClassify get(Integer id);
-
-    List<CmMallProductsClassify> getProductsClassifyListByName(CmMallProductsClassify cmMallProductsClassify);
-
-    void insert(CmMallProductsClassify cmMallProductsClassify);
-
-    void update(CmMallProductsClassify cmMallProductsClassify);
-
-    void updateStatus(CmMallProductsClassify mallProductsClassify);
-
-    void saveSort(@Param("sort") String sort, @Param("id") String id);
-
-    List<CmMallProductsClassify> findListByEffective(String organizeId);
-}

src/main/java/com/caimei/modules/products/service/CmMallOrganizeProductsService.java

@@ -12,17 +12,11 @@ public interface CmMallOrganizeProductsService {
 
     Page<CmMallOrganizeProducts> findPage(Page page, CmMallOrganizeProducts cmMallOrganizeProducts);
 
-    List<CmMallPageModules> findAllModule(Integer organizeId);
-
     void updateProductInfo(CmMallOrganizeProducts cmMallOrganizeProducts);
 
     CmMallOrganizeProducts get(Integer id);
 
     void updateValidFlag(CmMallOrganizeProducts organizeProducts);
 
-    void saveSort(Integer modules, String sort, String id);
-
     List<CmMallOrganizeProducts> findListBuyMall(CmMallOrganizeProducts cmMallOrganizeProducts);
-
-    void canncelPreferredProduct(CmMallOrganizeProducts cmMallOrganizeProducts);
 }

src/main/java/com/caimei/modules/products/service/CmMallProductsClassifyService.java

@@ -1,22 +0,0 @@
-package com.caimei.modules.products.service;
-
-import com.caimei.modules.products.entity.CmMallProductsClassify;
-
-import java.util.List;
-
-public interface CmMallProductsClassifyService {
-
-    List<CmMallProductsClassify> findList(CmMallProductsClassify cmMallProductsClassify);
-
-    CmMallProductsClassify get(Integer id);
-
-    List<CmMallProductsClassify> getProductsClassifyListByName(CmMallProductsClassify cmMallProductsClassify);
-
-    void save(CmMallProductsClassify cmMallProductsClassify);
-
-    void updateStatus(CmMallProductsClassify mallProductsClassify);
-
-    void saveSort(String sort, String id);
-
-    List<CmMallProductsClassify> findListByEffective(String organizeId);
-}

src/main/java/com/caimei/modules/products/service/impl/CmMallOrganizeProductsServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.caimei.modules.club.entity.Page;
 import com.caimei.modules.products.dao.CmMallOrganizeProductsDao;
 import com.caimei.modules.products.entity.CmMallOrganizeProducts;
-import com.caimei.modules.products.entity.CmMallPageModules;
 import com.caimei.modules.products.entity.Sku;
 import com.caimei.modules.products.service.CmMallOrganizeProductsService;
 import com.caimei.utils.AppUtils;
@@ -35,7 +34,7 @@ public class CmMallOrganizeProductsServiceImpl implements CmMallOrganizeProducts
         List<CmMallOrganizeProducts> products = cmMallOrganizeProductsDao.findList(cmMallOrganizeProducts);
         if (null != products && products.size() > 0) {
             products.forEach(p -> {
-                List<Sku> skus = cmMallOrganizeProductsDao.findSkus(p.getProductId());
+                List<Sku> skus = cmMallOrganizeProductsDao.findSkus(p.getProductId(), cmMallOrganizeProducts.getOrganizeId());
                 p.setSkus(skus);
                 p.setCostPrice(skus.get(0).getCostPrice());
                 p.setPrice(skus.get(0).getPrice().toString());
@@ -45,11 +44,6 @@ public class CmMallOrganizeProductsServiceImpl implements CmMallOrganizeProducts
         return new Page<>(products);
     }
 
-    @Override
-    public List<CmMallPageModules> findAllModule(Integer organizeId) {
-        return cmMallOrganizeProductsDao.findAllModule(organizeId);
-    }
-
     @Override
     public void updateProductInfo(CmMallOrganizeProducts cmMallOrganizeProducts) {
         List<Sku> skus = cmMallOrganizeProducts.getSkus();
@@ -61,18 +55,13 @@ public class CmMallOrganizeProductsServiceImpl implements CmMallOrganizeProducts
     @Override
     public CmMallOrganizeProducts get(Integer id) {
         CmMallOrganizeProducts cmMallOrganizeProducts = cmMallOrganizeProductsDao.get(id);
-        cmMallOrganizeProducts.setSkus(cmMallOrganizeProductsDao.findSkus(cmMallOrganizeProducts.getProductId()));
+        cmMallOrganizeProducts.setSkus(cmMallOrganizeProductsDao.findSkus(cmMallOrganizeProducts.getProductId(),cmMallOrganizeProducts.getOrganizeId()));
         return cmMallOrganizeProducts;
     }
 
     @Override
     public void updateValidFlag(CmMallOrganizeProducts organizeProducts) {
-        cmMallOrganizeProductsDao.updateValidFlag(organizeProducts);
-    }
-
-    @Override
-    public void saveSort(Integer modules, String sort, String id) {
-        cmMallOrganizeProductsDao.saveSort(modules, sort, id);
+        cmMallOrganizeProductsDao.updateProductInfo(organizeProducts);
     }
 
     @Override
@@ -86,8 +75,4 @@ public class CmMallOrganizeProductsServiceImpl implements CmMallOrganizeProducts
         return listBuyMall;
     }
 
-    @Override
-    public void canncelPreferredProduct(CmMallOrganizeProducts cmMallOrganizeProducts) {
-        cmMallOrganizeProductsDao.canncelPreferredProduct(cmMallOrganizeProducts);
-    }
 }

src/main/java/com/caimei/modules/products/service/impl/CmMallProductsClassifyServiceImpl.java

@@ -1,71 +0,0 @@
-package com.caimei.modules.products.service.impl;
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.caimei.modules.products.dao.CmMallProductsClassifyDao;
-import com.caimei.modules.products.entity.CmMallOrganizeProducts;
-import com.caimei.modules.products.entity.CmMallProductsClassify;
-import com.caimei.modules.products.service.CmMallOrganizeProductsService;
-import com.caimei.modules.products.service.CmMallProductsClassifyService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Service
-public class CmMallProductsClassifyServiceImpl implements CmMallProductsClassifyService {
-    
-    @Resource
-    private CmMallProductsClassifyDao cmMallProductsClassifyDao;
-    @Resource
-    private CmMallOrganizeProductsService cmMallOrganizeProductsService;
-
-    @Override
-    public List<CmMallProductsClassify> findList(CmMallProductsClassify cmMallProductsClassify) {
-        List<CmMallProductsClassify> classifyList = cmMallProductsClassifyDao.findList(cmMallProductsClassify);
-        if (null != classifyList && classifyList.size() > 0) {
-            for (CmMallProductsClassify c : classifyList) {
-                CmMallOrganizeProducts cmMallOrganizeProducts = new CmMallOrganizeProducts();
-                cmMallOrganizeProducts.setOrganizeId(c.getOrganizeId());
-                List<CmMallOrganizeProducts> list1 = cmMallOrganizeProductsService.findList(cmMallOrganizeProducts);
-                if (CollectionUtils.isNotEmpty(list1)) {
-                    c.setContainsProduct("1");//是否包含商品，1包含商品，其它为不包含商品
-                }
-            }
-        }
-        return classifyList;
-    }
-
-    @Override
-    public CmMallProductsClassify get(Integer id) {
-        return cmMallProductsClassifyDao.get(id);
-    }
-
-    @Override
-    public List<CmMallProductsClassify> getProductsClassifyListByName(CmMallProductsClassify cmMallProductsClassify) {
-        return cmMallProductsClassifyDao.getProductsClassifyListByName(cmMallProductsClassify);
-    }
-
-    @Override
-    public void save(CmMallProductsClassify cmMallProductsClassify) {
-        if (cmMallProductsClassify.getId() == null) {
-            cmMallProductsClassifyDao.insert(cmMallProductsClassify);
-        } else {
-            cmMallProductsClassifyDao.update(cmMallProductsClassify);
-        }
-    }
-
-    @Override
-    public void updateStatus(CmMallProductsClassify mallProductsClassify) {
-        cmMallProductsClassifyDao.updateStatus(mallProductsClassify);
-    }
-
-    @Override
-    public void saveSort(String sort, String id) {
-        cmMallProductsClassifyDao.saveSort(sort, id);
-    }
-
-    @Override
-    public List<CmMallProductsClassify> findListByEffective(String organizeId) {
-        return cmMallProductsClassifyDao.findListByEffective(organizeId);
-    }
-}

src/main/resources/mapper/CmMallOrganizeProductsMapper.xml

@@ -4,93 +4,61 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.modules.products.dao.CmMallOrganizeProductsDao">
     <sql id="cmMallOrganizeProductsColumns">
-        a.id AS "productId",
-		a.organizeId AS "organizeId",
-		a.productId AS "cmProductId",
-		a.validFlag AS "validFlag",
-		a.addTime AS "addTime",
-		a.delFlag AS "delFlag",
-		p.mainImage AS "mainImage",
-		p.name AS "productName",
+        a.productId,
+		copi.organizeId,
+		copi.validFlag,
+		a.addTime,
+		a.mainImage,
+		a.name AS "productName",
 		s.name AS "shopName"
     </sql>
 
     <sql id="cmMallOrganizeProductsJoins">
-        LEFT JOIN product p on p.productId = a.productId
-		LEFT JOIN shop s on s.shopId = p.shopId
+        LEFT JOIN shop s on s.shopId = p.shopId
+        left join cm_organize_product_info copi on a.productID = copi.productId
     </sql>
 
     <select id="findList" resultType="com.caimei.modules.products.entity.CmMallOrganizeProducts">
-        SELECT
+        SELECT DISTINCT
         <include refid="cmMallOrganizeProductsColumns"/>
-        FROM cm_mall_organize_products a
+        FROM product a
         <include refid="cmMallOrganizeProductsJoins"/>
         <where>
-            <if test="id != null">
-                AND a.id = #{id}
-            </if>
             <if test="productId != null">
                 AND a.productId = #{productId}
             </if>
             <if test="organizeId != null">
-                AND a.organizeId = #{organizeId}
+                AND copi.organizeId = #{organizeId}
             </if>
             <if test="validFlag != null">
-                AND a.validFlag = #{validFlag}
+                AND copi.validFlag = #{validFlag}
             </if>
             <if test="productName != null and productName != ''">
-                AND p.name LIKE concat('%',#{productName},'%')
+                AND a.name LIKE concat('%',#{productName},'%')
             </if>
             <if test="shopName != null and shopName != ''">
                 AND s.name LIKE concat('%',#{shopName},'%')
             </if>
-            and a.delFlag = 0
         </where>
         ORDER BY
-        a.addTime DESC,a.id DESC
-    </select>
-
-    <select id="findAllModule" resultType="com.caimei.modules.products.entity.CmMallPageModules" parameterType="int">
-        SELECT *
-        FROM cm_mall_page_modules
-        WHERE organizeId = #{organizeId}
+        a.addTime DESC,a.productId DESC
     </select>
 
     <update id="updateProductInfo">
-        UPDATE cm_mall_organize_products
-        SET validFlag  = #{validFlag},
-            updateTime = now()
-        WHERE id = #{id}
+        UPDATE cm_organize_product_info
+        SET validFlag = #{validFlag}
+        WHERE productId = #{productId}
+          and organizeId = #{organizeId}
     </update>
 
     <select id="get" resultType="com.caimei.modules.products.entity.CmMallOrganizeProducts">
         SELECT
         <include refid="cmMallOrganizeProductsColumns"/>
-        FROM cm_mall_organize_products a
+        FROM product a
         <include refid="cmMallOrganizeProductsJoins"/>
-        WHERE a.id = #{id}
+        WHERE a.productID = #{id}
     </select>
 
-    <update id="updateValidFlag">
-        UPDATE cm_mall_organize_products
-        SET validFlag = #{validFlag}
-        WHERE id = #{productId}
-    </update>
-
-    <update id="saveSort">
-        UPDATE cm_mall_organize_products SET
-        <if test="modules == 1">
-            preferredProductSort = #{sort}
-        </if>
-        <if test="modules == 2">
-            preferentialProductSort = #{sort}
-        </if>
-        <if test="modules == 3">
-            commonlyProductSort = #{sort}
-        </if>
-        WHERE id = #{id}
-    </update>
-
     <select id="findListBuyMall" resultType="com.caimei.modules.products.entity.CmMallOrganizeProducts">
         SELECT
         <include refid="cmMallOrganizeProductsColumns"/>
@@ -117,59 +85,24 @@
         ORDER BY a.addTime DESC,a.id DESC
     </select>
 
-    <select id="getAllExistsProductList" resultType="Integer">
-        SELECT
-        a.id
-        FROM cm_mall_organize_products a
-        WHERE a.delFlag = 0
-        <if test="modules == 1">
-            and a.preferredProduct = 1
-        </if>
-        <if test="modules == 2">
-            and a.preferentialProduct = 1
-        </if>
-        <if test="modules == 3">
-            and a.commonlyProduct = 1
-        </if>
-    </select>
-
     <select id="findSkus" resultType="com.caimei.modules.products.entity.Sku">
-        select cmps.id,
-               cmps.mallProductId as productId,
-               # cs.skuId,
-               ROUND(cmps.price * cmps.shopPercent / 100,2) AS costPrice,
-               cmps.minBuyNumber,
-               cmps.price,
-               cmps.unit,
-               cmps.stock
-        from cm_mall_product_sku cmps
-        # left join cm_sku cs on cmps.skuId = cs.skuId
-        where cmps.mallProductId = #{productId}
-        order by cmps.price asc
+        select cs.skuId,
+               cs.productId,
+               ROUND(cs.price * cs.shopPercent / 100, 2) AS costPrice,
+               cs.minBuyNumber,
+               cs.price,
+               cs.unit,
+               cs.stock
+        from cm_sku cs
+        where cs.productId = #{productId}
+            and cs.organizeId = #{organizeId}
+        order by cs.price asc
     </select>
 
-    <update id="canncelPreferredProduct">
-        UPDATE cm_mall_organize_products SET
-        <if test="modules == 1">
-            preferredProduct = 0,
-            preferredProductSort = null,
-        </if>
-        <if test="modules == 2">
-            preferentialProduct = 0,
-            preferentialProductSort = null,
-        </if>
-        <if test="modules == 3">
-            commonlyProduct = 0,
-            commonlyProductSort = null,
-        </if>
-        updateTime = #{updateTime}
-        WHERE id = #{id}
-    </update>
-
     <update id="updateSku">
-        update cm_mall_product_sku
+        update cm_sku
         set minBuyNumber = #{minBuyNumber},
             price        = #{price}
-        where id = #{id}
+        where skuId = #{id}
     </update>
 </mapper>

src/main/resources/mapper/CmMallProductLadderPriceMapper.xml

@@ -1,160 +0,0 @@
-<?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.caimei.modules.products.dao.CmMallProductLadderPriceDao">
-  <resultMap id="BaseResultMap" type="com.caimei.modules.products.entity.CmMallProductLadderPrice">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="productId" jdbcType="BIGINT" property="productId" />
-    <result column="ladderNum" jdbcType="BIGINT" property="ladderNum" />
-    <result column="buyNum" jdbcType="BIGINT" property="buyNum" />
-    <result column="buyPrice" jdbcType="DECIMAL" property="buyPrice" />
-    <result column="createBy" jdbcType="BIGINT" property="createBy" />
-    <result column="createDate" jdbcType="TIMESTAMP" property="createDate" />
-    <result column="updateBy" jdbcType="BIGINT" property="updateBy" />
-    <result column="updateDate" jdbcType="TIMESTAMP" property="updateDate" />
-    <result column="delFlag" jdbcType="CHAR" property="delFlag" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, productId, ladderNum, buyNum, buyPrice, createBy, createDate, updateBy, updateDate,
-    delFlag
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from cm_mall_product_ladder_price
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <select id="selectByProductId" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from cm_mall_product_ladder_price
-    where productId = #{productId,jdbcType=BIGINT}
-    order by ladderNum
-  </select>
-  <select id="selectIdByProductIdAndLadderNum" parameterType="java.lang.Long" resultType="java.lang.Long">
-    select id
-    from cm_mall_product_ladder_price
-    where productId = #{productId,jdbcType=BIGINT}
-      and ladderNum = #{ladderNum,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from cm_mall_product_ladder_price
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.caimei.modules.products.entity.CmMallProductLadderPrice" useGeneratedKeys="true">
-    insert into cm_mall_product_ladder_price (productId, ladderNum, buyNum,
-      buyPrice, createBy, createDate,
-      updateBy, updateDate, delFlag
-      )
-    values (#{productId,jdbcType=BIGINT}, #{ladderNum,jdbcType=BIGINT}, #{buyNum,jdbcType=BIGINT},
-      #{buyPrice,jdbcType=DECIMAL}, #{createBy,jdbcType=BIGINT}, #{createDate,jdbcType=TIMESTAMP},
-      #{updateBy,jdbcType=BIGINT}, #{updateDate,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR}
-      )
-  </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.caimei.modules.products.entity.CmMallProductLadderPrice" useGeneratedKeys="true">
-    insert into cm_mall_product_ladder_price
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="productId != null">
-        productId,
-      </if>
-      <if test="ladderNum != null">
-        ladderNum,
-      </if>
-      <if test="buyNum != null">
-        buyNum,
-      </if>
-      <if test="buyPrice != null">
-        buyPrice,
-      </if>
-      <if test="createBy != null">
-        createBy,
-      </if>
-      <if test="createDate != null">
-        createDate,
-      </if>
-      <if test="updateBy != null">
-        updateBy,
-      </if>
-      <if test="updateDate != null">
-        updateDate,
-      </if>
-      <if test="delFlag != null">
-        delFlag,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="productId != null">
-        #{productId,jdbcType=BIGINT},
-      </if>
-      <if test="ladderNum != null">
-        #{ladderNum,jdbcType=BIGINT},
-      </if>
-      <if test="buyNum != null">
-        #{buyNum,jdbcType=BIGINT},
-      </if>
-      <if test="buyPrice != null">
-        #{buyPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="createBy != null">
-        #{createBy,jdbcType=BIGINT},
-      </if>
-      <if test="createDate != null">
-        #{createDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null">
-        #{updateBy,jdbcType=BIGINT},
-      </if>
-      <if test="updateDate != null">
-        #{updateDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlag != null">
-        #{delFlag,jdbcType=CHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.caimei.modules.products.entity.CmMallProductLadderPrice">
-    update cm_mall_product_ladder_price
-    <set>
-      <if test="productId != null">
-        productId = #{productId,jdbcType=BIGINT},
-      </if>
-      <if test="ladderNum != null">
-        ladderNum = #{ladderNum,jdbcType=BIGINT},
-      </if>
-      <if test="buyNum != null">
-        buyNum = #{buyNum,jdbcType=BIGINT},
-      </if>
-      <if test="buyPrice != null">
-        buyPrice = #{buyPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="createBy != null">
-        createBy = #{createBy,jdbcType=BIGINT},
-      </if>
-      <if test="createDate != null">
-        createDate = #{createDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null">
-        updateBy = #{updateBy,jdbcType=BIGINT},
-      </if>
-      <if test="updateDate != null">
-        updateDate = #{updateDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlag != null">
-        delFlag = #{delFlag,jdbcType=CHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.caimei.modules.products.entity.CmMallProductLadderPrice">
-    update cm_mall_product_ladder_price
-    set productId = #{productId,jdbcType=BIGINT},
-      ladderNum = #{ladderNum,jdbcType=BIGINT},
-      buyNum = #{buyNum,jdbcType=BIGINT},
-      buyPrice = #{buyPrice,jdbcType=DECIMAL},
-      createBy = #{createBy,jdbcType=BIGINT},
-      createDate = #{createDate,jdbcType=TIMESTAMP},
-      updateBy = #{updateBy,jdbcType=BIGINT},
-      updateDate = #{updateDate,jdbcType=TIMESTAMP},
-      delFlag = #{delFlag,jdbcType=CHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>

src/main/resources/mapper/CmMallProductsClassifyMapper.xml

@@ -1,113 +0,0 @@
-<?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.caimei.modules.products.dao.CmMallProductsClassifyDao">
-    <sql id="cmMallProductsClassifyColumns">
-		a.id AS "id",
-		a.organizeId AS "organizeId",
-		a.classifyName AS "classifyName",
-		a.classifyImage AS "classifyImage",
-		a.sort AS "sort",
-		a.status AS "status",
-		a.addTime AS "addTime",
-		a.updateTime AS "updateTime",
-		a.postageToPay AS "postageToPay",
-		a.delFlag AS "delFlag"
-	</sql>
-
-    <select id="findList" resultType="com.caimei.modules.products.entity.CmMallProductsClassify">
-        SELECT
-        <include refid="cmMallProductsClassifyColumns"/>
-        FROM cm_mall_products_classify a
-        <where>
-            a.organizeId = #{organizeId}
-            AND a.delFlag = 0
-        </where>
-            ORDER BY -sort DESC,a.addTime DESC,a.id DESC
-    </select>
-
-    <select id="get" resultType="com.caimei.modules.products.entity.CmMallProductsClassify">
-        SELECT
-        <include refid="cmMallProductsClassifyColumns"/>
-        FROM cm_mall_products_classify a
-        WHERE a.id = #{id}
-        AND a.delFlag = 0
-    </select>
-
-    <select id="getProductsClassifyListByName" resultType="com.caimei.modules.products.entity.CmMallProductsClassify">
-        SELECT
-        <include refid="cmMallProductsClassifyColumns"/>
-        FROM cm_mall_products_classify a
-        <where>
-            a.classifyName = #{classifyName}
-			AND a.organizeId = #{organizeId}
-            <if test="id != null and id != ''">
-                AND a.id != #{id}
-            </if>
-        </where>
-        AND a.delFlag = 0
-    </select>
-
-    <insert id="insert" parameterType="com.caimei.modules.products.entity.CmMallProductsClassify"  keyProperty="id" useGeneratedKeys="true">
-		INSERT INTO cm_mall_products_classify(
-			organizeId,
-			classifyName,
-			classifyImage,
-			sort,
-			status,
-			addTime,
-			updateTime,
-			postageToPay,
-			delFlag
-		) VALUES (
-			#{organizeId},
-			#{classifyName},
-			#{classifyImage},
-			#{sort},
-			#{status},
-			#{addTime},
-			#{updateTime},
-			#{postageToPay},
-			#{delFlag}
-		)
-	</insert>
-
-    <update id="update">
-		UPDATE cm_mall_products_classify SET
-			organizeId = #{organizeId},
-			classifyName = #{classifyName},
-			classifyImage = #{classifyImage},
-			sort = #{sort},
-			status = #{status},
-			addTime = #{addTime},
-			postageToPay = #{postageToPay},
-			updateTime = #{updateTime}
-		WHERE id = #{id}
-	</update>
-
-    <update id="updateStatus">
-		UPDATE cm_mall_products_classify SET
-		status = #{status},
-		updateTime = #{updateTime}
-		WHERE id = #{id}
-	</update>
-
-    <update id="saveSort">
-		UPDATE cm_mall_products_classify SET
-		sort = #{sort}
-		WHERE id = #{id}
-	</update>
-
-	<!--获取启用且未被删除的商品分类-->
-	<select id="findListByEffective" resultType="com.caimei.modules.products.entity.CmMallProductsClassify">
-		SELECT
-		<include refid="cmMallProductsClassifyColumns"/>
-		FROM cm_mall_products_classify a
-		<where>
-			a.organizeId = #{organizeId}
-			AND a.status = 1
-		</where>
-		AND a.delFlag = 0
-	</select>
-</mapper>

src/main/resources/mapper/CmProductSnMapper.xml

@@ -1,33 +0,0 @@
-<?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.caimei.modules.order.dao.CmProductSnDao">
-    <sql id="cmProductSnColumns">
-		a.snID AS "snId",
-		a.snCode AS "snCode",
-		a.orderNo AS "orderNo",
-		a.orderID AS "orderId",
-		a.shopOrderNo AS "shopOrderNo",
-		a.shopOrderID AS "shopOrderId",
-		a.productID AS "productId",
-		a.orderProductID AS "orderProductId",
-		a.source AS "source",
-		a.createTime AS "createTime",
-		a.updateTime AS "updateTime"
-	</sql>
-
-    <select id="getListSignByOrderProduct" parameterType="java.lang.Integer" resultType="com.caimei.modules.club.entity.CmProductSn">
-        SELECT
-        <include refid="cmProductSnColumns"/>
-        FROM cm_product_sn a
-        <where>
-            <if test="shopOrderId != null">
-                AND shopOrderID = #{shopOrderId}
-            </if>
-            <if test="orderProductId != null">
-                AND orderProductID = #{orderProductId}
-            </if>
-        </where>
-    </select>
-</mapper>

src/main/resources/mapper/FloorMapper.xml

@@ -49,12 +49,12 @@
     <select id="findProducts" resultType="com.caimei.modules.homepage.enity.BackProduct">
         select DISTINCT p.name  as productName,
                         p.mainImage,
-                        cmop.id as productId,
-                        cmop.validFlag,
+                        p.productId,
+                        copi.validFlag,
                         cmp.sort
         from cm_mall_floor_product cmp
-                 left join cm_mall_organize_products cmop on cmp.productId = cmop.id
-                 left join product p on cmop.productId = p.productID
+        left join product p on cmp.productId = p.productID
+        left join cm_organize_product_info copi on cmp.productId = copi.productId
         where cmp.floorId = #{id}
     </select>
 </mapper>