商品管理调整

mall-server-api/src/main/java/com/gree/mall/manager/bean/goods/GoodsBean.java

@@ -29,12 +29,5 @@ public class GoodsBean extends Goods {
     @ApiModelProperty("标签")
     private List<String> tagsLabel;
 
-//    @ApiModelProperty("套购配置的比例商品")
-//    private List<GoodsPackagePop> goodsPackagePops;
-//    @ApiModelProperty("套购配置的指定用户-新增/编辑用")
-//    private List<GoodsPackageUserRela> goodsPackageUserRelas;
-
-//    @ApiModelProperty("套购商品配置的用户列表-详情用")
-//    private List<User> users;
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CoustomUserCouponMapper.java

@@ -1,15 +0,0 @@
-package com.gree.mall.manager.commonmapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-@Mapper
-public interface CoustomUserCouponMapper {
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    void decreaseLeftTimes(@Param("id") String id);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    void increaseLeftTimes(@Param("id") String id);
-}

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CustomGoodsMapper.java

@@ -26,8 +26,6 @@ public interface CustomGoodsMapper {
      * @param keyword
      * @param startPrice
      * @param endPrice
-     * @param startShare
-     * @param endShare
      * @param sortStr
      * @param categoryId
      * @param status
@@ -35,13 +33,10 @@ public interface CustomGoodsMapper {
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<GoodsSpecBean> pageList(Page<GoodsSpecBean> objectPage,
-                                  @Param("isTrade") String isTrade,
                                   @Param("flag") String flag,
                                   @Param("keyword") String keyword,
                                   @Param("startPrice") BigDecimal startPrice,
                                   @Param("endPrice") BigDecimal endPrice,
-                                  @Param("startShare") BigDecimal startShare,
-                                  @Param("endShare") BigDecimal endShare,
                                   @Param("sortStr") String sortStr,
                                   @Param("categoryId") List<String> categoryId,
                                   @Param("status") Boolean status,
@@ -88,21 +83,5 @@ public interface CustomGoodsMapper {
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public GoodsCategory queryGoodsCategoryByGoodsId(@Param("goodsId") String goodsId);
 
-    /**
-     * 用 商品规格的 分销金额 覆盖其 为null的 内部分销金额
-     */
-    void syncGoodsSpecInnerShareMsg(@Param("companyWechatId") String companyWechatId);
-
-
-    IPage<GoodsPackageList> queryGoodsPackageList(Page objectPage,
-                                                  @Param("keyword") String keyword,
-                                                  @Param("startPrice") BigDecimal startPrice,
-                                                  @Param("endPrice") BigDecimal endPrice,
-                                                  @Param("startShare") BigDecimal startShare,
-                                                  @Param("endShare") BigDecimal endShare,
-                                                  @Param("sortStr") String sortStr,
-                                                  @Param("categoryId") List<String> categoryId,
-                                                  @Param("status") Boolean status,
-                                                  @Param("companyWechatIds")List<String> companyWechatIds);
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/EnterpriseWechatWorkerLogicMapper.java

@@ -1,19 +0,0 @@
-package com.gree.mall.manager.commonmapper;
-
-import com.gree.mall.manager.bean.admin.EnterpriseWechatWorkerImportList;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface EnterpriseWechatWorkerLogicMapper {
-
-    /**
-     * 企微导出信息list
-     */
-    List<EnterpriseWechatWorkerImportList> list(@Param("mainDepartmentIds") List<Long> ids,
-                                                @Param("keyword") String keyword, @Param("corpIds") List<String> corpIds,
-                                                @Param("corpId") String corpId);
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/GoodsCheckMapper.java

@@ -1,16 +0,0 @@
-package com.gree.mall.manager.commonmapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface GoodsCheckMapper {
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    Integer checkGoodsSec(@Param("goodsId")String goodsId);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<String> checkGoodsSecBatch(@Param("goodsIds")List<String> goodsIds);
-}

mall-server-api/src/main/java/com/gree/mall/manager/controller/goods/GoodsController.java

@@ -48,52 +48,23 @@ public class GoodsController {
             @ApiParam(value = "商品关键字") @RequestParam(required = false) String keyword,
             @ApiParam(value = "销售价格开始区间") @RequestParam(required = false) BigDecimal startPrice,
             @ApiParam(value = "销售价格结束区间") @RequestParam(required = false) BigDecimal endPrice,
-            @ApiParam(value = "分销金额开始区间") @RequestParam(required = false) BigDecimal startShare,
-            @ApiParam(value = "分销金额开始区间") @RequestParam(required = false) BigDecimal endShare,
             @ApiParam(value = "排序json格式[{sortColumn: 'PRICE', type: true },...] " +
                     "sortColumn:商品排序对应值 PRICE=销售价格 SHARE=分销金额 SOLD=销量 STOCK=库存, " +
                     "type: true=升序 false=倒序")
             @RequestParam(required = false) String sortJson,
             @ApiParam(value = "商品分类 传入商品小类") @RequestParam(required = false) String categoryId,
             @ApiParam(value = "商品状态 true:上架  false:下架") @RequestParam(required = false) Boolean status,
-            @ApiParam(value = "是否支持以旧换新") @RequestParam(required = false) String isTrade,
             @ApiParam(value = "商品类型：COMMON=普通商品 PACKAGE=套购商品,不传默认为普通商品,支持传多个",required = false)
             @RequestParam(required = false) List<String> goodsTypes,
             @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
             @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
             HttpServletRequest request
     ) throws Exception {
-        IPage<GoodsSpecBean> goodsSpecBeanIPage = goodsLogic.page(isTrade,flag, keyword, startPrice, endPrice,
-                startShare, endShare, sortJson, categoryId, status,goodsTypes, pageNum, pageSize , request);
+        IPage<GoodsSpecBean> goodsSpecBeanIPage = goodsLogic.page(flag, keyword, startPrice, endPrice,
+                sortJson, categoryId, status,goodsTypes, pageNum, pageSize , request);
         return ResponseHelper.success(goodsSpecBeanIPage);
     }
 
-
-    @GetMapping("/package/list")
-    @ApiOperation(value = "套餐商品-列表")
-    public ResponseHelper<IPage<GoodsPackageList>> packageList(
-            @ApiParam(value = "商品关键字") @RequestParam(required = false) String keyword,
-            @ApiParam(value = "销售价格开始区间") @RequestParam(required = false) BigDecimal startPrice,
-            @ApiParam(value = "销售价格结束区间") @RequestParam(required = false) BigDecimal endPrice,
-            @ApiParam(value = "分销金额开始区间") @RequestParam(required = false) BigDecimal startShare,
-            @ApiParam(value = "分销金额开始区间") @RequestParam(required = false) BigDecimal endShare,
-            @ApiParam(value = "排序json格式[{sortColumn: 'PRICE', type: true },...] " +
-                    "sortColumn:商品排序对应值 PRICE=销售价格 SHARE=分销金额 SOLD=销量 STOCK=库存, " +
-                    "type: true=升序 false=倒序")
-            @RequestParam(required = false) String sortJson,
-            @ApiParam(value = "商品分类 传入商品小类") @RequestParam(required = false) String categoryId,
-            @ApiParam(value = "商品状态 true:上架  false:下架") @RequestParam(required = false) Boolean status,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) throws Exception {
-        IPage<GoodsPackageList> goodsPackageListIPage = goodsLogic.packageList(keyword, startPrice, endPrice,
-                startShare, endShare, sortJson, categoryId, status, pageNum, pageSize, request);
-        return ResponseHelper.success(goodsPackageListIPage);
-    }
-
-
-
     @GetMapping("/listbycategory")
     @ApiOperation(value = "商品详情")
     public ResponseHelper<List<GoodsSpecBean>> listbycategory(
@@ -114,17 +85,6 @@ public class GoodsController {
         return ResponseHelper.success(detail);
     }
 
-
-    @GetMapping("/package/poplist")
-    @ApiOperation("套购商品-配置商品列表")
-    public ResponseHelper<List<GoodsPackageBean>> popList(
-            @ApiParam(value = "商品id",required = true) @RequestParam String goodsId,
-            @ApiParam(value = "第几个商品框",required = true) @RequestParam Integer type
-    ) throws RemoteServiceException {
-        List<GoodsPackageBean> goodsPackageBeans = goodsLogic.popList(goodsId, type);
-        return ResponseHelper.success(goodsPackageBeans);
-    }
-
     @PostMapping("/add")
     @ApiOperation(value = "新增商品")
     public ResponseHelper add(
@@ -143,17 +103,6 @@ public class GoodsController {
         return ResponseHelper.success();
     }
 
-    @PostMapping("/batchUp")
-    @ApiOperation(value = "批量开启关闭以旧换新")
-    public ResponseHelper batchUp(
-            @ApiParam(value = "商品ids",required = true) @RequestParam List<String> goodsIds,
-            @ApiParam(value = "是否支持 YES NO",required = true) @RequestParam String isTrade)
-            throws RemoteServiceException {
-        goodsLogic.batchUp(goodsIds,isTrade);
-        return ResponseHelper.success();
-    }
-
-
     @PostMapping("/status/update")
     @ApiOperation(value = "商品上下架")
     public ResponseHelper change(
@@ -180,25 +129,6 @@ public class GoodsController {
         return ResponseHelper.success(goodsLogic.clone(goodsId));
     }
 
-
-    @PostMapping("/goods/off/check")
-    @ApiOperation(value = "下架商品前,检测是否秒杀商品")
-    public ResponseHelper SecCheck(
-            @ApiParam(value = "商品id",required = true) @RequestParam String goodsId)
-            throws RemoteServiceException {
-        return ResponseHelper.success(goodsLogic.secCheck(goodsId));
-    }
-
-    @PostMapping("/goods/off/check/batch")
-    @ApiOperation(value = "下架商品前,批量检测是否秒杀商品,返回秒杀的商品id列表")
-    public ResponseHelper SecCheckBatch(
-            @ApiParam(value = "商品id",required = true) @RequestBody List<String> goodsIdList)
-            throws RemoteServiceException {
-        return ResponseHelper.success(goodsLogic.secCheckBatch(goodsIdList));
-    }
-
-
-
     @PostMapping("/goods/on")
     @ApiOperation(value = "批量上架商品")
     public ResponseHelper goodsOn(
@@ -234,44 +164,6 @@ public class GoodsController {
         goodsLogic.goodsFreight(goodsFreightBean);
         return ResponseHelper.success();
     }
-//
-//    @GetMapping("/marketing/list")
-//    @ApiOperation(value = "营销活动列表")
-//    public ResponseHelper<List<Map<String,Object>>> marketingList(
-//            @ApiParam(value = "类型 1=安装 2=维修") @RequestParam(required = true) Integer type
-//    ) throws Exception {
-//        List<Map<String, Object>> marketingList = gongdanLogic.getMarketingList(type);
-//        return ResponseHelper.success(marketingList);
-//    }
-
-    //@ApiOperation(" 用 商品规格的 分销金额 覆盖其 为null的 内部分销金额")
-    //@PostMapping("/syncGoodsSpecInnerShareMsg")
-    public ResponseHelper<Void> syncGoodsSpecInnerShareMsg(HttpServletRequest request){
-        goodsLogic.syncGoodsSpecInnerShareMsg(request);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/package/user")
-    @ApiOperation(value = "套购商品-指定人员列表")
-    public ResponseHelper<List<User>> packageUserList(
-            @ApiParam(value = "商品id",required = true) @RequestParam(required = true) String goodsId,
-            @ApiParam(value = "商品id",required = false) @RequestParam(required = false) String mobile
-    ) throws Exception {
-        List<User> packageUseUserList = goodsLogic.getPackageUseUserList(goodsId, mobile);
-        return ResponseHelper.success(packageUseUserList);
-    }
-
-
-    @PostMapping("/package/import")
-    @ApiOperation(value = "套购商品-导入指定人员")
-    public ResponseHelper<List<User>> packageUserList(
-            MultipartFile multipartFile
-    ) throws Exception {
-        List<Object> objects = ExcelUtils.importExcel(multipartFile);
-        List<User> users = goodsLogic.importPackageUser(objects);
-        return ResponseHelper.success(users);
-    }
-
 
 
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/FucaiLogic.java

@@ -1,65 +0,0 @@
-package com.gree.mall.manager.logic.common;
-
-import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.lang3.StringUtils;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.FeignResponseObject;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.plus.entity.GoodsSpec;
-import com.gree.mall.manager.utils.HttpUtils;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class FucaiLogic {
-
-//    @Value("${fucai.wuliao.url}")
-//    private String wuliaoUrl;
-    @Value("${spring.profiles.active}")
-    private String profiles;
-
-
-    public void getWuliao(List<GoodsSpec> goodsSpecs) throws RemoteServiceException {
-        if(CollectionUtils.isEmpty(goodsSpecs)){
-            return;
-        }
-        if(!profiles.equals("prd")){
-            return;
-        }
-        for(GoodsSpec goodsSpec : goodsSpecs){
-            this.getWuliao(goodsSpec);
-        }
-    }
-
-    /**
-     * 查询金蝶物料
-     */
-    public void getWuliao(GoodsSpec goodsSpec) throws RemoteServiceException {
-//        if(StringUtils.isBlank(goodsSpec.getGoodsCode())){
-//            return;
-//        }
-//
-//        Map<String, String> map = new HashMap<>();
-//        map.put("number", goodsSpec.getGoodsCode());
-//        String s = HttpUtils.requestGet(wuliaoUrl, map, null);
-//        FeignResponseObject feignResponseObject = JSONObject.parseObject(s, FeignResponseObject.class);
-//        List<Map<String, Object>> data = (List<Map<String, Object>>) feignResponseObject.checkOutData();
-//        if (data == null || data.size() == 0) {
-//            throw new RemoteServiceException("请检查物料编码是否正确");
-//        }
-//        String name = (String) data.get(0).get("name");
-//        BigDecimal tax = (BigDecimal) data.get(0).get("taxRateId");
-//        String unit = (String) data.get(0).get("salePriceUnitId");
-//        goodsSpec.setJindName(name);
-//        goodsSpec.setJindTax(tax.divide(BigDecimal.valueOf(100)));
-//        goodsSpec.setJindUnit(unit);
-
-    }
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/logic/goods/GoodsLogic.java

@@ -5,17 +5,16 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.goods.*;
 import com.gree.mall.manager.commonmapper.CustomGoodsMapper;
-import com.gree.mall.manager.commonmapper.GoodsCheckMapper;
 import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.enums.FreightTypeEnum;
 import com.gree.mall.manager.enums.GoodsTypeEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.logic.common.FucaiLogic;
 import com.gree.mall.manager.logic.user.UserLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
@@ -40,8 +39,6 @@ import java.util.stream.Collectors;
 public class GoodsLogic {
     @Resource
     CommonLogic commonLogic;
-    @Autowired
-    FucaiLogic fucaiLogic;
 
     @Resource
     CustomGoodsMapper customGoodsMapper;
@@ -51,16 +48,9 @@ public class GoodsLogic {
     GoodsSpecService goodsSpecService;
     @Autowired
     GoodsTagRelaService goodsTagRelaService;
-
-    @Resource
-    SecKillActivityService secKillActivityService;
-    @Resource
-    SecKillActivitySpecService secKillActivitySpecService;
     @Autowired
     private CarouselMapService carouselMapService;
     @Autowired
-    private GoodsCheckMapper goodsCheckMapper;
-    @Autowired
     private GoodsTemplateService goodsTemplateService;
     @Autowired
     private CommonFileService commonFileService;
@@ -82,8 +72,6 @@ public class GoodsLogic {
      * @param keyword
      * @param startPrice
      * @param endPrice
-     * @param startShare
-     * @param endShare
      * @param goodsSortJson
      * @param categoryId
      * @param status
@@ -91,8 +79,7 @@ public class GoodsLogic {
      * @param pageSize
      * @return
      */
-    public IPage<GoodsSpecBean> page(String isTrade, String flag, String keyword, BigDecimal startPrice, BigDecimal endPrice,
-                                     BigDecimal startShare, BigDecimal endShare,
+    public IPage<GoodsSpecBean> page(String flag, String keyword, BigDecimal startPrice, BigDecimal endPrice,
                                      String goodsSortJson, String categoryId, Boolean status, List<String> goodsTypes,
                                      Integer pageNum, Integer pageSize, HttpServletRequest request) {
 
@@ -114,8 +101,8 @@ public class GoodsLogic {
             goodsTypes.add(GoodsTypeEnum.COMMON.toString());
         }
 
-        IPage<GoodsSpecBean> goodsSpecBeanIPage = customGoodsMapper.pageList(new Page<>(pageNum, pageSize), isTrade, flag, keyword, startPrice,
-                endPrice, startShare, endShare, sortStr, categoryIds, status, goodsTypes, companyWechatIds);
+        IPage<GoodsSpecBean> goodsSpecBeanIPage = customGoodsMapper.pageList(new Page<>(pageNum, pageSize), flag, keyword, startPrice,
+                endPrice, sortStr, categoryIds, status, goodsTypes, companyWechatIds);
 
         //商品规格
         List<GoodsSpecBean> records = new ArrayList<>();
@@ -146,48 +133,6 @@ public class GoodsLogic {
 
 
     /**
-     * 套购商品列表
-     *
-     * @param keyword
-     * @param startPrice
-     * @param endPrice
-     * @param startShare
-     * @param endShare
-     * @param goodsSortJson
-     * @param categoryId
-     * @param status
-     * @param pageNum
-     * @param pageSize
-     * @param request
-     * @return
-     */
-    public IPage<GoodsPackageList> packageList(String keyword, BigDecimal startPrice, BigDecimal endPrice,
-                                               BigDecimal startShare, BigDecimal endShare,
-                                               String goodsSortJson, String categoryId, Boolean status,
-                                               Integer pageNum, Integer pageSize, HttpServletRequest request) {
-
-        //获取当前登录微信企业微信id
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
-
-        String sortStr = null;
-        if (goodsSortJson != null && !goodsSortJson.trim().equals("")) {
-            JSONArray goodsSortBeanArray = JSON.parseArray(StringEscapeUtils.unescapeJava(goodsSortJson));
-            sortStr = GoodsSortBean.convertColumn(goodsSortBeanArray);
-        }
-        List<String> categoryIds = new ArrayList<>();
-        if (StringUtils.isNotBlank(categoryId)) {
-            categoryIds.add(categoryId);
-        }
-
-        IPage<GoodsPackageList> goodsPackageListIPage = customGoodsMapper.queryGoodsPackageList(new Page<>(pageNum, pageSize), keyword, startPrice,
-                endPrice, startShare, endShare, sortStr, categoryIds, status, companyWechatIds);
-
-        return goodsPackageListIPage;
-    }
-
-
-    /**
      * 根据类型查询商品
      *
      * @param categoryIds
@@ -202,7 +147,7 @@ public class GoodsLogic {
 
 
         IPage<GoodsSpecBean> goodsSpecBeanIPage = customGoodsMapper.pageList(new Page<>(1, -1), null, null, null, null,
-                null, null, null, null, categoryIds, null, null, companyWechatIds);
+                null,  categoryIds, null, null, companyWechatIds);
         //添加规格
         List<GoodsSpecBean> records = goodsSpecBeanIPage.getRecords();
         for (GoodsSpecBean record : records) {
@@ -235,25 +180,6 @@ public class GoodsLogic {
      */
     @Transactional(rollbackFor = Exception.class)
     public void updateStatus(String goodsId, Boolean status) throws RemoteServiceException {
-        if (!status) {
-            List<SecKillActivitySpec> secKillActivitySpecs = secKillActivitySpecService.lambdaQuery()
-                    .eq(SecKillActivitySpec::getGoodsId, goodsId)
-                    .list();
-            Integer activityCount = 0;
-            for (SecKillActivitySpec secKillActivitySpec : secKillActivitySpecs) {
-
-                activityCount += secKillActivityService.lambdaQuery()
-                        .eq(SecKillActivity::getSecKillId, secKillActivitySpec.getSecKillId())
-                        .ge(SecKillActivity::getEndTime, new Date())
-                        .eq(SecKillActivity::getStatus, true)
-                        .eq(SecKillActivity::getDel, false)
-                        .count();
-            }
-
-            if (activityCount > 0) {
-                throw new RemoteServiceException("商品处于秒杀活动中，操作失败!");
-            }
-        }
         goodsService.lambdaUpdate()
                 .eq(Goods::getGoodsId, goodsId)
                 .set(Goods::getStatus, status)
@@ -272,25 +198,6 @@ public class GoodsLogic {
      */
     @Transactional(rollbackFor = Exception.class)
     public void delete(String goodsId) throws RemoteServiceException {
-        //检查是否存在秒杀活动
-        List<SecKillActivitySpec> secKillActivitySpecs = secKillActivitySpecService.lambdaQuery()
-                .eq(SecKillActivitySpec::getGoodsId, goodsId)
-                .list();
-        Integer activityCount = 0;
-        for (SecKillActivitySpec secKillActivitySpec : secKillActivitySpecs) {
-
-            activityCount += secKillActivityService.lambdaQuery()
-                    .eq(SecKillActivity::getSecKillId, secKillActivitySpec.getSecKillId())
-                    .ge(SecKillActivity::getEndTime, new Date())
-                    .eq(SecKillActivity::getStatus, true)
-                    .eq(SecKillActivity::getDel, false)
-                    .count();
-        }
-
-        if (activityCount > 0) {
-            throw new RemoteServiceException("商品处于秒杀活动中，操作删除失败!");
-        }
-
         //检查是否在上架状态
         Integer count = goodsService.lambdaQuery()
                 .eq(Goods::getGoodsId, goodsId)
@@ -382,67 +289,13 @@ public class GoodsLogic {
     }
 
     /**
-     * 套购商品-商品配置列表
-     */
-    public List<GoodsPackageBean> popList(String goodsId, Integer type) {
-        //套购商品
-        Goods goods = goodsService.getById(goodsId);
-        if (!StringUtils.equals(goods.getGoodsType(), GoodsTypeEnum.PACKAGE.toString())) {
-            throw new RemoteServiceException("非套餐商品");
-        }
-
-        //套购商品--商品配置
-        List<GoodsPackagePop> list = goodsPackagePopService.lambdaQuery()
-                .eq(GoodsPackagePop::getGoodsPackageId, goodsId)
-                .eq(GoodsPackagePop::getType, type).list();
-
-        Map<String, List<GoodsPackagePopBean>> map = new LinkedHashMap<>();
-        for (GoodsPackagePop bean : list) {
-            List<GoodsPackagePopBean> goodsPackagePops = map.get(bean.getGoodsId());
-            if (goodsPackagePops == null) {
-                goodsPackagePops = new ArrayList<>();
-            }
-            GoodsPackagePopBean newBean = new GoodsPackagePopBean();
-            BeanUtils.copyProperties(bean, newBean);
-
-            GoodsSpec goodsSpec = goodsSpecService.getById(bean.getGoodsSpecId());
-            newBean.setSpecName(goodsSpec.getName());
-            newBean.setSpecValue(goodsSpec.getSpecValue());
-            newBean.setStock(goodsSpec.getStockNum());
-
-            goodsPackagePops.add(newBean);
-            map.put(bean.getGoodsId(), goodsPackagePops);
-        }
-        //商品
-        List<GoodsPackageBean> goodsList = new ArrayList<>();
-        for (String gdsId : map.keySet()) {
-
-            Goods nGoods = goodsService.getById(gdsId);
-
-            GoodsPackagePopBean goodsPackagePop = map.get(gdsId).get(0);
-            GoodsPackageBean bean = new GoodsPackageBean();
-            bean.setImgUrl(nGoods.getImgUrl());
-            bean.setGoodsName(nGoods.getGoodsName());
-            bean.setGoodsPackagePopList(map.get(gdsId));
-            bean.setSortNum(goodsPackagePop.getSortNum());
-            goodsList.add(bean);
-        }
-        return goodsList;
-    }
-
-
-    /**
      * 添加商品
      *
      * @param goodsBean
      */
     @Transactional(rollbackFor = Exception.class)
     public void add(GoodsBean goodsBean, HttpServletRequest request) throws RemoteServiceException {
-        if (StringUtils.equals(goodsBean.getGoodsType(), GoodsTypeEnum.COMMON.toString())
-                && (goodsBean.getGoodsSpecs() == null || goodsBean.getGoodsSpecs().size() == 0)) {
-            //如果是规格没有抛出异常
-            throw new RemoteServiceException("至少要有一个规格!");
-        }
+        this.commonCheckGoods(goodsBean);
         //设置企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 //        if (StringUtils.isBlank(goodsBean.getCompanyWechatId())) {
@@ -455,41 +308,35 @@ public class GoodsLogic {
         goodsBean.setCompanyName(adminUser.getCompanyName());
 
         Date creatDate = new Date();
+
+        goodsBean.setCreateTime(creatDate);
+
         List<GoodsSpec> goodsSpecList = goodsBean.getGoodsSpecs();
         if (CollectionUtils.isNotEmpty(goodsSpecList)) {
-            Collections.sort(goodsSpecList, (o1, o2) -> o1.getPrice().compareTo(o2.getPrice()));
+            goodsSpecList.sort(Comparator.comparing(GoodsSpec::getPrice));
             goodsBean.setGoodsPrice(goodsSpecList.get(0).getPrice());
-            goodsBean.setOrgGoodsPrice(goodsSpecList.get(0).getOrgPrice());
-        }
-        goodsBean.setCreateTime(creatDate);
-        goodsService.save(goodsBean);
-
-        if (CollectionUtils.isNotEmpty(goodsBean.getGoodsSpecs())) {
-
-            List<GoodsSpec> goodsSpecs = goodsBean.getGoodsSpecs();
-            for (GoodsSpec goodsSpec : goodsSpecs) {
+            goodsBean.setOrgGoodsPrice(BigDecimal.ZERO);
+            for (GoodsSpec goodsSpec : goodsSpecList) {
 
                 GoodsMaterial goodsMaterial = goodsMaterialService.getById(goodsSpec.getGoodsCode());
                 if (goodsMaterial != null) {
                     goodsSpec.setSpecValue(goodsMaterial.getSpecsName());
+                    if (StringUtils.isBlank(goodsSpec.getName())) {
+                        goodsSpec.setName(goodsMaterial.getSpecsName());
+                    }
                 }
 
                 goodsSpec.setGoodsId(goodsBean.getGoodsId())
                         .setCompanyWechatId(goodsBean.getCompanyWechatId())
                         .setCompanyName(goodsBean.getCompanyName())
-                        .setCreateTime(creatDate).setDel(false)
-                        //.setSpecValue(goodsSpec.getSpecValue())
-                        .setShareAmount(limitShareAmount(goodsSpec.getPrice(), goodsSpec.getShareAmount())) //限制金额40%
-                        .setShareAmount(limitShareAmount(goodsSpec.getPrice(), goodsSpec.getSharePercent() != null  //分销比列不为0覆盖分销金额
-                                && goodsSpec.getSharePercent().compareTo(new Double("0.00")) > 0 ?
-                                goodsSpec.getPrice().multiply(new BigDecimal(goodsSpec.getSharePercent() / 100.0))
-                                        .setScale(2, BigDecimal.ROUND_DOWN)
-                                : goodsSpec.getShareAmount()))
-                        .setInnerShareAmount(getInnerShareAmount(goodsSpec));//需最后设置
+                        .setOrgPrice(BigDecimal.ZERO)
+                        .setCreateTime(creatDate)
+                        .setDel(false);//需最后设置
             }
-
         }
 
+        goodsService.save(goodsBean);
+
         if (StringUtils.isNotBlank(goodsBean.getTemplateId())) {
             GoodsTemplate goodsTemplate = new GoodsTemplate();
             goodsTemplate.setGoodsId(goodsBean.getGoodsId());
@@ -500,8 +347,6 @@ public class GoodsLogic {
             goodsTemplateService.save(goodsTemplate);
         }
 
-        //查询物料信息
-        fucaiLogic.getWuliao(goodsSpecList);
         //批量保存商品规格
         if (CollectionUtils.isNotEmpty(goodsSpecList))
             goodsSpecService.saveBatch(goodsSpecList);
@@ -515,8 +360,14 @@ public class GoodsLogic {
         this.saveGoodsTagRela(goodsBean.getTags(), goodsBean.getGoodsId(), 1);
         this.saveGoodsTagRela(goodsBean.getTagsLabel(), goodsBean.getGoodsId(), 2);
 
-        //套购商品处理
-        //this.saveGoodsPackage(goodsBean);
+    }
+
+    private void commonCheckGoods(GoodsBean goodsBean) {
+        if (StringUtils.equals(goodsBean.getGoodsType(), GoodsTypeEnum.COMMON.toString())
+                && (goodsBean.getGoodsSpecs() == null || goodsBean.getGoodsSpecs().size() == 0)) {
+            //如果是规格没有抛出异常
+            throw new RemoteServiceException("至少要有一个规格!");
+        }
     }
 
     /**
@@ -541,49 +392,6 @@ public class GoodsLogic {
 
     }
 
-
-    /**
-     * 限制最大分账
-     *
-     * @param price
-     * @param shareAmount
-     * @return
-     */
-    private BigDecimal limitShareAmount(BigDecimal price, BigDecimal shareAmount) {
-        if (price == null) {
-            throw new RemoteServiceException("销售价不能为空");
-        }
-        if (shareAmount == null) {
-            throw new RemoteServiceException("佣金或分销金额不能为空");
-        }
-        return shareAmount;
-    }
-
-    /**
-     * 获取内部分销金额
-     */
-    private BigDecimal getInnerShareAmount(GoodsSpec goodsSpec) {
-        BigDecimal innerShareAmount = goodsSpec.getInnerShareAmount();
-        Double innerSharePercent = goodsSpec.getInnerSharePercent();
-        BigDecimal price = goodsSpec.getPrice();
-
-        //以内部分销比列为准
-        if (innerSharePercent != null && innerSharePercent.compareTo(new Double("0.00")) > 0) {
-            // price * innerSharePercent/100 = 内部分销金额
-            innerShareAmount = price.multiply(new BigDecimal(innerSharePercent / 100.0)).setScale(2, BigDecimal.ROUND_DOWN);
-
-            return limitShareAmount(price, innerShareAmount);
-        }
-        //没有比列有金额以金额为准
-        else if (innerShareAmount != null) {
-            goodsSpec.setInnerSharePercent(new Double("0.00"));
-            return limitShareAmount(price, innerShareAmount);
-        }
-
-        goodsSpec.setInnerSharePercent(goodsSpec.getSharePercent());
-        return goodsSpec.getShareAmount();
-    }
-
     /**
      * 编辑商品
      *
@@ -592,16 +400,12 @@ public class GoodsLogic {
     @Transactional(rollbackFor = Exception.class)
     public void update(GoodsBean goodsBean, HttpServletRequest request) throws RemoteServiceException {
 
-        //检查是否存在秒杀活动
-        if (StringUtils.equals(goodsBean.getGoodsType(), GoodsTypeEnum.COMMON.toString())
-                && (goodsBean.getGoodsSpecs() == null || goodsBean.getGoodsSpecs().size() == 0)) {
-            throw new RemoteServiceException("至少要有一个规格!");
-        }
+        this.commonCheckGoods(goodsBean);
 
         //设置企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         if (StringUtils.isBlank(adminUser.getCompanyWechatId())) {
-            throw new RemoteServiceException("非租户账号不可操作当前信息");
+            throw new RemoteServiceException("非商户账号不可操作当前信息");
         }
         goodsBean.setCompanyWechatId(adminUser.getCompanyWechatId());
         goodsBean.setCompanyName(adminUser.getCompanyName());
@@ -615,13 +419,6 @@ public class GoodsLogic {
                     .map(goodsSpec -> goodsSpec.setGoodsId(goodsBean.getGoodsId())
                             .setCompanyWechatId(goodsBean.getCompanyWechatId())
                             .setCompanyName(goodsBean.getCompanyName())
-                            .setShareAmount(limitShareAmount(goodsSpec.getPrice(), goodsSpec.getShareAmount()))  //限制金额40%
-                            .setShareAmount(limitShareAmount(goodsSpec.getPrice(),      //比列>0 覆盖分销金额
-                                    goodsSpec.getSharePercent() != null && goodsSpec.getSharePercent().compareTo(new Double("0.00")) > 0 ?
-                                            goodsSpec.getPrice().multiply(new BigDecimal(goodsSpec.getSharePercent() / 100.0)).setScale(2, BigDecimal.ROUND_DOWN)
-                                            : goodsSpec.getShareAmount()
-                            ))
-                            .setInnerShareAmount(getInnerShareAmount(goodsSpec))//需最后设置
                     )
                     .collect(Collectors.toList());
 
@@ -629,12 +426,10 @@ public class GoodsLogic {
             //更新主表信息
             List<GoodsSpec> goodsSpecList = goodsBean.getGoodsSpecs();
             if (CollectionUtils.isNotEmpty(goodsSpecList)) {
-                Collections.sort(goodsSpecList, (o1, o2) -> o1.getPrice().compareTo(o2.getPrice()));
+                goodsSpecList.sort(Comparator.comparing(GoodsSpec::getPrice));
                 goodsBean.setGoodsPrice(goodsSpecList.get(0).getPrice());
-                goodsBean.setOrgGoodsPrice(goodsSpecList.get(0).getOrgPrice());
+                goodsBean.setOrgGoodsPrice(BigDecimal.ZERO);
             }
-            //查询物料信息
-            fucaiLogic.getWuliao(goodsSpecList);
         }
         goodsService.updateById(goodsBean);
 
@@ -659,7 +454,6 @@ public class GoodsLogic {
         }
         //查找规格id为空的 添加到从表
         if (CollectionUtils.isNotEmpty(goodsBean.getGoodsSpecs())) {
-
             List<GoodsSpec> addGoodsSpecList = goodsBean.getGoodsSpecs();
             for (GoodsSpec goodsSpec : addGoodsSpecList) {
 
@@ -670,15 +464,7 @@ public class GoodsLogic {
 
                 goodsSpec.setGoodsId(goodsBean.getGoodsId())
                         .setCompanyWechatId(goodsBean.getCompanyWechatId())
-                        .setCompanyName(goodsBean.getCompanyName())
-                        //.setSpecValue(goodsSpec.getSpecValue())
-                        .setShareAmount(limitShareAmount(goodsSpec.getPrice(), goodsSpec.getShareAmount())) //限制金额40%
-                        .setShareAmount(limitShareAmount(goodsSpec.getPrice(), goodsSpec.getSharePercent() != null  //分销比列不为0覆盖分销金额
-                                && goodsSpec.getSharePercent().compareTo(new Double("0.00")) > 0 ?
-                                goodsSpec.getPrice().multiply(new BigDecimal(goodsSpec.getSharePercent() / 100.0))
-                                        .setScale(2, BigDecimal.ROUND_DOWN)
-                                : goodsSpec.getShareAmount()))
-                        .setInnerShareAmount(getInnerShareAmount(goodsSpec));//需最后设置
+                        .setCompanyName(goodsBean.getCompanyName());
             }
 
             if (addGoodsSpecList.size() > 0) {
@@ -689,88 +475,9 @@ public class GoodsLogic {
         this.saveGoodsTagRela(goodsBean.getTags(), goodsBean.getGoodsId(), 1);
         this.saveGoodsTagRela(goodsBean.getTagsLabel(), goodsBean.getGoodsId(), 2);
 
-        //套购商品处理
-        //this.saveGoodsPackage(goodsBean);
     }
 
     /**
-     * 添加套购商品
-     */
-//    public void saveGoodsPackage(GoodsBean goodsBean){
-//        if(!StringUtils.equals(goodsBean.getGoodsType(),GoodsTypeEnum.PACKAGE.toString())){
-//            return;
-//        }
-//        if(StringUtils.isBlank(goodsBean.getPackagePop()) || goodsBean.getPackagePop().indexOf(":") == -1){
-//            throw new RemoteServiceException("请填写正确的比例,例如 2:1");
-//        }
-//        List<GoodsPackagePop> goodsPackagePops = goodsBean.getGoodsPackagePops();
-//        if(CollectionUtils.isEmpty(goodsPackagePops)){
-//            throw new RemoteServiceException("请配置套购的比例商品");
-//        }
-//        List<GoodsPackagePop> distinctList = goodsPackagePops.stream().distinct().collect(Collectors.toList());
-//        if(goodsPackagePops.size() != distinctList.size()){
-//            throw new RemoteServiceException("禁止配置重复的机型");
-//        }
-//        //计算最低销售价格，最低分佣金额
-//        BigDecimal totalMinPrice = BigDecimal.valueOf(0);
-//        BigDecimal totalMinShareAmount = BigDecimal.valueOf(0);
-//        //判断条件的比例和对应的机型是否合格
-//        String[] split = goodsBean.getPackagePop().split(":");
-//        for (int i = 1;i <= split.length; i++) {
-//            int a = i;
-//            long count = goodsPackagePops.stream().filter(v -> v.getType().intValue() == a).count();
-//            if(count == 0){
-//                throw new RemoteServiceException("条件比例与商品配置错误");
-//            }
-//            //判断比例格式是否正确
-//            try {
-//                int i1 = Integer.parseInt(split[i - 1]);
-//            }catch(Exception e){
-//                throw new RemoteServiceException("请填写正确的比例,例如  1:2");
-//            }
-//            BigDecimal minPrice = null;
-//            BigDecimal minShareAmount = null;
-//            for(GoodsPackagePop goodsPackagePop : goodsPackagePops) {
-//                if(i != goodsPackagePop.getType()){
-//                    continue;
-//                }
-//                //计算最低销售金额和分佣金额
-//                BigDecimal minPrice2 = goodsPackagePop.getPrice().multiply(new BigDecimal(split[goodsPackagePop.getType() - 1])).setScale(2, BigDecimal.ROUND_HALF_UP);
-//                if (minPrice == null || minPrice.doubleValue() > minPrice2.doubleValue()) {
-//                    minPrice = minPrice2;
-//                }
-//                BigDecimal minShareAmount2 = minPrice2.multiply(goodsPackagePop.getShareRate()).setScale(2, BigDecimal.ROUND_HALF_UP);
-//                if (minShareAmount == null || minShareAmount.doubleValue() > minShareAmount2.doubleValue()) {
-//                    minShareAmount = minShareAmount2;
-//                }
-//            }
-//            totalMinPrice = totalMinPrice.add(minPrice);
-//            totalMinShareAmount = totalMinShareAmount.add(minShareAmount);
-//        }
-//
-//        //添加配置机型
-//        goodsPackagePopService.lambdaUpdate().eq(GoodsPackagePop::getGoodsPackageId,goodsBean.getGoodsId()).remove();
-//        for(GoodsPackagePop goodsPackagePop : goodsPackagePops){
-//            goodsPackagePop.setGoodsPackageId(goodsBean.getGoodsId());
-//        }
-//        goodsPackagePopService.saveBatch(goodsPackagePops);
-//        //添加指定人员
-//        if(goodsBean.getPackageUserType() == 0 && CollectionUtils.isEmpty(goodsBean.getGoodsPackageUserRelas())){
-//            throw new RemoteServiceException("请选择指定用户");
-//        }
-//        for(GoodsPackageUserRela rela : goodsBean.getGoodsPackageUserRelas()){
-//            rela.setGoodsId(goodsBean.getGoodsId());
-//            rela.setCreateTime(new Date());
-//        }
-//        goodsBean.setPackageMinAmount(totalMinPrice);
-//        goodsBean.setPackageMinShareAmount(totalMinShareAmount);
-//        goodsBean.updateById();
-//
-//        goodsPackageUserRelaService.lambdaUpdate().eq(GoodsPackageUserRela::getGoodsId,goodsBean.getGoodsId()).remove();
-//        goodsPackageUserRelaService.saveBatch(goodsBean.getGoodsPackageUserRelas());
-//    }
-
-    /**
      * 分类统计
      */
     public GoodsTypeCount countByType(HttpServletRequest request) {
@@ -830,24 +537,12 @@ public class GoodsLogic {
         goodsTemplateService.saveBatch(goodsTemplateList);
     }
 
-
-    public Integer secCheck(String goodsId) {
-        Integer count = goodsCheckMapper.checkGoodsSec(goodsId);
-        return count;
-    }
-
-    public List<String> secCheckBatch(List<String> goodsIdList) {
-        List<String> secGoodsIds = goodsCheckMapper.checkGoodsSecBatch(goodsIdList);
-        return secGoodsIds;
-    }
-
     @Transactional
     public Goods clone(String goodsId) {
         Goods goods = goodsService.getById(goodsId);
         if (goods != null) {
             goods.setGoodsId(null);
             goods.setCreateTime(new Date());
-            goods.setPromotionGroup(false);
             goodsService.save(goods);
         }
         List<GoodsSpec> goodsSpecs = goodsSpecService.lambdaQuery()
@@ -909,20 +604,6 @@ public class GoodsLogic {
     }
 
     /**
-     * 用 商品规格的 分销金额 覆盖其 为null的 内部分销金额
-     */
-    public void syncGoodsSpecInnerShareMsg(HttpServletRequest request) {
-        String companyWechatId = commonLogic.getAdminUser(request).getCompanyWechatId();
-        if (StringUtils.isBlank(companyWechatId)) {
-            throw new RemoteServiceException("运营账号暂无权限操作");
-        }
-
-        customGoodsMapper.syncGoodsSpecInnerShareMsg(companyWechatId);
-
-    }
-
-
-    /**
      * 修改商品水印和有效时间
      */
     public void updateGoodsLogo(List<String> goodsIds, String logo, String logoStartTime, String logoEndTime) throws ParseException {
@@ -949,35 +630,10 @@ public class GoodsLogic {
         return users;
     }
 
-    /**
-     * 套购商品-导入指定人员
-     */
-    public List<User> importPackageUser(List<Object> list) {
-        if (CollectionUtils.isEmpty(list)) {
-            return new ArrayList<>();
-        }
-        List<String> mobiles = new ArrayList<>();
-        for (Object o : list) {
-            List<Object> row = (List<Object>) o;
-            mobiles.add((String) row.get(1));
-        }
-        List<User> users = userLogic.getByMobile(mobiles);
-        return users;
-    }
 
     public List<Goods> getById(List<String> goodsIds) {
         List<Goods> goodsList = goodsService.lambdaQuery().in(Goods::getGoodsId, goodsIds).list();
         return goodsList;
     }
 
-    public List<GoodsSpec> getSpec(List<String> goodsIds) {
-        List<GoodsSpec> goodsSpecs = goodsSpecService.lambdaQuery().in(GoodsSpec::getGoodsId, goodsIds).list();
-        return goodsSpecs;
-    }
-
-    public void batchUp(List<String> goodsIds, String isTrade) {
-        goodsService.lambdaUpdate()
-                .in(Goods::getGoodsId, goodsIds)
-                .set(Goods::getIsTrade, isTrade).update();
-    }
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/goods/GoodsMaterialLogic.java

@@ -284,7 +284,7 @@ public class GoodsMaterialLogic {
                 .in(CollectionUtils.isNotEmpty(adminUser.getCompanyWechatIds()),GoodsMaterial::getCompanyWechatId,adminUser.getCompanyWechatIds())
                 .eq(GoodsMaterial::getState, StateEnum.ON.getKey())
                 .like(StringUtils.isNotBlank(specsName),GoodsMaterial::getSpecsName, specsName)
-                .like(StringUtils.isNotBlank(goodsName),GoodsMaterial::getGoodsName,goodsName)
+                .like(StringUtils.isNotBlank(goodsName),GoodsMaterial::getGoodsName, goodsName)
                 .orderByDesc(GoodsMaterial::getCreateTime)
                 .page(new Page<>(pageNum, pageSize));
         List<GoodsMaterialItemVO> goodsMaterialItemVOS = BeanUtil.copyToList(page.getRecords(), GoodsMaterialItemVO.class);

mall-server-api/src/main/resources/mapper/CommonPageMapper.xml

@@ -116,46 +116,7 @@
         </if>
         ${ex.orderBy}
     </select>
-    <select id="pageV2Sec" resultType="com.gree.mall.manager.bean.goods.CustomSecSpecBeanVO">
-        select
-        ${ex.selected}
-        from
-        sec_kill_activity_spec a
-        ${ex.query}
-
-        <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            AND a.company_wechat_id IN
-            <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-
 
-        </if>
-        <if test="ex.orderBy == null or ex.orderBy ==''">
-            order by a.create_time desc
-        </if>
-        ${ex.orderBy}
-    </select>
-    <select id="pageV2Activity" resultType="com.gree.mall.manager.bean.goods.SecKillActivityStageBeanVO">
-        select
-        ${ex.selected}
-        from
-        sec_kill_activity a
-        ${ex.query}
-
-        <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            AND a.company_wechat_id IN
-            <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-
-
-        </if>
-        <if test="ex.orderBy == null or ex.orderBy ==''">
-            order by a.create_time desc
-        </if>
-        ${ex.orderBy}
-    </select>
     <select id="pageV2Group" resultType="com.gree.mall.manager.bean.goods.PromotionGroupListVO">
         select
         ${ex.selected}

mall-server-api/src/main/resources/mapper/CustomGoodsMapper.xml

@@ -6,10 +6,6 @@
         SELECT
         t1.*,
         t1.goods_name AS goodsName,
-        ifnull(t2.share_amount,0) AS shareAmount,
-        ifnull(t2.share_percent,0) AS sharePercent,
-        ifnull(t2.inner_share_amount,0) AS innerShareAmount,
-        ifnull(t2.inner_share_percent,0) AS innerSharePercent,
         <!--sum(if(t2.del=0 and t2.sold_num is NOT NULL,t2.sold_num,0)) AS soldNum,-->
         sum(if(t2.del=0 and t2.stock_num is NOT NULL,t2.stock_num,0)) AS stockNum,
         t3.`name` AS categoryName
@@ -35,7 +31,6 @@
             <choose>
                 <when test="flag == 'S'.toString()">AND t1.status = 1</when>
                 <when test="flag == 'W'.toString()">AND t1.status = 0</when>
-                <when test="flag == 'A'.toString()">AND t2.flag = 1</when>
                 <otherwise/>
             </choose>
         </if>
@@ -49,14 +44,7 @@
             AND
             t2.price BETWEEN #{startPrice} AND #{endPrice}
         </if>
-        <if test="startShare != null and endShare != null">
-            AND
-            t2.share_amount BETWEEN #{startShare} AND #{endShare}
-        </if>
-        <if test="isTrade != null and isTrade != ''">
-            AND
-            t1.is_trade = #{isTrade}
-        </if>
+
         <if test="categoryId != null and categoryId.size() != 0">
             AND
             t3.category_id in
@@ -85,8 +73,6 @@
     <select id="list" resultType="com.gree.mall.manager.bean.goods.GoodsSpecBean">
         SELECT t1.*,
                t1.goods_name                                                     AS goodsName,
-               ifnull(t2.share_amount, 0)                                        AS shareAmount,
-               ifnull(t2.share_percent, 0)                                       AS sharePercent,
                sum(IF(t2.del = 0 AND t2.sold_num IS NOT NULL, t2.sold_num, 0))   AS soldNum,
                sum(IF(t2.del = 0 AND t2.stock_num IS NOT NULL, t2.stock_num, 0)) AS stockNum
         FROM goods_template gt
@@ -131,7 +117,6 @@
         FROM goods t1
         left join goods_spec t2 on t1.goods_id = t2.goods_id
         WHERE t1.del = 0
-          AND t2.flag = 1
           and t2.del = 0
         <if test=' companyWechatIds != null and companyWechatIds.size > 0' >
             AND t1.company_wechat_id in
@@ -148,72 +133,4 @@
             where b.goods_id=#{goodsId}
     </select>
 
-    <update id="syncGoodsSpecInnerShareMsg" parameterType="java.lang.String">
-        update goods_spec
-        set inner_share_amount = share_amount , inner_share_percent = share_percent
-        where inner_share_amount is null and inner_share_amount is null and company_wechat_id = #{companyWechatId}
-    </update>
-
-
-
-    <select id="queryGoodsPackageList" resultType="com.gree.mall.manager.bean.goods.GoodsPackageList">
-          select
-            a.goods_id,
-            a.img_url,
-            a.goods_name,
-            a.status,
-            (select count(DISTINCT goods_id) from goods_package_pop where goods_package_id= a.goods_id) 'goodsNums',
-            a.package_min_amount,
-            a.package_min_share_amount,
-            use_coupon,
-            count(DISTINCT c.order_id) 'orderNums',
-            sum(c.pay_amount) 'orderPayAmount',
-            a.package_user_type,
-            a.company_name
-
-            from goods a
-            left join order_info c on c.promotion_package_goods_id=a.goods_id and c.order_status in ('DFH','YFH','OVER')
-            where a.goods_type='PACKAGE'
-        and a.del = 0
-        <if test='companyWechatIds != null and companyWechatIds.size > 0' >
-            AND a.company_wechat_id  in
-            <foreach collection="companyWechatIds" open="(" close=")" item="companyWechatId" separator=",">
-                #{companyWechatId}
-            </foreach>
-        </if>
-        <if test="keyword != null and keyword != ''">
-            AND(a.goods_id like CONCAT('%', #{keyword},'%') OR a.goods_name like CONCAT('%',#{keyword},'%'))
-        </if>
-        <if test="startPrice != null and endPrice != null">
-            AND
-            a.package_min_amount BETWEEN #{startPrice} AND #{endPrice}
-        </if>
-        <if test="startShare != null and endShare != null">
-            AND
-            a.package_min_share_amount BETWEEN #{startShare} AND #{endShare}
-        </if>
-        <if test="categoryId != null and categoryId.size() != 0">
-            AND
-            a.category_id in
-            <foreach item="item" index="index" collection="categoryId" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
-        <if test="status != null">
-            AND
-            a.status = #{status}
-        </if>
-        group by a.goods_id
-        <choose>
-            <when test="sortStr == null">
-                ORDER BY a.sort_num desc,a.create_time desc
-            </when>
-            <otherwise>
-                ORDER BY a.sort_num desc,${sortStr},a.create_time desc
-            </otherwise>
-        </choose>
-
-    </select>
-
-
 </mapper>

mall-server-api/src/main/resources/mapper/GoodsCheckMapper.xml

@@ -1,31 +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.gree.mall.manager.commonmapper.GoodsCheckMapper">
-
-    <select id="checkGoodsSec" resultType="java.lang.Integer">
-        SELECT count(DISTINCT ska.sec_kill_id)
-        from sec_kill_activity ska
-                 LEFT JOIN sec_kill_activity_spec skas on ska.sec_kill_id = skas.sec_kill_id
-                 left join goods gs on gs.goods_id = skas.goods_id
-        where gs.goods_id = #{goodsId}
-          and gs.del = 0
-          and gs.status = 1
-          and ska.end_time > now()
-
-    </select>
-
-
-    <select id="checkGoodsSecBatch" resultType="java.lang.String">
-        SELECT distinct gs.goods_id from sec_kill_activity ska LEFT JOIN sec_kill_activity_spec skas on
-        ska.sec_kill_id=skas.sec_kill_id
-        left join goods gs on gs.goods_id = skas.goods_id
-        where gs.goods_id in
-        <foreach item="item" index="index" collection="goodsIds" open="(" separator=","
-                 close=")">
-            #{item}
-        </foreach>
-        and gs.del = 0 and gs.status = 1
-        and ska.end_time>now()
-    </select>
-
-</mapper>