no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitMPurchaseLogic.java

@@ -204,6 +204,7 @@ public class WebsitMPurchaseLogic {
     }
 
     private void validVendorGoods(WebsitMPurchaseBean bean, Map<String, WebsitVenderGoodsRelaVO> relaMap) {
+        BigDecimal totalAmount = BigDecimal.ZERO;
         for (int i = 0; i < bean.getItems().size(); i++) {
             WebsitMPurchaseItemBean itemBean = bean.getItems().get(i);
             String preStr = "第" + (i+1) + "行, ";
@@ -236,7 +237,7 @@ public class WebsitMPurchaseLogic {
                 itemBean.setParentCategoryName(relaGoods.getParentCategoryName());
                 itemBean.setGoodsCategoryId(relaGoods.getGoodsCategoryId());
                 itemBean.setGoodsCategoryName(relaGoods.getCategoryName());
-                bean.setTotalAmount(bean.getTotalAmount().add(itemBean.getApplyCostValue()));
+                totalAmount = totalAmount.add(itemBean.getApplyCostValue());
             } else if (bean.getFlag().equals(MaterialFlagEnum.SUBMIT.getKey())) {
                 // 检查进价范围值
                 if (Objects.nonNull(relaGoods.getCostRangeMini())
@@ -252,10 +253,11 @@ public class WebsitMPurchaseLogic {
                 itemBean.setInStockCost(itemBean.getCost());
                 itemBean.setInStockQty(itemBean.getRecQty().add(itemBean.getRecGiftQty()));
                 itemBean.setCostValue(itemBean.getRecQty().multiply(itemBean.getCost()).setScale(2, BigDecimal.ROUND_DOWN));
-                bean.setTotalAmount(bean.getTotalAmount().add(itemBean.getCostValue()));
+                totalAmount = totalAmount.add(itemBean.getCostValue());
             }
 
         }
+        bean.setTotalAmount(totalAmount);
     }
 
     private List<WebsitVenderGoodsRelaVO> queryVenderGoods(WebsitMPurchaseBean bean) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/vender/VenderGoodsLogic.java

@@ -180,6 +180,15 @@ public class VenderGoodsLogic {
 
     public IPage<WebsitVenderGoodsRelaVO> ralaPage(ZfireParamBean zfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
+        if (CollectionUtil.isEmpty(zfireParamBean.getParams())) {
+            zfireParamBean.setParams(new ArrayList<>());
+        }
+
+        if (adminUser.getIsVender()) {
+            QueryParamBean paramBean = new QueryParamBean();
+            paramBean.setParam("a.vender_id").setCompare("=").setValue(adminUser.getVenderId());
+            zfireParamBean.getParams().add(paramBean);
+        }
         FieldUtils.materialParam(zfireParamBean, WebsitVenderGoodsRelaVO.class, adminUser);
         return materialMapper.websitVenderGoodsRalaPage(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
     }