商品库增加接收参数

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

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.bean.listvo.goods;
 
 import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.IsEnum;
 import com.gree.mall.manager.enums.StatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -30,31 +29,24 @@ public class GoodsLibraryVO {
     private String goodsName;
     @ApiModelProperty("品牌")
     private String brandName;
-    @ApiModelProperty("是否虚拟商品")
-    private IsEnum isVr;
+//    @ApiModelProperty("是否虚拟商品")
+//    private IsEnum isVr;
     @ApiModelProperty("商品大类")
-    private String category1;
+    private String category1Name;
     @ApiModelProperty("商品小类")
-    private String category2;
+    private String category2Name;
     @ApiModelProperty("状态")
     private StatusEnum status;
 
     @ZfireField(tbName = "b")
+    @ApiModelProperty("规格名称")
+    private String name;
+
+    @ZfireField(tbName = "b")
     @ApiModelProperty("参考销售价格")
     private BigDecimal price;
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("参考分销金额")
-    private BigDecimal shareAmount;
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("参考佣金比例")
-    private BigDecimal sharePercent;
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("参考内部分销金额")
-    private BigDecimal innerShareAmount;
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("参考内部分销比例")
-    private BigDecimal innerSharePercent ;
 
+    @ZfireField(tbName = "b")
     @ApiModelProperty("更新时间")
     private Date updateTime;
 }

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

@@ -11,14 +11,8 @@ import com.gree.mall.manager.commonmapper.CommonMapper;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.helper.ResponseHelper;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.CommonFile;
-import com.gree.mall.manager.plus.entity.GoodsLibrary;
-import com.gree.mall.manager.plus.entity.GoodsLibraryDocumentsRela;
-import com.gree.mall.manager.plus.entity.GoodsLibrarySpec;
-import com.gree.mall.manager.plus.service.GoodsDocumentsService;
-import com.gree.mall.manager.plus.service.GoodsLibraryDocumentsRelaService;
-import com.gree.mall.manager.plus.service.GoodsLibraryService;
-import com.gree.mall.manager.plus.service.GoodsLibrarySpecService;
+import com.gree.mall.manager.plus.entity.*;
+import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.oss.OSSUtil;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
@@ -54,6 +48,7 @@ public class GoodsLibraryLogic {
     private final GoodsLibrarySpecService goodsLibrarySpecService;
     private final CommonMapper commonMapper;
     private final GoodsLibraryDocumentsRelaService goodsLibraryDocumentsRelaService;
+    private final BrandService brandService;
 
     /**
      * 商品库列表
@@ -73,12 +68,21 @@ public class GoodsLibraryLogic {
      */
     @Transactional
     public void save(GoodsLibraryBean goodsLibraryBean){
+        // 固定品牌值
+        final Brand brand = brandService.lambdaQuery()
+                .eq(Brand::getCompanyWechatId, "0")
+                .last("limit 1")
+                .one();
+        goodsLibraryBean.setBrandId(brand.getId())
+                .setBrandName(brand.getBrandName());
+
         goodsLibraryBean.insertOrUpdate();
 
         List<GoodsLibrarySpec> goodsLibrarySpecList = goodsLibraryBean.getGoodsLibrarySpecList();
         goodsLibrarySpecList.forEach(v -> v.setGoodsLibraryId(goodsLibraryBean.getGoodsLibraryId())
                 .setGoodsName(goodsLibraryBean.getGoodsName())
                 .setBrandName(goodsLibraryBean.getBrandName())
+                .setBrandId(goodsLibraryBean.getBrandId())
                 .setCategory1(goodsLibraryBean.getCategory1())
                 .setCategory2(goodsLibraryBean.getCategory2())
                 .setDescribeText(goodsLibraryBean.getDescribeText())

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

@@ -6,6 +6,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.goods.GoodsMaterialBean;
@@ -294,9 +295,11 @@ public class GoodsMaterialLogic {
      */
     public IPage<GoodsMaterialItemVO> queryGoodsMaterialItem(String specsName, String goodsName, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
-        Page page = goodsMaterialService.lambdaQuery()
-                .in(Objects.nonNull(adminUser.getAdminCompanyWechat()), GoodsMaterial::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId(), 0)
-                .eq(GoodsMaterial::getState, StateEnum.ON.getKey())
+        LambdaQueryChainWrapper<GoodsMaterial> lambdaQuery = goodsMaterialService.lambdaQuery();
+        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
+            lambdaQuery.in(GoodsMaterial::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId(), 0);
+        }
+        Page page = lambdaQuery.eq(GoodsMaterial::getState, StateEnum.ON.getKey())
                 .like(StringUtils.isNotBlank(specsName), GoodsMaterial::getSpecsName, specsName)
                 .like(StringUtils.isNotBlank(goodsName), GoodsMaterial::getGoodsName, goodsName)
                 .orderByDesc(GoodsMaterial::getCreateTime)

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

@@ -827,8 +827,10 @@
         FROM goods_library a
         join goods_library_spec b on a.goods_library_id = b.goods_library_id
         ${ex.query}
-        group by a.goods_library_id
-        ORDER BY a.update_time DESC
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.update_time DESC
+        </if>
+        ${ex.orderBy}
     </select>
 
     <select id="repairSettleBankAccountList"