diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/serviceImpl/SysConfigServiceImpl.java b/api/oms-api/src/main/java/cn/qihangerp/oms/serviceImpl/SysConfigServiceImpl.java new file mode 100644 index 00000000..e9f42bc1 --- /dev/null +++ b/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 entityList, int batchSize) { + return false; + } + + @Override + public boolean saveOrUpdateBatch(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean updateBatchById(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean saveOrUpdate(SysConfig entity) { + return false; + } + + @Override + public SysConfig getOne(Wrapper queryWrapper, boolean throwEx) { + return null; + } + + @Override + public Optional getOneOpt(Wrapper queryWrapper, boolean throwEx) { + return Optional.empty(); + } + + @Override + public Map getMap(Wrapper queryWrapper) { + return Map.of(); + } + + @Override + public V getObj(Wrapper queryWrapper, Function mapper) { + return null; + } + + @Override + public BaseMapper getBaseMapper() { + return null; + } + + @Override + public Class getEntityClass() { + return null; + } +} diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/serviceImpl/SysUserServiceImpl.java b/api/oms-api/src/main/java/cn/qihangerp/oms/serviceImpl/SysUserServiceImpl.java new file mode 100644 index 00000000..4b35187e --- /dev/null +++ b/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 selectUserList(SysUser user) { + return List.of(); + } + + @Override + public List selectAllocatedList(SysUser user) { + return List.of(); + } + + @Override + public List 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) { + + } +} diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml index a589e6c2..b16aa00b 100644 --- a/api/open-api/pom.xml +++ b/api/open-api/pom.xml @@ -131,15 +131,6 @@ 1.0.6 - - - - - - cn.qihangerp.module - wei - 1.0 - diff --git a/api/open-api/src/main/java/cn/qihangerp/open/service/SysConfigServiceImpl.java b/api/open-api/src/main/java/cn/qihangerp/open/service/SysConfigServiceImpl.java new file mode 100644 index 00000000..a4694037 --- /dev/null +++ b/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 entityList, int batchSize) { + return false; + } + + @Override + public boolean saveOrUpdateBatch(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean updateBatchById(Collection entityList, int batchSize) { + return false; + } + + @Override + public boolean saveOrUpdate(SysConfig entity) { + return false; + } + + @Override + public SysConfig getOne(Wrapper queryWrapper, boolean throwEx) { + return null; + } + + @Override + public Optional getOneOpt(Wrapper queryWrapper, boolean throwEx) { + return Optional.empty(); + } + + @Override + public Map getMap(Wrapper queryWrapper) { + return Map.of(); + } + + @Override + public V getObj(Wrapper queryWrapper, Function mapper) { + return null; + } + + @Override + public BaseMapper getBaseMapper() { + return null; + } + + @Override + public Class getEntityClass() { + return null; + } +} diff --git a/api/open-api/src/main/java/cn/qihangerp/open/service/SysUserServiceImpl.java b/api/open-api/src/main/java/cn/qihangerp/open/service/SysUserServiceImpl.java new file mode 100644 index 00000000..8d96a10e --- /dev/null +++ b/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 selectUserList(SysUser user) { + return List.of(); + } + + @Override + public List selectAllocatedList(SysUser user) { + return List.of(); + } + + @Override + public List 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) { + + } +} diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouGoodsBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/DouGoodsBo.java similarity index 87% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouGoodsBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/DouGoodsBo.java index c7d95bd0..3a419b66 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouGoodsBo.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/DouOrderBo.java similarity index 86% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/DouOrderBo.java index a0951a1d..febbcb04 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderBo.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderPushBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/DouOrderPushBo.java similarity index 64% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderPushBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/DouOrderPushBo.java index 080b9234..0d6d92ef 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderPushBo.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouRefundBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/DouRefundBo.java similarity index 78% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouRefundBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/DouRefundBo.java index 9cfa716e..1e1dbcb6 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouRefundBo.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoods.java b/core/model/src/main/java/cn/qihangerp/model/entity/DouGoods.java similarity index 98% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoods.java rename to core/model/src/main/java/cn/qihangerp/model/entity/DouGoods.java index c373e43d..0b984f7b 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoods.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoodsSku.java b/core/model/src/main/java/cn/qihangerp/model/entity/DouGoodsSku.java similarity index 98% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoodsSku.java rename to core/model/src/main/java/cn/qihangerp/model/entity/DouGoodsSku.java index f9a5c5a5..e51ce880 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoodsSku.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrder.java b/core/model/src/main/java/cn/qihangerp/model/entity/DouOrder.java similarity index 99% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrder.java rename to core/model/src/main/java/cn/qihangerp/model/entity/DouOrder.java index e94bc79c..e0c76e49 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrder.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrderItem.java b/core/model/src/main/java/cn/qihangerp/model/entity/DouOrderItem.java similarity index 99% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrderItem.java rename to core/model/src/main/java/cn/qihangerp/model/entity/DouOrderItem.java index ffbc1629..9a355b93 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrderItem.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouRefund.java b/core/model/src/main/java/cn/qihangerp/model/entity/DouRefund.java similarity index 99% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouRefund.java rename to core/model/src/main/java/cn/qihangerp/model/entity/DouRefund.java index 684a16b0..31f79313 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouRefund.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/vo/DouGoodsSkuListVo.java b/core/model/src/main/java/cn/qihangerp/model/vo/DouGoodsSkuListVo.java similarity index 94% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/vo/DouGoodsSkuListVo.java rename to core/model/src/main/java/cn/qihangerp/model/vo/DouGoodsSkuListVo.java index 5ebd1f50..12d563ca 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/domain/vo/DouGoodsSkuListVo.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java index 03fb6d99..1cf3e6ce 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java index f9b45efa..f65e3653 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java index c3e10340..6886c01c 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java index ade5d429..03349a59 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java index 18d9a95e..6e450ed2 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundController.java index 2fb15c96..a5871806 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundController.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouWaybillController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouWaybillController.java index 192fe67c..d4be706d 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouWaybillController.java +++ b/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 diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouOrderFeignController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouOrderFeignController.java index a78021b0..cb6830b3 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouOrderFeignController.java +++ b/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; diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouRefundFeignController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouRefundFeignController.java index 44eab512..7c344958 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouRefundFeignController.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsMapper.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsMapper.java index a2fb9322..79242ba7 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsMapper.java +++ b/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; /** diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java index 5f89ec42..59d81bfa 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderItemMapper.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderItemMapper.java index 8b8e50eb..03af6cf8 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderItemMapper.java +++ b/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; /** diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderMapper.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderMapper.java index a55f6051..a2c18dea 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderMapper.java +++ b/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; /** diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouRefundMapper.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouRefundMapper.java index d1b4a8c4..59cc5c43 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouRefundMapper.java +++ b/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; /** diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java index 77200e1e..8ad54b83 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java index c2691865..b5c067f3 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderItemService.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderItemService.java index a71a4baf..549e0cca 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderItemService.java +++ b/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; /** diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java index baec9ce6..19eb43f5 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java index 50b7ecea..cabb40ae 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java index 4be54f25..8e79f4c2 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java index 7d891fa9..ef550547 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java index 59d97d5e..630e77ec 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java index 7b3b758c..9e988950 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java +++ b/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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java index 328c4b87..7b23a607 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java +++ b/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; diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsMapper.xml b/serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsMapper.xml index 3a566d65..8ee1b9e3 100644 --- a/serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsMapper.xml +++ b/serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml b/serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml index d1256f3d..a84399ca 100644 --- a/serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml +++ b/serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -51,7 +51,7 @@ name,img,pull_time,modify_time - 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 diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouOrderItemMapper.xml b/serviceImpl/dou/src/main/resources/mapper/dou/DouOrderItemMapper.xml index d274c5d3..f7776285 100644 --- a/serviceImpl/dou/src/main/resources/mapper/dou/DouOrderItemMapper.xml +++ b/serviceImpl/dou/src/main/resources/mapper/dou/DouOrderItemMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouOrderMapper.xml b/serviceImpl/dou/src/main/resources/mapper/dou/DouOrderMapper.xml index ec1eeca8..d82a91ab 100644 --- a/serviceImpl/dou/src/main/resources/mapper/dou/DouOrderMapper.xml +++ b/serviceImpl/dou/src/main/resources/mapper/dou/DouOrderMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouRefundMapper.xml b/serviceImpl/dou/src/main/resources/mapper/dou/DouRefundMapper.xml index 4e7ada5d..fb8623e5 100644 --- a/serviceImpl/dou/src/main/resources/mapper/dou/DouRefundMapper.xml +++ b/serviceImpl/dou/src/main/resources/mapper/dou/DouRefundMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +