Browse Source

no message

FengChaoYu 1 week ago
parent
commit
64e6170205

+ 1 - 6
src/main/java/com/gree/mall/manager/bean/goods/GoodsApplyVO.java

@@ -1,14 +1,9 @@
 package com.gree.mall.manager.bean.goods;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
-import com.gree.mall.manager.enums.GoodsStatusEnum;
-import com.gree.mall.manager.plus.entity.Goods;
-import com.gree.mall.manager.plus.entity.GoodsApply;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -57,7 +52,7 @@ public class GoodsApplyVO     {
     private String websitName;
     @ZfireField(tbName = "a",hide = true)
     @ApiModelProperty(value = "上级商户")
-    private String companyWechatId;
+    private String companyId;
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "上级商户")
     private String companyName;

+ 2 - 2
src/main/java/com/gree/mall/manager/logic/admin/AdminCompanyWechatTemplateLogic.java

@@ -84,7 +84,7 @@ public class AdminCompanyWechatTemplateLogic {
 
         //清除旧模板
         adminCompanyWechatTemplateService.lambdaUpdate()
-                .eq(AdminCompanyWechatTemplate::getCompanyWechatId, companyWechatId)
+                .eq(AdminCompanyWechatTemplate::getCompanyId, companyWechatId)
                 .remove();
 
         List<AdminCompanyWechatTemplate> templateList = new ArrayList<>();
@@ -94,7 +94,7 @@ public class AdminCompanyWechatTemplateLogic {
             AdminCompanyWechatTemplate data = new AdminCompanyWechatTemplate();
             templateList.add(data);
 
-            data.setCompanyWechatId(companyWechatId);
+            data.setCompanyId(companyWechatId);
             data.setCompanyName(companyName);
             data.setTemplateType(i);
 

+ 1 - 4
src/main/java/com/gree/mall/manager/logic/goods/GoodsApplyLogic.java

@@ -5,7 +5,6 @@ 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.github.binarywang.wxpay.bean.applyment.enums.ApplymentStateEnum;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.goods.*;
 import com.gree.mall.manager.commonmapper.CustomGoodsApplyMapper;
@@ -13,13 +12,11 @@ import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.*;
-import com.gree.mall.manager.plus.mapper.GoodsApplyMapper;
 import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -62,7 +59,7 @@ public class GoodsApplyLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         //1.组装查询条件
-        FieldUtils.supplyParam(zfireParam, GoodsApplyVO.class,adminUser);
+        FieldUtils.supplyParam(zfireParam, GoodsApplyVO.class, adminUser);
 
         IPage<GoodsApplyVO> goodsVOIPage = customGoodsApplyMapper.goodsList(page, zfireParam);
         return goodsVOIPage;