升级新架构

api/oms-api/src/main/java/cn/qihangerp/oms/serviceImpl/SysConfigServiceImpl.java

@@ -0,0 +1,69 @@
+package cn.qihangerp.oms.serviceImpl;
+
+import cn.qihangerp.model.entity.SysConfig;
+import cn.qihangerp.service.SysConfigService;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+@Service
+public class SysConfigServiceImpl implements SysConfigService {
+    @Override
+    public boolean selectCaptchaEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean saveBatch(Collection<SysConfig> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean saveOrUpdateBatch(Collection<SysConfig> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean updateBatchById(Collection<SysConfig> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean saveOrUpdate(SysConfig entity) {
+        return false;
+    }
+
+    @Override
+    public SysConfig getOne(Wrapper<SysConfig> queryWrapper, boolean throwEx) {
+        return null;
+    }
+
+    @Override
+    public Optional<SysConfig> getOneOpt(Wrapper<SysConfig> queryWrapper, boolean throwEx) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Map<String, Object> getMap(Wrapper<SysConfig> queryWrapper) {
+        return Map.of();
+    }
+
+    @Override
+    public <V> V getObj(Wrapper<SysConfig> queryWrapper, Function<? super Object, V> mapper) {
+        return null;
+    }
+
+    @Override
+    public BaseMapper<SysConfig> getBaseMapper() {
+        return null;
+    }
+
+    @Override
+    public Class<SysConfig> getEntityClass() {
+        return null;
+    }
+}

api/oms-api/src/main/java/cn/qihangerp/oms/serviceImpl/SysUserServiceImpl.java

@@ -0,0 +1,123 @@
+package cn.qihangerp.oms.serviceImpl;
+
+import cn.qihangerp.model.entity.SysUser;
+import cn.qihangerp.service.ISysUserService;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 用户 业务层处理
+ *
+ * @author qihang
+ */
+@Service
+public class SysUserServiceImpl implements ISysUserService
+{
+
+    @Override
+    public List<SysUser> selectUserList(SysUser user) {
+        return List.of();
+    }
+
+    @Override
+    public List<SysUser> selectAllocatedList(SysUser user) {
+        return List.of();
+    }
+
+    @Override
+    public List<SysUser> selectUnallocatedList(SysUser user) {
+        return List.of();
+    }
+
+    @Override
+    public SysUser selectUserByUserName(String userName) {
+        return null;
+    }
+
+    @Override
+    public SysUser selectUserById(Long userId) {
+        return null;
+    }
+
+    @Override
+    public boolean checkUserNameUnique(SysUser user) {
+        return false;
+    }
+
+    @Override
+    public boolean checkPhoneUnique(SysUser user) {
+        return false;
+    }
+
+    @Override
+    public boolean checkEmailUnique(SysUser user) {
+        return false;
+    }
+
+    @Override
+    public void checkUserAllowed(SysUser user) {
+
+    }
+
+    @Override
+    public int insertUser(SysUser user) {
+        return 0;
+    }
+
+    @Override
+    public boolean registerUser(SysUser user) {
+        return false;
+    }
+
+    @Override
+    public int updateUser(SysUser user) {
+        return 0;
+    }
+
+    @Override
+    public int updateUserStatus(SysUser user) {
+        return 0;
+    }
+
+    @Override
+    public int updateUserProfile(SysUser user) {
+        return 0;
+    }
+
+    @Override
+    public boolean updateUserAvatar(String userName, String avatar) {
+        return false;
+    }
+
+    @Override
+    public int resetPwd(SysUser user) {
+        return 0;
+    }
+
+    @Override
+    public int resetUserPwd(String userName, String password) {
+        return 0;
+    }
+
+    @Override
+    public int deleteUserById(Long userId) {
+        return 0;
+    }
+
+    @Override
+    public void checkUserDataScope(Long userId) {
+
+    }
+
+    @Override
+    public String selectUserRoleGroup(String userName) {
+        return "";
+    }
+
+    @Override
+    public void insertUserAuth(Long userId, Long[] roleIds) {
+
+    }
+}

api/open-api/pom.xml

@@ -131,15 +131,6 @@
             <version>1.0.6</version>
         </dependency>
 
-
-
-
-
-        <dependency>
-            <groupId>cn.qihangerp.module</groupId>
-            <artifactId>wei</artifactId>
-            <version>1.0</version>
-        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>

api/open-api/src/main/java/cn/qihangerp/open/service/SysConfigServiceImpl.java

@@ -0,0 +1,69 @@
+package cn.qihangerp.open.service;
+
+import cn.qihangerp.model.entity.SysConfig;
+import cn.qihangerp.service.SysConfigService;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Optional;
+import java.util.function.Function;
+@Service
+public class SysConfigServiceImpl implements SysConfigService {
+    @Override
+    public boolean selectCaptchaEnabled() {
+        return false;
+    }
+
+    @Override
+    public boolean saveBatch(Collection<SysConfig> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean saveOrUpdateBatch(Collection<SysConfig> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean updateBatchById(Collection<SysConfig> entityList, int batchSize) {
+        return false;
+    }
+
+    @Override
+    public boolean saveOrUpdate(SysConfig entity) {
+        return false;
+    }
+
+    @Override
+    public SysConfig getOne(Wrapper<SysConfig> queryWrapper, boolean throwEx) {
+        return null;
+    }
+
+    @Override
+    public Optional<SysConfig> getOneOpt(Wrapper<SysConfig> queryWrapper, boolean throwEx) {
+        return Optional.empty();
+    }
+
+    @Override
+    public Map<String, Object> getMap(Wrapper<SysConfig> queryWrapper) {
+        return Map.of();
+    }
+
+    @Override
+    public <V> V getObj(Wrapper<SysConfig> queryWrapper, Function<? super Object, V> mapper) {
+        return null;
+    }
+
+    @Override
+    public BaseMapper<SysConfig> getBaseMapper() {
+        return null;
+    }
+
+    @Override
+    public Class<SysConfig> getEntityClass() {
+        return null;
+    }
+}

api/open-api/src/main/java/cn/qihangerp/open/service/SysUserServiceImpl.java

@@ -0,0 +1,122 @@
+package cn.qihangerp.open.service;
+
+import cn.qihangerp.model.entity.SysUser;
+import cn.qihangerp.service.ISysUserService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 用户 业务层处理
+ *
+ * @author qihang
+ */
+@Service
+public class SysUserServiceImpl implements ISysUserService
+{
+
+    @Override
+    public List<SysUser> selectUserList(SysUser user) {
+        return List.of();
+    }
+
+    @Override
+    public List<SysUser> selectAllocatedList(SysUser user) {
+        return List.of();
+    }
+
+    @Override
+    public List<SysUser> selectUnallocatedList(SysUser user) {
+        return List.of();
+    }
+
+    @Override
+    public SysUser selectUserByUserName(String userName) {
+        return null;
+    }
+
+    @Override
+    public SysUser selectUserById(Long userId) {
+        return null;
+    }
+
+    @Override
+    public boolean checkUserNameUnique(SysUser user) {
+        return false;
+    }
+
+    @Override
+    public boolean checkPhoneUnique(SysUser user) {
+        return false;
+    }
+
+    @Override
+    public boolean checkEmailUnique(SysUser user) {
+        return false;
+    }
+
+    @Override
+    public void checkUserAllowed(SysUser user) {
+
+    }
+
+    @Override
+    public int insertUser(SysUser user) {
+        return 0;
+    }
+
+    @Override
+    public boolean registerUser(SysUser user) {
+        return false;
+    }
+
+    @Override
+    public int updateUser(SysUser user) {
+        return 0;
+    }
+
+    @Override
+    public int updateUserStatus(SysUser user) {
+        return 0;
+    }
+
+    @Override
+    public int updateUserProfile(SysUser user) {
+        return 0;
+    }
+
+    @Override
+    public boolean updateUserAvatar(String userName, String avatar) {
+        return false;
+    }
+
+    @Override
+    public int resetPwd(SysUser user) {
+        return 0;
+    }
+
+    @Override
+    public int resetUserPwd(String userName, String password) {
+        return 0;
+    }
+
+    @Override
+    public int deleteUserById(Long userId) {
+        return 0;
+    }
+
+    @Override
+    public void checkUserDataScope(Long userId) {
+
+    }
+
+    @Override
+    public String selectUserRoleGroup(String userName) {
+        return "";
+    }
+
+    @Override
+    public void insertUserAuth(Long userId, Long[] roleIds) {
+
+    }
+}

core/model/src/main/java/cn/qihangerp/model/bo/DouGoodsBo.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.dou.domain.bo;
+package cn.qihangerp.model.bo;
 
 import lombok.Data;
 

core/model/src/main/java/cn/qihangerp/model/bo/DouOrderBo.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.dou.domain.bo;
+package cn.qihangerp.model.bo;
 
 import lombok.Data;
 

core/model/src/main/java/cn/qihangerp/model/bo/DouOrderPushBo.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.dou.domain.bo;
+package cn.qihangerp.model.bo;
 
 import lombok.Data;
 

core/model/src/main/java/cn/qihangerp/model/bo/DouRefundBo.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.dou.domain.bo;
+package cn.qihangerp.model.bo;
 
 import lombok.Data;
 

core/model/src/main/java/cn/qihangerp/model/entity/DouGoods.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.dou.domain;
+package cn.qihangerp.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

core/model/src/main/java/cn/qihangerp/model/entity/DouGoodsSku.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.dou.domain;
+package cn.qihangerp.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

core/model/src/main/java/cn/qihangerp/model/entity/DouOrder.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.dou.domain;
+package cn.qihangerp.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

core/model/src/main/java/cn/qihangerp/model/entity/DouOrderItem.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.dou.domain;
+package cn.qihangerp.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

core/model/src/main/java/cn/qihangerp/model/entity/DouRefund.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.dou.domain;
+package cn.qihangerp.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

core/model/src/main/java/cn/qihangerp/model/vo/DouGoodsSkuListVo.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.dou.domain.vo;
+package cn.qihangerp.model.vo;
 
 import lombok.Data;
 

microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java

@@ -7,8 +7,8 @@ import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.common.enums.HttpStatus;
 import cn.qihangerp.model.entity.OShopPullLasttime;
 import cn.qihangerp.model.entity.OShopPullLogs;
-import cn.qihangerp.module.open.dou.domain.DouGoods;
-import cn.qihangerp.module.open.dou.domain.DouGoodsSku;
+import cn.qihangerp.model.entity.DouGoods;
+import cn.qihangerp.model.entity.DouGoodsSku;
 import cn.qihangerp.module.open.dou.service.DouGoodsService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;

microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java

@@ -4,9 +4,9 @@ package cn.qihangerp.api.dou.controller;
 import cn.qihangerp.common.*;
 import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
 import cn.qihangerp.module.goods.service.OGoodsSkuService;
-import cn.qihangerp.module.open.dou.domain.DouGoods;
-import cn.qihangerp.module.open.dou.domain.DouGoodsSku;
-import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo;
+import cn.qihangerp.model.entity.DouGoods;
+import cn.qihangerp.model.entity.DouGoodsSku;
+import cn.qihangerp.model.bo.DouGoodsBo;
 import cn.qihangerp.module.open.dou.service.DouGoodsService;
 import cn.qihangerp.module.open.dou.service.DouGoodsSkuService;
 import cn.qihangerp.security.common.BaseController;

microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java

@@ -11,8 +11,8 @@ import cn.qihangerp.common.mq.MqType;
 import cn.qihangerp.common.mq.MqUtils;
 import cn.qihangerp.model.entity.OShopPullLasttime;
 import cn.qihangerp.model.entity.OShopPullLogs;
-import cn.qihangerp.module.open.dou.domain.DouOrder;
-import cn.qihangerp.module.open.dou.domain.DouOrderItem;
+import cn.qihangerp.model.entity.DouOrder;
+import cn.qihangerp.model.entity.DouOrderItem;
 import cn.qihangerp.module.open.dou.service.DouOrderService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;

microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java

@@ -9,9 +9,9 @@ import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.common.mq.MqMessage;
 import cn.qihangerp.common.mq.MqType;
 import cn.qihangerp.common.mq.MqUtils;
-import cn.qihangerp.module.open.dou.domain.DouOrder;
-import cn.qihangerp.module.open.dou.domain.bo.DouOrderBo;
-import cn.qihangerp.module.open.dou.domain.bo.DouOrderPushBo;
+import cn.qihangerp.model.entity.DouOrder;
+import cn.qihangerp.model.bo.DouOrderBo;
+import cn.qihangerp.model.bo.DouOrderPushBo;
 import cn.qihangerp.module.open.dou.service.DouOrderService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;

microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java

@@ -10,7 +10,7 @@ import cn.qihangerp.common.mq.MqType;
 import cn.qihangerp.common.mq.MqUtils;
 import cn.qihangerp.model.entity.OShopPullLasttime;
 import cn.qihangerp.model.entity.OShopPullLogs;
-import cn.qihangerp.module.open.dou.domain.DouRefund;
+import cn.qihangerp.model.entity.DouRefund;
 import cn.qihangerp.module.open.dou.service.DouRefundService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;

microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundController.java

@@ -9,9 +9,9 @@ import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.common.mq.MqMessage;
 import cn.qihangerp.common.mq.MqType;
 import cn.qihangerp.common.mq.MqUtils;
-import cn.qihangerp.module.open.dou.domain.DouRefund;
-import cn.qihangerp.module.open.dou.domain.bo.DouOrderPushBo;
-import cn.qihangerp.module.open.dou.domain.bo.DouRefundBo;
+import cn.qihangerp.model.entity.DouRefund;
+import cn.qihangerp.model.bo.DouOrderPushBo;
+import cn.qihangerp.model.bo.DouRefundBo;
 import cn.qihangerp.module.open.dou.service.DouRefundService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;

microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouWaybillController.java

@@ -2,30 +2,12 @@ package cn.qihangerp.api.dou.controller;
 
 import cn.qihangerp.api.dou.DouApiCommon;
 import cn.qihangerp.common.AjaxResult;
-import cn.qihangerp.common.ResultVoEnum;
-import cn.qihangerp.common.enums.EnumShopType;
-import cn.qihangerp.common.enums.HttpStatus;
-import cn.qihangerp.module.open.dou.domain.DouOrder;
 import cn.qihangerp.module.open.dou.service.DouOrderService;
-import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.dou.DouRequest;
-import cn.qihangerp.sdk.dou.DouTokenApiHelper;
-import cn.qihangerp.sdk.dou.DouWaybillAccountApiHelper;
-import cn.qihangerp.sdk.dou.DouWaybillApiHelper;
-import cn.qihangerp.sdk.dou.model.*;
-import cn.qihangerp.sdk.dou.request.WaybillApplyRequest;
-import cn.qihangerp.sdk.dou.request.WaybillCodeRequest;
 import cn.qihangerp.security.common.BaseController;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.java.Log;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
 
 @Log
 @AllArgsConstructor

microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouOrderFeignController.java

@@ -1,7 +1,7 @@
 package cn.qihangerp.api.dou.controller.feign;
 
 import cn.qihangerp.common.AjaxResult;
-import cn.qihangerp.module.open.dou.domain.DouOrder;
+import cn.qihangerp.model.entity.DouOrder;
 import cn.qihangerp.module.open.dou.service.DouOrderService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouRefundFeignController.java

@@ -1,7 +1,7 @@
 package cn.qihangerp.api.dou.controller.feign;
 
 import cn.qihangerp.common.AjaxResult;
-import cn.qihangerp.module.open.dou.domain.DouRefund;
+import cn.qihangerp.model.entity.DouRefund;
 import cn.qihangerp.module.open.dou.service.DouRefundService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsMapper.java

@@ -1,7 +1,7 @@
 package cn.qihangerp.module.open.dou.mapper;
 
 
-import cn.qihangerp.module.open.dou.domain.DouGoods;
+import cn.qihangerp.model.entity.DouGoods;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java

@@ -1,7 +1,7 @@
 package cn.qihangerp.module.open.dou.mapper;
 
-import cn.qihangerp.module.open.dou.domain.DouGoodsSku;
-import cn.qihangerp.module.open.dou.domain.vo.DouGoodsSkuListVo;
+import cn.qihangerp.model.entity.DouGoodsSku;
+import cn.qihangerp.model.vo.DouGoodsSkuListVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderItemMapper.java

@@ -1,7 +1,7 @@
 package cn.qihangerp.module.open.dou.mapper;
 
 
-import cn.qihangerp.module.open.dou.domain.DouOrderItem;
+import cn.qihangerp.model.entity.DouOrderItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderMapper.java

@@ -1,7 +1,7 @@
 package cn.qihangerp.module.open.dou.mapper;
 
 
-import cn.qihangerp.module.open.dou.domain.DouOrder;
+import cn.qihangerp.model.entity.DouOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouRefundMapper.java

@@ -1,7 +1,7 @@
 package cn.qihangerp.module.open.dou.mapper;
 
 
-import cn.qihangerp.module.open.dou.domain.DouRefund;
+import cn.qihangerp.model.entity.DouRefund;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java

@@ -3,8 +3,8 @@ package cn.qihangerp.module.open.dou.service;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.ResultVo;
-import cn.qihangerp.module.open.dou.domain.DouGoods;
-import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo;
+import cn.qihangerp.model.entity.DouGoods;
+import cn.qihangerp.model.bo.DouGoodsBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java

@@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
-import cn.qihangerp.module.open.dou.domain.DouGoodsSku;
-import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo;
+import cn.qihangerp.model.entity.DouGoodsSku;
+import cn.qihangerp.model.bo.DouGoodsBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderItemService.java

@@ -1,7 +1,7 @@
 package cn.qihangerp.module.open.dou.service;
 
 
-import cn.qihangerp.module.open.dou.domain.DouOrderItem;
+import cn.qihangerp.model.entity.DouOrderItem;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java

@@ -3,8 +3,8 @@ package cn.qihangerp.module.open.dou.service;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.ResultVo;
-import cn.qihangerp.module.open.dou.domain.DouOrder;
-import cn.qihangerp.module.open.dou.domain.bo.DouOrderBo;
+import cn.qihangerp.model.entity.DouOrder;
+import cn.qihangerp.model.bo.DouOrderBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java

@@ -3,8 +3,8 @@ package cn.qihangerp.module.open.dou.service;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.ResultVo;
-import cn.qihangerp.module.open.dou.domain.DouRefund;
-import cn.qihangerp.module.open.dou.domain.bo.DouRefundBo;
+import cn.qihangerp.model.entity.DouRefund;
+import cn.qihangerp.model.bo.DouRefundBo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java

@@ -11,14 +11,12 @@ import cn.qihangerp.module.goods.domain.OGoodsSku;
 import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
 import cn.qihangerp.module.goods.mapper.OGoodsMapper;
 import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
-import cn.qihangerp.module.open.dou.domain.DouGoods;
-import cn.qihangerp.module.open.dou.domain.DouGoodsSku;
-import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo;
+import cn.qihangerp.model.entity.DouGoods;
+import cn.qihangerp.model.entity.DouGoodsSku;
+import cn.qihangerp.model.bo.DouGoodsBo;
 import cn.qihangerp.module.open.dou.mapper.DouGoodsMapper;
 import cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper;
 import cn.qihangerp.module.open.dou.service.DouGoodsService;
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java

@@ -8,9 +8,9 @@ import cn.qihangerp.module.goods.domain.OGoods;
 import cn.qihangerp.module.goods.domain.OGoodsSku;
 import cn.qihangerp.module.goods.service.OGoodsService;
 import cn.qihangerp.module.goods.service.OGoodsSkuService;
-import cn.qihangerp.module.open.dou.domain.DouGoods;
-import cn.qihangerp.module.open.dou.domain.DouGoodsSku;
-import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo;
+import cn.qihangerp.model.entity.DouGoods;
+import cn.qihangerp.model.entity.DouGoodsSku;
+import cn.qihangerp.model.bo.DouGoodsBo;
 import cn.qihangerp.module.open.dou.mapper.DouGoodsMapper;
 import cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper;
 import cn.qihangerp.module.open.dou.service.DouGoodsSkuService;

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java

@@ -1,6 +1,6 @@
 package cn.qihangerp.module.open.dou.service.impl;
 
-import cn.qihangerp.module.open.dou.domain.DouOrderItem;
+import cn.qihangerp.model.entity.DouOrderItem;
 import cn.qihangerp.module.open.dou.mapper.DouOrderItemMapper;
 import cn.qihangerp.module.open.dou.service.DouOrderItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java

@@ -6,10 +6,10 @@ import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.utils.DateUtils;
-import cn.qihangerp.module.open.dou.domain.DouGoodsSku;
-import cn.qihangerp.module.open.dou.domain.DouOrder;
-import cn.qihangerp.module.open.dou.domain.DouOrderItem;
-import cn.qihangerp.module.open.dou.domain.bo.DouOrderBo;
+import cn.qihangerp.model.entity.DouGoodsSku;
+import cn.qihangerp.model.entity.DouOrder;
+import cn.qihangerp.model.entity.DouOrderItem;
+import cn.qihangerp.model.bo.DouOrderBo;
 import cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper;
 import cn.qihangerp.module.open.dou.mapper.DouOrderItemMapper;
 import cn.qihangerp.module.open.dou.mapper.DouOrderMapper;

serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java

@@ -5,9 +5,9 @@ import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.common.ResultVoEnum;
-import cn.qihangerp.module.open.dou.domain.DouOrderItem;
-import cn.qihangerp.module.open.dou.domain.DouRefund;
-import cn.qihangerp.module.open.dou.domain.bo.DouRefundBo;
+import cn.qihangerp.model.entity.DouOrderItem;
+import cn.qihangerp.model.entity.DouRefund;
+import cn.qihangerp.model.bo.DouRefundBo;
 import cn.qihangerp.module.open.dou.mapper.DouOrderItemMapper;
 import cn.qihangerp.module.open.dou.mapper.DouRefundMapper;
 import cn.qihangerp.module.open.dou.service.DouRefundService;

serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.qihangerp.module.open.dou.mapper.DouGoodsMapper">
 
-    <resultMap id="BaseResultMap" type="cn.qihangerp.module.open.dou.domain.DouGoods">
+    <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouGoods">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="shopId" column="shop_id" jdbcType="BIGINT"/>
             <result property="productId" column="product_id" jdbcType="BIGINT"/>

serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper">
 
-    <resultMap id="BaseResultMap" type="cn.qihangerp.module.open.dou.domain.DouGoodsSku">
+    <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouGoodsSku">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="productId" column="product_id" jdbcType="BIGINT"/>
             <result property="specId" column="spec_id" jdbcType="BIGINT"/>
@@ -51,7 +51,7 @@
         name,img,pull_time,modify_time
     </sql>
 
-    <select id="selectSkuPageList" resultType="cn.qihangerp.module.open.dou.domain.vo.DouGoodsSkuListVo">
+    <select id="selectSkuPageList" resultType="cn.qihangerp.model.vo.DouGoodsSkuListVo">
         SELECT sku.*,ogs.outer_erp_sku_id FROM oms_dou_goods_sku sku
 
         LEFT JOIN o_goods_sku ogs on ogs.id = sku.erp_goods_sku_id

serviceImpl/dou/src/main/resources/mapper/dou/DouOrderItemMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.qihangerp.module.open.dou.mapper.DouOrderItemMapper">
 
-    <resultMap id="BaseResultMap" type="cn.qihangerp.module.open.dou.domain.DouOrderItem">
+    <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouOrderItem">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="orderId" column="order_id" jdbcType="VARCHAR"/>
             <result property="parentOrderId" column="parent_order_id" jdbcType="VARCHAR"/>

serviceImpl/dou/src/main/resources/mapper/dou/DouOrderMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.qihangerp.module.open.dou.mapper.DouOrderMapper">
 
-    <resultMap id="BaseResultMap" type="cn.qihangerp.module.open.dou.domain.DouOrder">
+    <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouOrder">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="orderId" column="order_id" jdbcType="VARCHAR"/>
             <result property="orderLevel" column="order_level" jdbcType="INTEGER"/>

serviceImpl/dou/src/main/resources/mapper/dou/DouRefundMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.qihangerp.module.open.dou.mapper.DouRefundMapper">
 
-    <resultMap id="BaseResultMap" type="cn.qihangerp.module.open.dou.domain.DouRefund">
+    <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouRefund">
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="shopId" column="shop_id" jdbcType="BIGINT"/>
             <result property="aftersaleId" column="aftersale_id" jdbcType="BIGINT"/>