feat: 招商门户页面开发

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/seller/admin/AdminStoreAuditController.java

@@ -154,14 +154,12 @@ public class AdminStoreAuditController {
 
         //根据等级id获取等级名称
         StoreGrade storeGrade = storeGradeModel.getStoreGradeByGradeId(storeApply.getStoreGradeId());
-        if (storeGrade != null) {
-            vo.setStoreGradeName(storeGrade.getGradeName());
-        }
+        vo.setStoreGradeName(storeGrade != null ? storeGrade.getGradeName() : null);
 
         Store store = storeModel.getStoreByStoreId(storeApply.getStoreId());
-        if (store != null) {
-            vo.setOpenTime(store.getOpenTime());
-        }
+
+        vo.setOpenTime(store != null ? store.getOpenTime() : null);
+
 
         List<StoreBusinessVO> storeBusinessVOList = new ArrayList<>();
         StoreBusinessVO storeBusinessVO = new StoreBusinessVO();
@@ -249,12 +247,11 @@ public class AdminStoreAuditController {
 
             //根据等级id获取等级名称
             StoreGrade storeGrade = storeGradeModel.getStoreGradeByGradeId(storeApply.getStoreGradeId());
-            if (storeGrade != null) {
-                vo.setStoreGradeName(storeGrade.getGradeName());
-            }
+            vo.setStoreGradeName(storeGrade != null ? storeGrade.getGradeName() : null);
+
 
             Store store = storeModel.getStoreByStoreId(storeApply.getStoreId());
-            vo.setOpenTime(store.getOpenTime());
+            vo.setOpenTime(store != null ? store.getOpenTime() : null);
 
             List<StoreBusinessVO> storeBusinessVOList = new ArrayList<>();
             StoreBusinessVO storeBusinessVO = new StoreBusinessVO();
@@ -404,7 +401,7 @@ public class AdminStoreAuditController {
             @ApiImplicitParam(name = "openTime", value = "开店时长"),
     })
     @PostMapping("batchAudit")
-    public JsonResult<Object> batchAudit(HttpServletRequest request,@RequestBody StoreApplyAuditDTO storeApplyAuditDTO) {
+    public JsonResult<Object> batchAudit(HttpServletRequest request,StoreApplyAuditDTO storeApplyAuditDTO) {
         //参数校验
         String applyIds = storeApplyAuditDTO.getApplyIds();
         AssertUtil.notEmpty(applyIds, "绑定id不能为空");

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/system/admin/AdminPcDecoController.java

@@ -245,6 +245,7 @@ public class AdminPcDecoController extends BaseController {
         AssertUtil.notNull(tplPcMallDecoDb, "该装修页不存在，请新选择");
 
         TplPcMallDeco deco = new TplPcMallDeco();
+        deco.setWebSite(tplPcMallDecoDb.getWebSite());
         deco.setDecoType(tplPcMallDecoDb.getDecoType());
         deco.setDecoName("copy-" + tplPcMallDecoDb.getDecoName());
         deco.setData(tplPcMallDecoDb.getData());