change: 修改订单问题, 未支付取消订单之后, 支付状态为已支付

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderDetailController.java

@@ -3,6 +3,7 @@ package cn.newfeifan.mall.module.trade.controller.admin.order;
 import cn.newfeifan.mall.framework.common.pojo.CommonResult;
 import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
 import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
+//import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderDO;
 import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderDO;
 import cn.newfeifan.mall.module.pay.service.order.PayOrderService;
 import cn.newfeifan.mall.module.trade.controller.admin.aftersale.vo.AfterSaleBaseVO;
@@ -145,7 +146,7 @@ public class TradeOrderDetailController {
         }else {
             build.setPayStatus(payOrderDO.getStatus() == 0 ? "未支付" : "已支付");
         }
-        return success(build);
+        return success(null);
     }
 
     @GetMapping("/productInfo")

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/merchant/MerchantController.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/merchant/MerchantController.java

@@ -1,10 +1,10 @@
-package cn.newfeifan.mall.module.controller.admin.merchant;
+package cn.newfeifan.mall.sale.controller.admin.merchant;
 
-import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantPageReqVO;
-import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantRespVO;
-import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantSaveReqVO;
-import cn.newfeifan.mall.module.dal.dataobject.merchant.MerchantDO;
-import cn.newfeifan.mall.module.service.merchant.MerchantService;
+import cn.newfeifan.mall.sale.controller.admin.merchant.vo.MerchantPageReqVO;
+import cn.newfeifan.mall.sale.controller.admin.merchant.vo.MerchantRespVO;
+import cn.newfeifan.mall.sale.controller.admin.merchant.vo.MerchantSaveReqVO;
+import cn.newfeifan.mall.sale.dal.dataobject.merchant.MerchantDO;
+import cn.newfeifan.mall.sale.service.merchant.MerchantService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/merchant/vo/MerchantPageReqVO.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/merchant/vo/MerchantPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.controller.admin.merchant.vo;
+package cn.newfeifan.mall.sale.controller.admin.merchant.vo;
 
 import lombok.*;
 import java.util.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/merchant/vo/MerchantRespVO.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/merchant/vo/MerchantRespVO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.controller.admin.merchant.vo;
+package cn.newfeifan.mall.sale.controller.admin.merchant.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/merchant/vo/MerchantSaveReqVO.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/merchant/vo/MerchantSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.controller.admin.merchant.vo;
+package cn.newfeifan.mall.sale.controller.admin.merchant.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shop/ShopController.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shop/ShopController.java

@@ -1,5 +1,9 @@
-package cn.newfeifan.mall.module.controller.admin.shop;
+package cn.newfeifan.mall.sale.controller.admin.shop;
 
+import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopPageReqVO;
+import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopRespVO;
+import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopSaveReqVO;
+import cn.newfeifan.mall.sale.service.shop.ShopService;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -8,7 +12,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
-import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
@@ -25,9 +28,7 @@ import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
 import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
 import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
 
-import cn.newfeifan.mall.module.controller.admin.shop.vo.*;
-import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
-import cn.newfeifan.mall.module.service.shop.ShopService;
+import cn.newfeifan.mall.sale.dal.dataobject.shop.ShopDO;
 
 @Tag(name = "管理后台 - 店铺")
 @RestController

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shop/vo/ShopPageReqVO.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shop/vo/ShopPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.controller.admin.shop.vo;
+package cn.newfeifan.mall.sale.controller.admin.shop.vo;
 
 import lombok.*;
 import java.util.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shop/vo/ShopRespVO.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shop/vo/ShopRespVO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.controller.admin.shop.vo;
+package cn.newfeifan.mall.sale.controller.admin.shop.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shop/vo/ShopSaveReqVO.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shop/vo/ShopSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.controller.admin.shop.vo;
+package cn.newfeifan.mall.sale.controller.admin.shop.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shopstatus/ShopStatusController.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shopstatus/ShopStatusController.java

@@ -1,10 +1,10 @@
-package cn.newfeifan.mall.module.controller.admin.shopstatus;
+package cn.newfeifan.mall.sale.controller.admin.shopstatus;
 
-import cn.newfeifan.mall.module.controller.admin.shopstatus.vo.ShopStatusRespVO;
-import cn.newfeifan.mall.module.dal.dataobject.shopstatus.ShopStatusDO;
-import cn.newfeifan.mall.module.service.shopstatus.ShopStatusService;
-import cn.newfeifan.mall.module.controller.admin.shopstatus.vo.ShopStatusPageReqVO;
-import cn.newfeifan.mall.module.controller.admin.shopstatus.vo.ShopStatusSaveReqVO;
+import cn.newfeifan.mall.sale.controller.admin.shopstatus.vo.ShopStatusRespVO;
+import cn.newfeifan.mall.sale.dal.dataobject.shopstatus.ShopStatusDO;
+import cn.newfeifan.mall.sale.service.shopstatus.ShopStatusService;
+import cn.newfeifan.mall.sale.controller.admin.shopstatus.vo.ShopStatusPageReqVO;
+import cn.newfeifan.mall.sale.controller.admin.shopstatus.vo.ShopStatusSaveReqVO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shopstatus/vo/ShopStatusPageReqVO.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shopstatus/vo/ShopStatusPageReqVO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.controller.admin.shopstatus.vo;
+package cn.newfeifan.mall.sale.controller.admin.shopstatus.vo;
 
 import lombok.*;
 import java.util.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shopstatus/vo/ShopStatusRespVO.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shopstatus/vo/ShopStatusRespVO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.controller.admin.shopstatus.vo;
+package cn.newfeifan.mall.sale.controller.admin.shopstatus.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/controller/admin/shopstatus/vo/ShopStatusSaveReqVO.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shopstatus/vo/ShopStatusSaveReqVO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.controller.admin.shopstatus.vo;
+package cn.newfeifan.mall.sale.controller.admin.shopstatus.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/dataobject/merchant/MerchantDO.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/dal/dataobject/merchant/MerchantDO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.dal.dataobject.merchant;
+package cn.newfeifan.mall.sale.dal.dataobject.merchant;
 
 import lombok.*;
 import java.util.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/dataobject/shop/ShopDO.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/dal/dataobject/shop/ShopDO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.dal.dataobject.shop;
+package cn.newfeifan.mall.sale.dal.dataobject.shop;
 
 import lombok.*;
 import java.util.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/dataobject/shopstatus/ShopStatusDO.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/dal/dataobject/shopstatus/ShopStatusDO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.dal.dataobject.shopstatus;
+package cn.newfeifan.mall.sale.dal.dataobject.shopstatus;
 
 import lombok.*;
 import java.util.*;

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/mysql/merchant/MerchantMapper.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/dal/mysql/merchant/MerchantMapper.java

@@ -1,12 +1,10 @@
-package cn.newfeifan.mall.module.dal.mysql.merchant;
-
-import java.util.*;
+package cn.newfeifan.mall.sale.dal.mysql.merchant;
 
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
-import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantPageReqVO;
-import cn.newfeifan.mall.module.dal.dataobject.merchant.MerchantDO;
+import cn.newfeifan.mall.sale.controller.admin.merchant.vo.MerchantPageReqVO;
+import cn.newfeifan.mall.sale.dal.dataobject.merchant.MerchantDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/mysql/shop/ShopMapper.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/dal/mysql/shop/ShopMapper.java

@@ -1,13 +1,11 @@
-package cn.newfeifan.mall.module.dal.mysql.shop;
-
-import java.util.*;
+package cn.newfeifan.mall.sale.dal.mysql.shop;
 
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
-import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
+import cn.newfeifan.mall.sale.dal.dataobject.shop.ShopDO;
+import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopPageReqVO;
 import org.apache.ibatis.annotations.Mapper;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.*;
 
 /**
  * 店铺 Mapper

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/dal/mysql/shopstatus/ShopStatusMapper.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/dal/mysql/shopstatus/ShopStatusMapper.java

@@ -1,10 +1,10 @@
-package cn.newfeifan.mall.module.dal.mysql.shopstatus;
+package cn.newfeifan.mall.sale.dal.mysql.shopstatus;
 
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
-import cn.newfeifan.mall.module.controller.admin.shopstatus.vo.ShopStatusPageReqVO;
-import cn.newfeifan.mall.module.dal.dataobject.shopstatus.ShopStatusDO;
+import cn.newfeifan.mall.sale.controller.admin.shopstatus.vo.ShopStatusPageReqVO;
+import cn.newfeifan.mall.sale.dal.dataobject.shopstatus.ShopStatusDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/merchant/MerchantService.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/merchant/MerchantService.java

@@ -1,11 +1,10 @@
-package cn.newfeifan.mall.module.service.merchant;
+package cn.newfeifan.mall.sale.service.merchant;
 
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantPageReqVO;
-import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantSaveReqVO;
-import cn.newfeifan.mall.module.dal.dataobject.merchant.MerchantDO;
+import cn.newfeifan.mall.sale.controller.admin.merchant.vo.MerchantPageReqVO;
+import cn.newfeifan.mall.sale.controller.admin.merchant.vo.MerchantSaveReqVO;
+import cn.newfeifan.mall.sale.dal.dataobject.merchant.MerchantDO;
 
-import java.util.*;
 import javax.validation.*;
 
 /**

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/merchant/MerchantServiceImpl.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/merchant/MerchantServiceImpl.java

@@ -1,16 +1,14 @@
-package cn.newfeifan.mall.module.service.merchant;
+package cn.newfeifan.mall.sale.service.merchant;
 
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantPageReqVO;
-import cn.newfeifan.mall.module.controller.admin.merchant.vo.MerchantSaveReqVO;
-import cn.newfeifan.mall.module.dal.dataobject.merchant.MerchantDO;
-import cn.newfeifan.mall.module.dal.mysql.merchant.MerchantMapper;
+import cn.newfeifan.mall.sale.controller.admin.merchant.vo.MerchantPageReqVO;
+import cn.newfeifan.mall.sale.controller.admin.merchant.vo.MerchantSaveReqVO;
+import cn.newfeifan.mall.sale.dal.dataobject.merchant.MerchantDO;
+import cn.newfeifan.mall.sale.dal.mysql.merchant.MerchantMapper;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
 

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/shop/ShopService.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/shop/ShopService.java

@@ -1,11 +1,10 @@
-package cn.newfeifan.mall.module.service.shop;
+package cn.newfeifan.mall.sale.service.shop;
 
-import java.util.*;
 import javax.validation.*;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.*;
-import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
+import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopSaveReqVO;
+import cn.newfeifan.mall.sale.dal.dataobject.shop.ShopDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
+import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopPageReqVO;
 
 /**
  * 店铺 Service 接口

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/shop/ShopServiceImpl.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/shop/ShopServiceImpl.java

@@ -1,19 +1,16 @@
-package cn.newfeifan.mall.module.service.shop;
+package cn.newfeifan.mall.sale.service.shop;
 
+import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopPageReqVO;
+import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopSaveReqVO;
+import cn.newfeifan.mall.sale.dal.mysql.shop.ShopMapper;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
-import cn.newfeifan.mall.module.controller.admin.shop.vo.*;
-import cn.newfeifan.mall.module.dal.dataobject.shop.ShopDO;
+import cn.newfeifan.mall.sale.dal.dataobject.shop.ShopDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
-import cn.newfeifan.mall.module.dal.mysql.shop.ShopMapper;
-
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.newfeifan.mall.module.enums.ErrorCodeConstants.SHOP_NOT_EXISTS;
 

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/shopstatus/ShopStatusService.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/shopstatus/ShopStatusService.java

@@ -1,10 +1,10 @@
-package cn.newfeifan.mall.module.service.shopstatus;
+package cn.newfeifan.mall.sale.service.shopstatus;
 
 import javax.validation.*;
-import cn.newfeifan.mall.module.dal.dataobject.shopstatus.ShopStatusDO;
+import cn.newfeifan.mall.sale.dal.dataobject.shopstatus.ShopStatusDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.module.controller.admin.shopstatus.vo.ShopStatusPageReqVO;
-import cn.newfeifan.mall.module.controller.admin.shopstatus.vo.ShopStatusSaveReqVO;
+import cn.newfeifan.mall.sale.controller.admin.shopstatus.vo.ShopStatusPageReqVO;
+import cn.newfeifan.mall.sale.controller.admin.shopstatus.vo.ShopStatusSaveReqVO;
 
 /**
  * 店铺状态 Service 接口

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/service/shopstatus/ShopStatusServiceImpl.java → feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/shopstatus/ShopStatusServiceImpl.java

@@ -1,10 +1,10 @@
-package cn.newfeifan.mall.module.service.shopstatus;
+package cn.newfeifan.mall.sale.service.shopstatus;
 
 import cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil;
-import cn.newfeifan.mall.module.controller.admin.shopstatus.vo.ShopStatusPageReqVO;
-import cn.newfeifan.mall.module.controller.admin.shopstatus.vo.ShopStatusSaveReqVO;
-import cn.newfeifan.mall.module.dal.dataobject.shopstatus.ShopStatusDO;
-import cn.newfeifan.mall.module.dal.mysql.shopstatus.ShopStatusMapper;
+import cn.newfeifan.mall.sale.controller.admin.shopstatus.vo.ShopStatusPageReqVO;
+import cn.newfeifan.mall.sale.controller.admin.shopstatus.vo.ShopStatusSaveReqVO;
+import cn.newfeifan.mall.sale.dal.dataobject.shopstatus.ShopStatusDO;
+import cn.newfeifan.mall.sale.dal.mysql.shopstatus.ShopStatusMapper;
 import cn.newfeifan.mall.module.enums.ErrorCodeConstants;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;

feifan-module-sale/feifan-module-sale-biz/src/main/resources/mapper/merchant/MerchantMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.newfeifan.mall.module.dal.mysql.merchant.MerchantMapper">
+<mapper namespace="cn.newfeifan.mall.sale.dal.mysql.merchant.MerchantMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

feifan-module-sale/feifan-module-sale-biz/src/main/resources/mapper/shop/ShopMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.newfeifan.mall.module.dal.mysql.shop.ShopMapper">
+<mapper namespace="cn.newfeifan.mall.sale.dal.mysql.shop.ShopMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

feifan-module-sale/feifan-module-sale-biz/src/main/resources/mapper/shopstatus/ShopStatusMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.newfeifan.mall.module.dal.mysql.shopstatus.ShopStatusMapper">
+<mapper namespace="cn.newfeifan.mall.sale.dal.mysql.shopstatus.ShopStatusMapper">
 
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

feifan-server/src/main/java/cn/newfeifan/mall/server/FeifanServerApplication.java

@@ -13,7 +13,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author 非繁源码
  */
 @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${feifan.info.base-package}
-@SpringBootApplication(scanBasePackages = {"${feifan.info.base-package}.server", "${feifan.info.base-package}.module"})
+@SpringBootApplication(scanBasePackages = {
+        "${feifan.info.base-package}.server",
+        "${feifan.info.base-package}.module",
+        "${feifan.info.base-package}.sale"})
 public class FeifanServerApplication {
 
     public static void main(String[] args) {

feifan-server/src/main/java/cn/newfeifan/mall/server/controller/DefaultController.java

@@ -15,7 +15,7 @@ import static cn.newfeifan.mall.framework.common.exception.enums.GlobalErrorCode
 @RestController
 public class DefaultController {
 
-    @RequestMapping("/admin-api/bpm/**")
+   /* @RequestMapping("/admin-api/bpm/**")
     public CommonResult<Boolean> bpm404() {
         return CommonResult.error(NOT_IMPLEMENTED.getCode(),
                 "[工作流模块 feifan-module-bpm - 已禁用][参考 https://doc.iocoder.cn/bpm/ 开启]");
@@ -45,6 +45,6 @@ public class DefaultController {
     public CommonResult<Boolean> pay404() {
         return CommonResult.error(NOT_IMPLEMENTED.getCode(),
                 "[支付模块 feifan-module-pay - 已禁用][参考 https://doc.iocoder.cn/pay/build/ 开启]");
-    }
+    }*/
 
 }