|
@@ -12,15 +12,9 @@ import com.gree.mall.manager.commonmapper.CustomGoodsApplyMapper;
|
|
|
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.Goods;
|
|
|
-import com.gree.mall.manager.plus.entity.GoodsApply;
|
|
|
-import com.gree.mall.manager.plus.entity.GoodsApplyItem;
|
|
|
-import com.gree.mall.manager.plus.entity.GoodsSpec;
|
|
|
+import com.gree.mall.manager.plus.entity.*;
|
|
|
import com.gree.mall.manager.plus.mapper.GoodsApplyMapper;
|
|
|
-import com.gree.mall.manager.plus.service.GoodsApplyItemService;
|
|
|
-import com.gree.mall.manager.plus.service.GoodsApplyService;
|
|
|
-import com.gree.mall.manager.plus.service.GoodsService;
|
|
|
-import com.gree.mall.manager.plus.service.GoodsSpecService;
|
|
|
+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;
|
|
@@ -56,7 +50,11 @@ public class GoodsApplyLogic {
|
|
|
|
|
|
@Autowired
|
|
|
GoodsApplyItemService goodsApplyItemService;
|
|
|
-
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ AdminWebsitService adminWebsitService;
|
|
|
+
|
|
|
+
|
|
|
|
|
|
public IPage<GoodsApplyVO> applyList(Page page, ZfireParamBean zfireParam) {
|
|
|
//获取当前登录企业id
|
|
@@ -151,6 +149,12 @@ public class GoodsApplyLogic {
|
|
|
else
|
|
|
goodsApplyAddUp.setStatus(ExamineStatusEnum.WAIT.getKey());
|
|
|
|
|
|
+
|
|
|
+ AdminWebsit adminWebsit = adminWebsitService.getById(goodsApplyAddUp.getWebsitId());
|
|
|
+
|
|
|
+ goodsApplyAddUp.setCompanyName(adminWebsit.getCompanyName());
|
|
|
+ goodsApplyAddUp.setCompanyName(adminWebsit.getCompanyWechatId());
|
|
|
+ goodsApplyAddUp.setWebsitName(adminWebsit.getName());
|
|
|
goodsApplyAddUp.insert();
|
|
|
|
|
|
goodsApplyItemService.saveBatch(goodsApplyItemList);
|
|
@@ -161,6 +165,13 @@ public class GoodsApplyLogic {
|
|
|
goodsApplyService.removeById(goodsApplyAddUp.getGoodsApplyId());
|
|
|
goodsApplyItemService.lambdaUpdate().eq(GoodsApplyItem::getGoodsSpecId,goodsApplyAddUp.getGoodsApplyId()).remove();
|
|
|
|
|
|
+
|
|
|
+ AdminWebsit adminWebsit = adminWebsitService.getById(goodsApplyAddUp.getWebsitId());
|
|
|
+
|
|
|
+ goodsApplyAddUp.setCompanyName(adminWebsit.getCompanyName());
|
|
|
+ goodsApplyAddUp.setCompanyName(adminWebsit.getCompanyWechatId());
|
|
|
+ goodsApplyAddUp.setWebsitName(adminWebsit.getName());
|
|
|
+
|
|
|
goodsApplyAddUp.insert();
|
|
|
|
|
|
List<GoodsSpec> goodsSpecs = goodsSpecService.lambdaQuery().eq(GoodsSpec::getGoodsId, goodsApplyAddUp.getGoodsId())
|