平台管理端 ---商品管理数据结构调整

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/dto/StoreBusinessVO.java

@@ -0,0 +1,22 @@
+package com.slodon.b2b2c.seller.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StoreBusinessVO {
+    @ApiModelProperty("站点")
+    private String webSite;
+
+    @ApiModelProperty("店铺名称")
+    private String storeName;
+
+    @ApiModelProperty("开店时长")
+    private Integer openTime;
+
+    @ApiModelProperty("店铺等级id")
+    private Integer storeGradeId;
+
+    @ApiModelProperty("店铺等级名称")
+    private String storeGradeName;
+}

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/seller/dto/StoreUpdateDTO.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author lxk
@@ -49,11 +50,8 @@ public class StoreUpdateDTO implements Serializable {
     @ApiModelProperty("开店时长")
     private Integer openTime;
 
-    @ApiModelProperty("国内店铺等级id")
-    private Integer storeGradeIdCn;
-
-    @ApiModelProperty("国内开店时长")
-    private Integer openTimeCn;
+    @ApiModelProperty("店铺经营信息")
+    private List<StoreBusinessVO> storeBusinessVOList;
 
     private String paymentName;
 

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

@@ -15,6 +15,7 @@ import com.slodon.b2b2c.goods.pojo.GoodsCategory;
 import com.slodon.b2b2c.model.goods.GoodsCategoryModel;
 import com.slodon.b2b2c.model.seller.*;
 import com.slodon.b2b2c.model.system.SettingModel;
+import com.slodon.b2b2c.seller.dto.StoreBusinessVO;
 import com.slodon.b2b2c.seller.example.*;
 import com.slodon.b2b2c.seller.pojo.*;
 import com.slodon.b2b2c.system.pojo.Admin;
@@ -32,7 +33,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -180,33 +180,49 @@ public class AdminStoreAuditController {
             vo.setOpenTime(store.getOpenTime());
         }
 
+        List<StoreBusinessVO> storeBusinessVOList = new ArrayList<>();
+        StoreBusinessVO storeBusinessVO = new StoreBusinessVO();
+        storeBusinessVO.setWebSite(WebSiteConstant.MEMBER_OVERSEA);
+        storeBusinessVO.setStoreName(vo.getStoreName());
+        storeBusinessVO.setOpenTime(vo.getOpenTime());
+        storeBusinessVO.setStoreGradeId(vo.getStoreGradeId());
+        storeBusinessVO.setStoreGradeName(vo.getStoreGradeName());
+        storeBusinessVOList.add(storeBusinessVO);
 
-        StoreSiteInfoExample storeSiteInfoExample =new StoreSiteInfoExample();
-        storeSiteInfoExample.setStoreId(storeApply.getStoreId());
-        storeSiteInfoExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
-        StoreSiteInfo storeSiteInfo = storeSiteInfoModel.getStoreSiteInfo(storeSiteInfoExample);
-        if (storeSiteInfo != null) {
-            vo.setStoreGradeIdCn(storeSiteInfo.getStoreGradeId());
-            vo.setStoreGradeNameCn(storeSiteInfo.getStoreGradeName());
-            vo.setOpenTimeCn(storeSiteInfo.getOpenTime());
-        }
+        StoreNameExample storeNameExample = new StoreNameExample();
+        storeNameExample.setStoreId(storeApply.getStoreId());
+        storeNameExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+        StoreName storeName = storeNameModel.getStoreNameByExample(storeNameExample);
+
+        Store storeCn = storeSiteInfoModel.getStoreByStoreIdAndWebSite(storeApply.getStoreId(), WebSiteConstant.MEMBER_DISTRIBUTOR);
+        storeBusinessVO = new StoreBusinessVO();
+        storeBusinessVO.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+        storeBusinessVO.setStoreName(storeName != null ? storeName.getStoreName() : "");
+        storeBusinessVO.setOpenTime(storeCn != null ? storeCn.getOpenTime() : null);
+        storeBusinessVO.setStoreGradeId(storeCn != null ? storeCn.getStoreGradeId() : null);
+        storeBusinessVO.setStoreGradeName(storeCn != null ? storeCn.getStoreGradeName() : null);
+        storeBusinessVOList.add(storeBusinessVO);
+
+        vo.setStoreBusinessVOList(storeBusinessVOList);
 
 
         List<Setting> webSiteList = settingModel.getSiteSetting();
+        List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
         for (Setting setting : webSiteList) {
-            bulidStoreGoodsCateVOList(vo, storeApply, webSiteList, setting.getValue());
+            bulidStoreGoodsCateVOList(storeGoodsCateVOList, storeApply, webSiteList, setting.getValue());
         }
+        vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
         return SldResponse.success(vo, logMsg);
     }
 
     /**
      * 构建不同站点经营类目信息
-     * @param vo
+     * @param storeGoodsCateVOList
      * @param storeApply
      * @param webSiteList
      * @param webSite
      */
-    private void bulidStoreGoodsCateVOList(StoreApplyDetailVO vo, StoreApply storeApply, List<Setting> webSiteList, String webSite) {
+    private void bulidStoreGoodsCateVOList(List<StoreGoodsCateVO> storeGoodsCateVOList, StoreApply storeApply, List<Setting> webSiteList, String webSite) {
 
         //获取经营类目信息
         StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
@@ -217,7 +233,6 @@ public class AdminStoreAuditController {
         GoodsCategoryExample goodsCategoryExample = new GoodsCategoryExample();
         List<GoodsCategory> goodsCategoryList = goodsCategoryModel.getGoodsCategoryList(goodsCategoryExample, null);
 
-        List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
             storeBindCategoryList.forEach(storeBindCategory -> {
                 StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
@@ -227,12 +242,6 @@ public class AdminStoreAuditController {
                 storeGoodsCateVO.setGoodsCateName3(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId3())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
                 storeGoodsCateVOList.add(storeGoodsCateVO);
             });
-            if(WebSiteConstant.MEMBER_OVERSEA.equals(webSite)){
-                vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
-            }else {
-                vo.setStoreGoodsCateCnVOList(storeGoodsCateVOList);
-            }
-
         }
     }
 
@@ -264,20 +273,37 @@ public class AdminStoreAuditController {
             Store store = storeModel.getStoreByStoreId(storeApply.getStoreId());
             vo.setOpenTime(store.getOpenTime());
 
-            StoreSiteInfoExample storeSiteInfoExample =new StoreSiteInfoExample();
-            storeSiteInfoExample.setStoreId(storeApply.getStoreId());
-            storeSiteInfoExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
-            StoreSiteInfo storeSiteInfo = storeSiteInfoModel.getStoreSiteInfo(storeSiteInfoExample);
-            if (storeSiteInfo != null) {
-                vo.setStoreGradeIdCn(storeSiteInfo.getStoreGradeId());
-                vo.setStoreGradeNameCn(storeSiteInfo.getStoreGradeName());
-                vo.setOpenTimeCn(storeSiteInfo.getOpenTime());
-            }
+            List<StoreBusinessVO> storeBusinessVOList = new ArrayList<>();
+            StoreBusinessVO storeBusinessVO = new StoreBusinessVO();
+            storeBusinessVO.setWebSite(WebSiteConstant.MEMBER_OVERSEA);
+            storeBusinessVO.setStoreName(vo.getStoreName());
+            storeBusinessVO.setOpenTime(vo.getOpenTime());
+            storeBusinessVO.setStoreGradeId(vo.getStoreGradeId());
+            storeBusinessVO.setStoreGradeName(vo.getStoreGradeName());
+            storeBusinessVOList.add(storeBusinessVO);
+
+            StoreNameExample storeNameExample = new StoreNameExample();
+            storeNameExample.setStoreId(storeApply.getStoreId());
+            storeNameExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+            StoreName storeName = storeNameModel.getStoreNameByExample(storeNameExample);
+
+            Store storeCn = storeSiteInfoModel.getStoreByStoreIdAndWebSite(storeApply.getStoreId(), WebSiteConstant.MEMBER_DISTRIBUTOR);
+            storeBusinessVO = new StoreBusinessVO();
+            storeBusinessVO.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+            storeBusinessVO.setStoreName(storeName != null ? storeName.getStoreName() : "");
+            storeBusinessVO.setOpenTime(storeCn != null ? storeCn.getOpenTime() : null);
+            storeBusinessVO.setStoreGradeId(storeCn != null ? storeCn.getStoreGradeId() : null);
+            storeBusinessVO.setStoreGradeName(storeCn != null ? storeCn.getStoreGradeName() : null);
+            storeBusinessVOList.add(storeBusinessVO);
+
+            vo.setStoreBusinessVOList(storeBusinessVOList);
 
             List<Setting> webSiteList = settingModel.getSiteSetting();
+            List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
             for (Setting setting : webSiteList) {
-                bulidStoreGoodsCateVOList(vo, storeApply, webSiteList, setting.getValue());
+                bulidStoreGoodsCateVOList(storeGoodsCateVOList, storeApply, webSiteList, setting.getValue());
             }
+            vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
         }
 
         return SldResponse.success(vos);
@@ -299,22 +325,15 @@ public class AdminStoreAuditController {
     })
     @PostMapping("audit")
     public JsonResult<Object> audit(HttpServletRequest request,
-                                    @RequestParam("applyId") Integer applyId,
-                                    @RequestParam("isPass") Boolean isPass,
-                                    @RequestParam(value = "refuseReason", required = false) String refuseReason,
-                                    @RequestParam(value = "remark", required = false) String remark,
-                                    @RequestParam(value = "scalingBindIds", required = false) String scalingBindIds,
-                                    @RequestParam(value = "storeGradeId", required = false) Integer storeGradeId,
-                                    @RequestParam(value = "storeGradeIdCn", required = false) Integer storeGradeIdCn,
-                                    @RequestParam(value = "openTime", required = false) Integer openTime,
-                                    @RequestParam(value = "openTimeCn", required = false) Integer openTimeCn) {
+                                    @RequestBody StoreApplyAuditDTO storeApplyAuditDTO)
+                                    {
 
         Admin admin = UserUtil.getUser(request, Admin.class);
 
-        AssertUtil.isTrue(!isPass && StringUtils.isEmpty(refuseReason), "请填写审核拒绝原因");
+        AssertUtil.isTrue(!storeApplyAuditDTO.getIsPass() && StringUtils.isEmpty(storeApplyAuditDTO.getRefuseReason()), "请填写审核拒绝原因");
 //        AssertUtil.isTrue(isPass && StringUtils.isEmpty(scalingBindIds), "请填写分佣比例");
 
-        StoreApply storeApply = storeApplyModel.audit(applyId, isPass, refuseReason, remark, scalingBindIds, admin);
+        StoreApply storeApply = storeApplyModel.audit(storeApplyAuditDTO.getApplyId(), storeApplyAuditDTO.getIsPass(), storeApplyAuditDTO.getRefuseReason(), storeApplyAuditDTO.getRemark(), storeApplyAuditDTO.getScalingBindIds(), admin);
 
 //        //根据gradeId查询store_grade表
 //        StoreGrade storeGrade = storeGradeModel.getStoreGradeByGradeId(storeApply.getStoreGradeId());
@@ -347,21 +366,36 @@ public class AdminStoreAuditController {
 //            }
 //            vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
 //        }
-        if (isPass) {
-            // 店铺审核增加开店时长
-            if (!StringUtil.isNullOrZero(openTime) && !StringUtil.isNullOrZero(openTimeCn)) {
-                storeApply.setApplyYear(openTime);
-                storeApply.setApplyYearCn(openTimeCn);
-            }else{
-                throw new MallException("请选择开店时长");
+        if (storeApplyAuditDTO.getIsPass()) {
+            if (CollectionUtils.isEmpty(storeApplyAuditDTO.getStoreBusinessVOList())){
+                throw new MallException("请选择经营信息");
             }
-            if (!StringUtil.isNullOrZero(storeGradeId) && !StringUtil.isNullOrZero(storeGradeIdCn)){
-                storeApply.setStoreGradeId(storeGradeId);
-                storeApply.setStoreGradeIdCn(storeGradeIdCn);
-            }else{
-                throw new MallException("请选择店铺等级");
+            // 扩展站点可重新设计
+            for (StoreBusinessVO storeBusinessVO : storeApplyAuditDTO.getStoreBusinessVOList()){
+                if(WebSiteConstant.MEMBER_OVERSEA.equals(storeBusinessVO.getWebSite())){
+                    if (!StringUtil.isNullOrZero(storeBusinessVO.getOpenTime())){
+                        storeApply.setApplyYear(storeBusinessVO.getOpenTime());
+                    }else {
+                        throw new MallException("请选择开店时长");
+                    }
+                    if (!StringUtil.isNullOrZero(storeBusinessVO.getStoreGradeId())){
+                        storeApply.setStoreGradeId(storeBusinessVO.getStoreGradeId());
+                    }else {
+                        throw new MallException("请选择店铺等级");
+                    }
+                }else if (WebSiteConstant.MEMBER_DISTRIBUTOR.equals(storeBusinessVO.getWebSite())) {
+                    if (!StringUtil.isNullOrZero(storeBusinessVO.getOpenTime())){
+                        storeApply.setApplyYearCn(storeBusinessVO.getOpenTime());
+                    }else {
+                        throw new MallException("请选择开店时长");
+                    }
+                    if (!StringUtil.isNullOrZero(storeBusinessVO.getStoreGradeId())){
+                        storeApply.setStoreGradeIdCn(storeBusinessVO.getStoreGradeId());
+                    }else {
+                        throw new MallException("请选择店铺等级");
+                    }
+                }
             }
-
             //todo 因业务需要暂不用此功能
 //            if (storeApply.getPayAmount().compareTo(BigDecimal.ZERO) == 0) {
             storeModel.openStore(storeApply);
@@ -385,18 +419,11 @@ public class AdminStoreAuditController {
             @ApiImplicitParam(name = "remark", value = "备注，拒绝时选填"),
             @ApiImplicitParam(name = "scalingBindIds", value = "分佣比例，审核通过时必填,例：bindId1-scaling1,bindId2-scaling2,..."),
             @ApiImplicitParam(name = "openTime", value = "开店时长"),
-            @ApiImplicitParam(name = "openTimeCn", value = "国内店铺开店时长"),
     })
     @PostMapping("batchAudit")
-    public JsonResult<Object> batchAudit(HttpServletRequest request,
-                                         @RequestParam("applyIds") String applyIds,
-                                         @RequestParam("isPass") Boolean isPass,
-                                         @RequestParam(value = "refuseReason", required = false) String refuseReason,
-                                         @RequestParam(value = "remark", required = false) String remark,
-                                         @RequestParam(value = "scalingBindIds", required = false) String scalingBindIds,
-                                         @RequestParam(value = "openTime", required = false) Integer openTime,
-                                         @RequestParam(value = "openTimeCn", required = false) Integer openTimeCn) {
+    public JsonResult<Object> batchAudit(HttpServletRequest request,@RequestBody StoreApplyAuditDTO storeApplyAuditDTO) {
         //参数校验
+        String applyIds = storeApplyAuditDTO.getApplyIds();
         AssertUtil.notEmpty(applyIds, "绑定id不能为空");
         AssertUtil.notFormatFrontIds(applyIds, "applyIds格式错误,请重试");
         Admin admin = UserUtil.getUser(request, Admin.class);
@@ -407,6 +434,11 @@ public class AdminStoreAuditController {
         int total = 0;
         RegisterPayVO vo = null;
         ApplyRefuseVO applyRefuseVO = null;
+        Boolean isPass = storeApplyAuditDTO.getIsPass();
+        String refuseReason = storeApplyAuditDTO.getRefuseReason();
+        String remark = storeApplyAuditDTO.getRemark();
+        String scalingBindIds = storeApplyAuditDTO.getScalingBindIds();
+        Integer openTime = storeApplyAuditDTO.getOpenTime();
         for (Integer applyId : array) {
 
             AssertUtil.isTrue(!isPass && StringUtils.isEmpty(refuseReason), "请填写审核拒绝原因");
@@ -448,9 +480,9 @@ public class AdminStoreAuditController {
 
             if (isPass) {
                 // 店铺审核增加开店时长
-                if (!StringUtil.isNullOrZero(openTime) && !StringUtil.isNullOrZero(openTimeCn)) {
+                if (!StringUtil.isNullOrZero(openTime)) {
                     storeApply.setApplyYear(openTime);
-                    storeApply.setApplyYearCn(openTimeCn);
+                    storeApply.setApplyYearCn(openTime);
                 }else{
                     throw new MallException("请选择开店时长");
                 }

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

@@ -25,6 +25,7 @@ import com.slodon.b2b2c.seller.example.*;
 import com.slodon.b2b2c.seller.pojo.*;
 import com.slodon.b2b2c.system.pojo.Admin;
 import com.slodon.b2b2c.system.pojo.Setting;
+import com.slodon.b2b2c.seller.dto.StoreBusinessVO;
 import com.slodon.b2b2c.vo.seller.StoreDetailVO;
 import com.slodon.b2b2c.vo.seller.StoreGoodsCateVO;
 import com.slodon.b2b2c.vo.seller.StoreVO;
@@ -171,16 +172,29 @@ public class AdminStoreController extends BaseController {
         }
         StoreDetailVO vo = new StoreDetailVO(store, storeCertificate);
 
+        List<StoreBusinessVO> storeBusinessVOList = new ArrayList<>();
+        StoreBusinessVO storeBusinessVO = new StoreBusinessVO();
+        storeBusinessVO.setWebSite(WebSiteConstant.MEMBER_OVERSEA);
+        storeBusinessVO.setStoreName(vo.getStoreName());
+        storeBusinessVO.setOpenTime(vo.getOpenTime());
+        storeBusinessVO.setStoreGradeId(vo.getStoreGradeId());
+        storeBusinessVO.setStoreGradeName(vo.getStoreGradeName());
+        storeBusinessVOList.add(storeBusinessVO);
+
         StoreNameExample storeNameExample = new StoreNameExample();
         storeNameExample.setStoreId(storeId);
         storeNameExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
         StoreName storeName = storeNameModel.getStoreNameByExample(storeNameExample);
-        vo.setStoreNameCn(storeName.getStoreName());
-
         Store storeCn = storeSiteInfoModel.getStoreByStoreIdAndWebSite(storeId, WebSiteConstant.MEMBER_DISTRIBUTOR);
-        vo.setStoreGradeId(storeCn.getStoreGradeId());
-        vo.setStoreGradeName(storeCn.getStoreGradeName());
-        vo.setOpenTimeCn(storeCn.getOpenTime());
+        storeBusinessVO = new StoreBusinessVO();
+        storeBusinessVO.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+        storeBusinessVO.setStoreName(storeName != null ? storeName.getStoreName() : "");
+        storeBusinessVO.setOpenTime(storeCn != null ? storeCn.getOpenTime() : null);
+        storeBusinessVO.setStoreGradeId(storeCn != null ? storeCn.getStoreGradeId() : null);
+        storeBusinessVO.setStoreGradeName(storeCn != null ? storeCn.getStoreGradeName() : null);
+        storeBusinessVOList.add(storeBusinessVO);
+
+        vo.setStoreBusinessVOList(storeBusinessVOList);
 
         //获取应付金额
         vo.setPayAmount(storeApply.getPayAmount());
@@ -191,9 +205,11 @@ public class AdminStoreController extends BaseController {
 
         List<Setting> webSiteList = settingModel.getSiteSetting();
 
-        for (Setting setting : webSiteList){
-            bulidStoreGoodsCateVOList(vo,storeApply,webSiteList,setting.getValue());
+        List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
+        for (Setting setting : webSiteList) {
+            bulidStoreGoodsCateVOList(storeGoodsCateVOList, storeApply, webSiteList, setting.getValue());
         }
+        vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
 
         //获取结算周期
         if (!StringUtils.isEmpty(store.getBillType()) && !StringUtils.isEmpty(store.getBillDay())) {
@@ -242,7 +258,7 @@ public class AdminStoreController extends BaseController {
         return SldResponse.success(vo);
     }
 
-    private void bulidStoreGoodsCateVOList(StoreDetailVO vo,StoreApply storeApply, List<Setting> webSiteList, String webSite) {
+    private void bulidStoreGoodsCateVOList(List<StoreGoodsCateVO> storeGoodsCateVOList,StoreApply storeApply, List<Setting> webSiteList, String webSite) {
 
         //获取经营类目信息
         StoreBindCategoryExample storeBindCategoryExample = new StoreBindCategoryExample();
@@ -255,7 +271,6 @@ public class AdminStoreController extends BaseController {
         GoodsCategoryExample goodsCategoryExample = new GoodsCategoryExample();
         List<GoodsCategory> goodsCategoryList = goodsCategoryModel.getGoodsCategoryList(goodsCategoryExample, null);
 
-        List<StoreGoodsCateVO> storeGoodsCateVOList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(storeBindCategoryList)) {
             storeBindCategoryList.forEach(storeBindCategory -> {
                 StoreGoodsCateVO storeGoodsCateVO = new StoreGoodsCateVO(storeBindCategory);
@@ -265,19 +280,13 @@ public class AdminStoreController extends BaseController {
                 storeGoodsCateVO.setGoodsCateName3(goodsCategoryList.stream().filter(goodsCategory -> goodsCategory.getCategoryId().equals(storeBindCategory.getGoodsCategoryId3())).findFirst().map(GoodsCategory::getCategoryName).orElse(""));
                 storeGoodsCateVOList.add(storeGoodsCateVO);
             });
-            if(WebSiteConstant.MEMBER_OVERSEA.equals(webSite)){
-                vo.setStoreGoodsCateVOList(storeGoodsCateVOList);
-            }else {
-                vo.setStoreGoodsCateCnVOList(storeGoodsCateVOList);
-            }
-
         }
     }
 
     @ApiOperation("编辑店铺详情信息")
     @OperationLogger(option = "编辑店铺详情信息")
     @PostMapping("edit")
-    public JsonResult<Object> editStore(HttpServletRequest request, StoreUpdateDTO storeUpdateDTO) {
+    public JsonResult<Object> editStore(HttpServletRequest request, @RequestBody StoreUpdateDTO storeUpdateDTO) {
         String logMsg = "店铺id" + storeUpdateDTO.getStoreId();
         storeModel.editStoreInfo(request,storeUpdateDTO);
         return SldResponse.success("编辑成功", logMsg);

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

@@ -0,0 +1,27 @@
+package com.slodon.b2b2c.controller.seller.admin;
+
+import com.slodon.b2b2c.seller.dto.StoreBusinessVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.List;
+
+@Data
+public class StoreApplyAuditDTO {
+    @ApiModelProperty("申请id")
+    private Integer applyId;
+    @ApiModelProperty("申请集合")
+    private String applyIds;
+    @ApiModelProperty("是否通过[true==通过,false==驳回]")
+    private Boolean isPass;
+    @ApiModelProperty("审核原因，驳回时必填")
+    private String refuseReason;
+    @ApiModelProperty("备注，拒绝时选填")
+    private String remark;
+    @ApiModelProperty("分佣比例，审核通过时必填,例：bindId1-scaling1,bindId2-scaling2,...")
+    private String scalingBindIds;
+    @ApiModelProperty("开店时长")
+    private Integer openTime;
+    @ApiModelProperty("经营信息")
+    private List<StoreBusinessVO> storeBusinessVOList;
+
+}

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/seller/StoreModel.java

@@ -778,37 +778,40 @@ public class StoreModel {
             throw new MallException("更新店铺表失败,请重试");
         }
 
-        //修改store_site_info表
-        StoreSiteInfo storeSiteInfoUpdate = new StoreSiteInfo() ;
-        if (!StringUtils.isEmpty(storeUpdateDTO.getStoreGradeIdCn())) {
-            //店铺等级id
-            storeSiteInfoUpdate.setStoreGradeId(storeUpdateDTO.getStoreGradeIdCn());
-            //根据storeGradeId获取等级名称
-            StoreGrade storeGrade = storeGradeReadMapper.getByPrimaryKey(storeUpdateDTO.getStoreGradeId());
-            storeSiteInfoUpdate.setStoreGradeName(storeGrade.getGradeName());
-        }
-
-        if (!StringUtil.isNullOrZero(storeUpdateDTO.getOpenTimeCn())) {
-            //开店时长
-            storeSiteInfoUpdate.setOpenTime(storeUpdateDTO.getOpenTimeCn());
-            //店铺到期时间
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(storeDB.getCreateTime());
-            calendar.add(Calendar.YEAR, storeUpdateDTO.getOpenTimeCn());
-            storeSiteInfoUpdate.setStoreExpireTime(calendar.getTime());
-        }
-        Admin admin = UserUtil.getUser(request, Admin.class);
-        storeSiteInfoUpdate.setUpdateId(admin.getAdminId().longValue());
-        storeSiteInfoUpdate.setUpdateTime(new Date());
-        StoreSiteInfoExample storeSiteInfoExample = new StoreSiteInfoExample();
-        storeSiteInfoExample.setStoreId(storeUpdateDTO.getStoreId());
-        storeSiteInfoExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
-        count = storeSiteInfoWriteMapper.updateByExampleSelective(storeSiteInfoUpdate, storeSiteInfoExample);
-        if (count == 0) {
-            log.error("根据storeId：" + storeSiteInfoUpdate.getStoreId() + "更新店铺表国内站失败");
-            throw new MallException("更新店铺表国内站失败,请重试");
+        if (!CollectionUtils.isEmpty(storeUpdateDTO.getStoreBusinessVOList())) {
+            for (StoreBusinessVO storeBusinessVO : storeUpdateDTO.getStoreBusinessVOList()) {
+                if (!WebSiteConstant.MEMBER_OVERSEA.equals(storeBusinessVO.getWebSite())) {
+                    //修改store_site_info表
+                    StoreSiteInfo storeSiteInfoUpdate = new StoreSiteInfo();
+                    //店铺等级id
+                    storeSiteInfoUpdate.setStoreGradeId(storeBusinessVO.getStoreGradeId());
+                    //根据storeGradeId获取等级名称
+                    StoreGrade storeGrade = storeGradeReadMapper.getByPrimaryKey(storeUpdateDTO.getStoreGradeId());
+                    storeSiteInfoUpdate.setStoreGradeName(storeGrade.getGradeName());
+
+
+                    //开店时长
+                    storeSiteInfoUpdate.setOpenTime(storeBusinessVO.getOpenTime());
+                    //店铺到期时间
+                    Calendar calendar = Calendar.getInstance();
+                    calendar.setTime(storeDB.getCreateTime());
+                    calendar.add(Calendar.YEAR, storeBusinessVO.getOpenTime());
+                    storeSiteInfoUpdate.setStoreExpireTime(calendar.getTime());
+
+                    Admin admin = UserUtil.getUser(request, Admin.class);
+                    storeSiteInfoUpdate.setUpdateId(admin.getAdminId().longValue());
+                    storeSiteInfoUpdate.setUpdateTime(new Date());
+                    StoreSiteInfoExample storeSiteInfoExample = new StoreSiteInfoExample();
+                    storeSiteInfoExample.setStoreId(storeUpdateDTO.getStoreId());
+                    storeSiteInfoExample.setWebSite(WebSiteConstant.MEMBER_DISTRIBUTOR);
+                    count = storeSiteInfoWriteMapper.updateByExampleSelective(storeSiteInfoUpdate, storeSiteInfoExample);
+                    if (count == 0) {
+                        log.error("根据storeId：" + storeSiteInfoUpdate.getStoreId() + "更新店铺表国内站失败");
+                        throw new MallException("更新店铺表国内站失败,请重试");
+                    }
+                }
+            }
         }
-
         //修改store_apply表
         StoreApply storeApplyUpdate = new StoreApply();
         boolean isUpdate = false;

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/seller/StoreNameModel.java

@@ -8,6 +8,7 @@ import com.slodon.b2b2c.dao.write.seller.StoreNameWriteMapper;
 import com.slodon.b2b2c.seller.example.StoreNameExample;
 import com.slodon.b2b2c.seller.pojo.StoreName;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -34,7 +35,8 @@ public class StoreNameModel {
         return storeNameList;
     }
 
-    public StoreName getStoreNameByExample(StoreNameExample storeNameExample) {
-        return storeNameReadMapper.listByExample(storeNameExample).get(0);
+    public StoreName getStoreNameByExample(StoreNameExample example) {
+        List<StoreName> storeNameList = storeNameReadMapper.listByExample(example);
+        return CollectionUtils.isEmpty(storeNameList) ? null : storeNameList.get(0);
     }
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/model/seller/StoreSiteInfoModel.java

@@ -40,11 +40,8 @@ public class StoreSiteInfoModel {
     }
 
     public StoreSiteInfo getStoreSiteInfo(StoreSiteInfoExample example) {
-        List<StoreSiteInfo> storeSiteInfoList =storeSiteInfoReadMapper.listByExample( example);
-        if (CollectionUtils.isEmpty(storeSiteInfoList)) {
-            return null;
-        }
-        return storeSiteInfoReadMapper.listByExample(example).get(0);
+        List<StoreSiteInfo> storeSiteInfoList = storeSiteInfoReadMapper.listByExample(example);
+        return CollectionUtils.isEmpty(storeSiteInfoList) ? null : storeSiteInfoList.get(0);
     }
 
     public List<StoreSiteInfo> getStoreSiteInfoList(StoreSiteInfoExample example, PagerInfo pager) {

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/seller/StoreApplyDetailVO.java

@@ -4,6 +4,7 @@ import com.slodon.b2b2c.core.constant.StoreConst;
 import com.slodon.b2b2c.core.i18n.Language;
 import com.slodon.b2b2c.core.util.CommonUtil;
 import com.slodon.b2b2c.core.util.FileUrlUtil;
+import com.slodon.b2b2c.seller.dto.StoreBusinessVO;
 import com.slodon.b2b2c.seller.pojo.StoreApply;
 import com.slodon.b2b2c.seller.pojo.StoreCertificate;
 import com.slodon.b2b2c.seller.pojo.StoreName;
@@ -24,9 +25,6 @@ public class StoreApplyDetailVO {
     @ApiModelProperty("店铺名称")
     private String storeName;
 
-    @ApiModelProperty("国内店铺名称")
-    private String storeNameCn;
-
     @ApiModelProperty("联系人名称")
     private String contactName;
 
@@ -96,9 +94,6 @@ public class StoreApplyDetailVO {
     @ApiModelProperty("店铺等级id")
     private Integer storeGradeId;
 
-    @ApiModelProperty("国内店铺等级id")
-    private Integer storeGradeIdCn;
-
     @ApiModelProperty("开店时长")
     private Integer applyYear;
 
@@ -111,14 +106,12 @@ public class StoreApplyDetailVO {
     @ApiModelProperty("店铺等级名称")
     private String storeGradeName;
 
-    @ApiModelProperty("国内店铺等级名称")
-    private String storeGradeNameCn;
-
     @ApiModelProperty("开店时长")
     private Integer openTime;
 
-    @ApiModelProperty("开店时长")
-    private Integer openTimeCn;
+    @ApiModelProperty("经营信息集合")
+    private List<StoreBusinessVO> storeBusinessVOList;
+
 
     @ApiModelProperty("拒绝理由")
     private String refuseReason;
@@ -132,8 +125,6 @@ public class StoreApplyDetailVO {
     @ApiModelProperty("经营类目集合")
     private List<StoreGoodsCateVO> storeGoodsCateVOList;
 
-    @ApiModelProperty("国内经营类目集合")
-    private List<StoreGoodsCateVO> storeGoodsCateCnVOList;
 
     public StoreApplyDetailVO(StoreApply storeApply, StoreCertificate storeCertificate) {
         storeName = storeApply.getStoreName();

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/seller/StoreDetailVO.java

@@ -4,6 +4,7 @@ import com.slodon.b2b2c.core.constant.StoreConst;
 import com.slodon.b2b2c.core.i18n.Language;
 import com.slodon.b2b2c.core.util.CommonUtil;
 import com.slodon.b2b2c.core.util.FileUrlUtil;
+import com.slodon.b2b2c.seller.dto.StoreBusinessVO;
 import com.slodon.b2b2c.seller.pojo.Store;
 import com.slodon.b2b2c.seller.pojo.StoreCertificate;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,8 +30,8 @@ public class StoreDetailVO {
     @ApiModelProperty("店铺名称")
     private String storeName;
 
-    @ApiModelProperty("国内店铺名称")
-    private String storeNameCn;
+    @ApiModelProperty("店铺经营信息")
+    private List<StoreBusinessVO> storeBusinessVOList;
 
     @ApiModelProperty("店铺Logo")
     private String storeLogo;
@@ -77,6 +78,10 @@ public class StoreDetailVO {
     @ApiModelProperty("身份证背面扫描件绝对地址")
     private String personCardDownPath;
 
+    @ApiModelProperty("店铺等级集合")
+    private List<StoreGradeVO> storeGradeVOList;
+
+
     @ApiModelProperty("店铺等级id")
     private Integer storeGradeId;
 
@@ -85,16 +90,16 @@ public class StoreDetailVO {
 
     @ApiModelProperty("店铺等级名称")
     private String storeGradeName;
-
-
-    @ApiModelProperty("国内店铺等级id")
-    private Integer storeGradeIdCn;
-
-    @ApiModelProperty("国内开店时长")
-    private Integer openTimeCn;
-
-    @ApiModelProperty("国内店铺等级名称")
-    private String storeGradeNameCn;
+//
+//
+//    @ApiModelProperty("国内店铺等级id")
+//    private Integer storeGradeIdCn;
+//
+//    @ApiModelProperty("国内开店时长")
+//    private Integer openTimeCn;
+//
+//    @ApiModelProperty("国内店铺等级名称")
+//    private String storeGradeNameCn;
 
     @ApiModelProperty("应付金额")
     private BigDecimal payAmount;
@@ -135,9 +140,6 @@ public class StoreDetailVO {
     @ApiModelProperty("经营类目集合")
     private List<StoreGoodsCateVO> storeGoodsCateVOList;
 
-    @ApiModelProperty("国内经营类目集合")
-    private List<StoreGoodsCateVO> storeGoodsCateCnVOList;
-
     @ApiModelProperty("结算周期")
     private String billCycle;