no message

mall-server-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitPartsConfigController.java

@@ -36,6 +36,13 @@ public class WebsitPartsConfigController {
         return ResponseHelper.success(page, new TypeReference<WebsitPartsConfigVO>() {});
     }
 
+    @PostMapping("/get/default")
+    @ApiOperation(value = "配件返还配置-获取默认数据")
+    public ResponseHelper<WebsitPartsConfigBean> getDefault() {
+        WebsitPartsConfigBean bean = websitPartsConfigLogic.getDefault();
+        return ResponseHelper.success(bean);
+    }
+
     @PostMapping("/detail")
     @ApiOperation("配件返还配置详情")
     public ResponseHelper<WebsitPartsConfigBean> detail(

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

@@ -1,6 +1,5 @@
 package com.gree.mall.manager.logic.material.manage;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
@@ -21,7 +20,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -39,28 +37,6 @@ public class WebsitPartsConfigLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         FieldUtils.materialParam(zfireParamBean, WebsitPartsConfigVO.class, adminUser);
         IPage<WebsitPartsConfigVO> page = materialMapper.websitPartsConfigPage(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean);
-        if (CollectionUtil.isEmpty(page.getRecords()) && adminUser.getType() != 2) {
-            page.setRecords(new ArrayList<>());
-            WebsitPartsRefundConfig refundConfig = websitPartsRefundConfigService.lambdaQuery()
-                    .eq(WebsitPartsRefundConfig::getCompanyWechatId, adminUser.getCompanyWechatId())
-                    .eq(WebsitPartsRefundConfig::getIsDefault, true)
-                    .one();
-            MaterialConfig materialConfig = materialConfigService.lambdaQuery()
-                    .eq(MaterialConfig::getCompanyWechatId, adminUser.getCompanyWechatId())
-                    .one();
-
-            WebsitPartsConfigVO vo = new WebsitPartsConfigVO();
-            vo.setId(refundConfig.getId());
-            vo.setCompanyWechatId(adminUser.getCompanyWechatId());
-            vo.setCompanyWechatName(adminUser.getCompanyName());
-            vo.setOldRefund(refundConfig.getOldRefund());
-            vo.setNewRefundInner(refundConfig.getNewRefundInner());
-            vo.setNewRefundOutside(refundConfig.getNewRefundOutside());
-            vo.setPriceRate1(materialConfig.getPriceRate1());
-            vo.setPriceRate2(materialConfig.getPriceRate2());
-            vo.setPriceRate3(materialConfig.getPriceRate3());
-            page.getRecords().add(vo);
-        }
         return page;
     }
 
@@ -180,4 +156,26 @@ public class WebsitPartsConfigLogic {
                 .eq(WebsitPartsRefundConfig::getIsDefault, false)
                 .remove();
     }
+
+    public WebsitPartsConfigBean getDefault() {
+        AdminUserCom adminUser = commonLogic.getAdminUser();
+        if (adminUser.getType() == 2) {
+            throw new RemoteServiceException("平台账号禁止操作");
+        }
+        WebsitPartsRefundConfig refundConfig = websitPartsRefundConfigService.lambdaQuery()
+                .eq(WebsitPartsRefundConfig::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .eq(WebsitPartsRefundConfig::getIsDefault, true)
+                .one();
+        MaterialConfig materialConfig = materialConfigService.lambdaQuery()
+                .eq(MaterialConfig::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .one();
+
+        WebsitPartsConfigBean bean = new WebsitPartsConfigBean();
+        BeanUtils.copyProperties(refundConfig, bean);
+        bean.setPriceRate1(materialConfig.getPriceRate1());
+        bean.setPriceRate2(materialConfig.getPriceRate2());
+        bean.setPriceRate3(materialConfig.getPriceRate3());
+
+        return bean;
+    }
 }