diff --git a/core/common/src/main/java/com/qihang/common/common/ResultVoEnum.java b/core/common/src/main/java/com/qihang/common/common/ResultVoEnum.java index 58fbf280..ab280d74 100644 --- a/core/common/src/main/java/com/qihang/common/common/ResultVoEnum.java +++ b/core/common/src/main/java/com/qihang/common/common/ResultVoEnum.java @@ -8,10 +8,11 @@ package com.qihang.common.common; */ public enum ResultVoEnum { SUCCESS("成功", 0), + TokenFail("Token失效",401), NotFound("NotFound", 404),//没有找到 Unable("Unable", 403),//无法处理 // NotLogin("未登录", 400),//未登录 - Cancelled("Cancelled", 401),//已经取消的 + Cancelled("Cancelled", 408),//已经取消的 StateError("StateError", 402),//状态错误 Locking("Locking", 405),//锁定，不能操作 NumberLess("数量不足", 406), diff --git a/core/common/src/main/java/com/qihang/common/enums/EnumShopType.java b/core/common/src/main/java/com/qihang/common/enums/EnumShopType.java index 343c1f08..eb693c1b 100644 --- a/core/common/src/main/java/com/qihang/common/enums/EnumShopType.java +++ b/core/common/src/main/java/com/qihang/common/enums/EnumShopType.java @@ -12,6 +12,7 @@ public enum EnumShopType { JD("京东", 2), DOUDIAN("抖音", 3), WEI("微信视频号小店", 5), + KWAI("快手小店", 6), PDD("拼多多", 4); private String name; private int index; diff --git a/doc/sql/qihang-oms.sql b/doc/sql/qihang-oms.sql index 753c6bf9..1d1b447b 100644 --- a/doc/sql/qihang-oms.sql +++ b/doc/sql/qihang-oms.sql @@ -1615,29 +1615,6 @@ INSERT INTO `sys_menu` VALUES (117, '菜单管理', 5, 1, 'menu', 'system/menu/i INSERT INTO `sys_menu` VALUES (2078, '添加ERP商品', 4, 9, 'goods_add', 'goods/create', NULL, 1, 0, 'C', '0', '0', NULL, 'checkbox', 'admin', '2024-03-18 07:59:57', '', NULL, ''); INSERT INTO `sys_menu` VALUES (2079, '字典管理', 5, 9, 'dict', 'system/dict/index', NULL, 1, 0, 'C', '0', '0', '', 'dict', 'admin', '2024-03-18 08:43:55', 'admin', '2024-03-18 08:44:08', ''); --- ---------------------------- --- Table structure for sys_platform --- ---------------------------- -DROP TABLE IF EXISTS `sys_platform`; -CREATE TABLE `sys_platform` ( - `id` int(0) NOT NULL, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台名', - `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台编码', - `app_key` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, - `app_secret` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL, - `redirect_uri` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '平台回调uri', - `server_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '接口访问地址', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of sys_platform --- ---------------------------- -INSERT INTO `sys_platform` VALUES (1, '天猫', 'TMALL', '', '', NULL, NULL); -INSERT INTO `sys_platform` VALUES (2, '京东', 'JD', '', '', '', ''); -INSERT INTO `sys_platform` VALUES (3, '抖店', 'DOUDIAN', '', '', NULL, NULL); -INSERT INTO `sys_platform` VALUES (4, '拼多多', 'PDD', '', '', NULL, NULL); -INSERT INTO `sys_platform` VALUES (5, '视频号小店', 'WEI', '', NULL, NULL, 'https://api.weixin.qq.com'); -- ---------------------------- -- Table structure for sys_post @@ -1809,39 +1786,6 @@ INSERT INTO `sys_role_menu` VALUES (2, 1058); INSERT INTO `sys_role_menu` VALUES (2, 1059); INSERT INTO `sys_role_menu` VALUES (2, 1060); --- ---------------------------- --- Table structure for sys_shop --- ---------------------------- -DROP TABLE IF EXISTS `sys_shop`; -CREATE TABLE `sys_shop` ( - `id` int(0) NOT NULL AUTO_INCREMENT COMMENT '主键', - `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '店铺名', - `type` int(0) NOT NULL COMMENT '对应第三方平台Id', - `url` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '店铺url', - `sort` int(0) NOT NULL DEFAULT 9 COMMENT '排序', - `status` int(0) DEFAULT 0 COMMENT '状态（1正常2已删除）', - `modify_on` bigint(0) NOT NULL COMMENT '更新时间', - `remark` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '描述', - `seller_id` bigint(0) NOT NULL DEFAULT 0 COMMENT '第三方平台店铺id，淘宝天猫开放平台使用', - `app_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'Appkey', - `app_sercet` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'Appsercet', - `access_token` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '第三方平台sessionKey（access_token）', - `expires_in` bigint(0) DEFAULT NULL COMMENT '到期', - `access_token_begin` bigint(0) DEFAULT NULL COMMENT 'access_token开始时间', - `refresh_token` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '刷新token', - `refresh_token_timeout` bigint(0) DEFAULT NULL COMMENT '刷新token过期时间', - `api_request_url` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '请求url', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 23 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数据中心-店铺' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of sys_shop --- ---------------------------- -INSERT INTO `sys_shop` VALUES (1, '天猫旗舰店', 1, '', 98, 1, 0, '', 59972781, '', '', '', NULL, NULL, NULL, NULL, 'http://gw.api.taobao.com/router/rest'); -INSERT INTO `sys_shop` VALUES (2, '京东旗舰店', 2, NULL, 9, 1, 0, NULL, 10706, NULL, NULL, '', 31535999, NULL, '', NULL, NULL); -INSERT INTO `sys_shop` VALUES (3, '抖音旗舰店', 3, 'http://openapi.jinritemai.com', 87, 1, 1653672695, NULL, 0, '', '', '', NULL, NULL, NULL, NULL, '2'); -INSERT INTO `sys_shop` VALUES (5, '拼多多旗舰店', 4, NULL, 99, 1, 1680698886, '', 100061591, NULL, NULL, '', NULL, NULL, NULL, NULL, NULL); -INSERT INTO `sys_shop` VALUES (6, '视频号小店', 5, NULL, 9, 0, 0, NULL, 0, '', '', '', NULL, NULL, NULL, NULL, 'https://api.weixin.qq.com'); -- ---------------------------- -- Table structure for sys_shop_pull_lasttime diff --git a/open-api/kwai-api/libs/kuaishou-merchant-open-sdk-1.0.10.jar b/open-api/kwai-api/libs/kuaishou-merchant-open-sdk-1.0.10.jar new file mode 100644 index 00000000..b654954a Binary files /dev/null and b/open-api/kwai-api/libs/kuaishou-merchant-open-sdk-1.0.10.jar differ diff --git a/open-api/kwai-api/pom.xml b/open-api/kwai-api/pom.xml new file mode 100644 index 00000000..acf9a5c0 --- /dev/null +++ b/open-api/kwai-api/pom.xml @@ -0,0 +1,30 @@ + + 4.0.0 + + com.qihang + open-api + 1.0.0 + + + com.qihang.kwai + kwai-api + jar + + kwai-api + http://maven.apache.org + + + UTF-8 + + + + + kuaishou + kuaishou-merchant-open-sdk- + 1.0.10 + system + ${project.basedir}/libs/kuaishou-merchant-open-sdk-1.0.10.jar + + + diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/KwaiApi.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/KwaiApi.java new file mode 100644 index 00000000..5aad4861 --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/KwaiApi.java @@ -0,0 +1,15 @@ +package com.qihang.kwai; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + +@ComponentScan(basePackages={"com.qihang"}) +@SpringBootApplication +public class KwaiApi { + public static void main( String[] args ) + { + System.out.println( "Hello kwai-api!" ); + SpringApplication.run(KwaiApi.class, args); + } +} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/common/PullRequest.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/common/PullRequest.java new file mode 100644 index 00000000..b19481a4 --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/common/PullRequest.java @@ -0,0 +1,8 @@ +package com.qihang.kwai.common; + +import lombok.Data; + +@Data +public class PullRequest { + private Integer shopId;//店铺Id +} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/config/MybatisPlusConfig.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/config/MybatisPlusConfig.java new file mode 100644 index 00000000..6eeb92b7 --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/config/MybatisPlusConfig.java @@ -0,0 +1,19 @@ +package com.qihang.kwai.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@MapperScan("com.qihang.kwai.mapper") +public class MybatisPlusConfig { + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); //注意使用哪种数据库 + return interceptor; + } +} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/controller/AjaxOrderKwaiController.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/controller/AjaxOrderKwaiController.java new file mode 100644 index 00000000..7c7b1aef --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/controller/AjaxOrderKwaiController.java @@ -0,0 +1,213 @@ +package com.qihang.kwai.controller; + +import com.kuaishou.merchant.open.api.KsMerchantApiException; +import com.kuaishou.merchant.open.api.client.AccessTokenKsMerchantClient; +import com.kuaishou.merchant.open.api.request.KsMerchantOrderListRequest; +import com.kuaishou.merchant.open.api.request.KsMerchantOrderLogisticsUpdateRequest; +import com.kuaishou.merchant.open.api.response.KsMerchantOrderListResponse; +import com.qihang.common.common.AjaxResult; +import com.qihang.common.common.ResultVo; +import com.qihang.common.common.ResultVoEnum; +import com.qihang.common.enums.EnumShopType; +import com.qihang.kwai.common.PullRequest; +import com.qihang.kwai.domain.KwaiOrder; +import com.qihang.kwai.service.KwaiOrderService; +import com.qihang.kwai.service.SysPlatformService; +import com.qihang.kwai.service.SysShopService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.math.BigDecimal; +import java.util.*; + +@RequestMapping("/order") +@RestController +public class AjaxOrderKwaiController { + private static Logger log = LoggerFactory.getLogger(AjaxOrderKwaiController.class); + @Autowired + private SysPlatformService platformService; + @Autowired + private KwaiOrderService kwaiOrderService; + @Autowired + private SysShopService shopService; +// private static String appKey="ks701717119425407331"; +// // 对应授权商家快手账号 +// private static long sellerId = 1372638315L; + + @RequestMapping(value = "/pull_order", method = RequestMethod.POST) + public AjaxResult getOrderList(@RequestBody PullRequest reqData){ + Integer shopId = reqData.getShopId(); + var shop = shopService.getById(shopId); + var platform = platformService.getById(EnumShopType.KWAI.getIndex()); +// String accessToken = shop.getAccessToken(); +// String startDate = "";//reqData.getString("startTime"); +// String endDate = "";//reqData.getString("endTime"); + + Long endTime = System.currentTimeMillis() / 1000;//订单更新结束时间 + Long startTime = endTime-(60 * 60 * 24 * 1);//订单更新开始时间 + +// if(!StringUtils.isEmpty(startDate))startTime = DateUtil.dateToStamp(startDate).longValue(); + +// if (!StringUtils.isEmpty(endDate)) endTime = DateUtil.dateTimeToStamp(endDate + " 23:59:00").longValue(); + + + long kaishidaojiesu = endTime - startTime; + long forSize = (kaishidaojiesu % (60 * 60 * 24) == 0) ? kaishidaojiesu / (60 * 60 * 24) : kaishidaojiesu / (60 * 60 * 24) + 1;//计算需要循环的次数 + +// log.info("开始循环更新快手订单。开始时间：" + DateUtil.unixTimeStampToDate(startTime) + "结束时间：" + DateUtil.unixTimeStampToDate(endTime) + "总共循环" + forSize); + int pageIndex = 1; + int pageSize = 50; + + ResultVo result=null; + for (int i = 0; i < forSize; i++) { + Long startTime1 = startTime + i * 60 * 60 * 24; + Long endTime1 = startTime1 + 60 * 60 * 24; + result = this.pullOrder(platform.getAppKey(),shop.getSellerId(), pageIndex,pageSize,shop.getAccessToken(), startTime1, endTime1); + + if(result.getCode()>0) return AjaxResult.error(result.getCode(), result.getMsg()); + //计算总页数 + int totalPage = (result.getData().intValue() % pageSize == 0) ? result.getData().intValue() / pageSize : (result.getData().intValue() / pageSize) + 1; + + while (pageIndex < totalPage) { + pageIndex++; + result = this.pullOrder(platform.getAppKey(),shop.getSellerId(),pageIndex,pageSize,shop.getAccessToken(), startTime1, endTime1); + } + pageIndex=1; + } + return AjaxResult.success(); + } + + public ResultVo pullOrder(String appKey,Long sellerId,Integer pageIndex, Integer pageSize, String token, Long startTime, Long endTime) { + + AccessTokenKsMerchantClient tokenKsMerchantClient = new AccessTokenKsMerchantClient(appKey); + KsMerchantOrderListRequest ksMerchantOrderListRequest = new KsMerchantOrderListRequest(); + + // common param + ksMerchantOrderListRequest.setAccessToken(token); + ksMerchantOrderListRequest.setUid(sellerId); + ksMerchantOrderListRequest.setApiMethodVersion(1); + // business param + ksMerchantOrderListRequest.setType(1); + ksMerchantOrderListRequest.setQueryType(2); + ksMerchantOrderListRequest.setSellerId(sellerId); + ksMerchantOrderListRequest.setCurrentPage(pageIndex); + ksMerchantOrderListRequest.setPageSize(pageSize); + ksMerchantOrderListRequest.setBeginTime(startTime*1000);//时间范围只能24小时 + ksMerchantOrderListRequest.setEndTime(endTime*1000); + ksMerchantOrderListRequest.setPcursor(""); + + // api invoke + try { + KsMerchantOrderListResponse response = tokenKsMerchantClient.execute(ksMerchantOrderListRequest); + if(!StringUtils.isEmpty(response.getErrorMsg()) && response.getResult()==24) + return ResultVo.error(ResultVoEnum.TokenFail.getIndex(), "异常："+response.getErrorMsg()); + if(!StringUtils.isEmpty(response.getErrorMsg()) && response.getResult()!=24) + return ResultVo.error(ResultVoEnum.SystemException.getIndex(), "异常："+response.getErrorMsg()); + + var list= response.getMerchantOrderListData().getOrderInfoList(); + for(var obj :list){ + KwaiOrder order= new KwaiOrder(); +// var address = JsonUtil.strToObject(obj.getAddress(),DcKwaiAddressVo.class); + order.setOid(obj.getOid()); + Long discountFee=obj.getDiscountFee(); + order.setDiscountfee(obj.getDiscountFee()>0 ? new BigDecimal(discountFee/100) : new BigDecimal(0)); + Long expressFee=obj.getExpressFee(); + order.setExpressfee(obj.getExpressFee()>0 ? new BigDecimal(expressFee.doubleValue() /100) : new BigDecimal(0)); + order.setNum(obj.getNum()); +// order.setConsignee(address.getConsignee()); +// order.setMobile(address.getMobile()); +// order.setPaytime(obj.getPayTime()>0 ? obj.getPayTime()/1000 : 0L); +// order.setBuyerRemark(obj.getRemark()); +// order.setSellerRemark(obj.getSellerNoteList().toString()); +// order.setStatus(obj.getStatus()); +// order.setRefund(obj.getRefund()); +// Long totalFee=obj.getTotalFee(); +// order.setTotalfee(totalFee>0 ? new BigDecimal(totalFee.doubleValue()/100) : new BigDecimal(0)); +// order.setProvince(address.getProvince()); +// order.setCity(address.getCity()); +// order.setDistrict(address.getDistrict()); +// StringBuilder sb= new StringBuilder(address.getProvince()).append(address.getCity()).append(address.getDistrict()).append(address.getAddress()); +// order.setAddress(sb.toString()); +// order.setCreatetime(obj.getCreateTime()>0 ? obj.getCreateTime()/1000 :0L); +// List items = new ArrayList<>(); +// for(var kwaiItem:obj.getOrderProductInfoList()){ +// DcKwaiOrdersItemEntity item=new DcKwaiOrdersItemEntity(); +// item.setItemid(kwaiItem.getItemId()); +// item.setItempicurl(kwaiItem.getItemPicUrl()); +// Long price=kwaiItem.getPrice(); +// item.setPrice(price>0 ? new BigDecimal(price.doubleValue()/100) : new BigDecimal(0)); +// item.setRefundId(kwaiItem.getRefundId()); +// item.setRefundStatus(kwaiItem.getRefundStatus()); +// item.setSkunick(StringUtils.isEmpty(kwaiItem.getSkuNick()) ? "" : kwaiItem.getSkuNick()); +// item.setItemtitle(kwaiItem.getItemTitle()); +// item.setNum(kwaiItem.getNum()); +// item.setGoodsspec(kwaiItem.getSkuDesc()); +// items.add(item); +// } +// order.setItems(items); +// var result= kwaiOrderService.editKwaiOrder(order); + log.info(order.getOid()+"更新:"); + } + return ResultVo.success(response.getMerchantOrderListData().getTotalSize()); + } catch (KsMerchantApiException e) { + return ResultVo.error(ResultVoEnum.Fail.getIndex(), "异常："+e.getErrorMsg()); + } + } + /** + * 订单确认 + * @return + */ +// @RequestMapping(value = "/affirm_order", method = RequestMethod.POST) +// public ApiResult orderAffirm(@RequestBody OrderConfirmReq req){ +// if (req.getOrderId() == null || req.getOrderId() <= 0) +// return new ApiResult<>(ApiResultEnum.ParamsError.getIndex(), "参数错误，缺少orderId"); +// +// if (StringUtils.isEmpty(req.getClientId()))req.setClientId(0); +// +// if (StringUtils.isEmpty(req.getReceiver())) +// return new ApiResult<>(ApiResultEnum.ParamsError.getIndex(), "参数错误，缺少receiver"); +// if (StringUtils.isEmpty(req.getMobile())) +// return new ApiResult<>(ApiResultEnum.ParamsError.getIndex(), "参数错误，缺少mobile"); +// if (StringUtils.isEmpty(req.getAddress())) +// return new ApiResult<>(ApiResultEnum.ParamsError.getIndex(), "参数错误，缺少address"); +// var result = kwaiOrderService.kwaiOrderAffirm(req.getOrderId(),req.getClientId(),req.getReceiver(), req.getMobile(), req.getAddress(), req.getSellerMemo()); +// return new ApiResult<>(result.getCode(), result.getMsg()); +// } +// /** +// * 订单发货 +// * @param req +// * @return +// */ +// @RequestMapping(value = "/send_order", method = RequestMethod.POST) +// public ApiResult orderSend(@RequestBody DataRow req){ +// if(StringUtils.isEmpty(req.get("orderId")))return new ApiResult<>(EnumResultVo.ParamsError.getIndex(),"参数错误，订单id不能为空"); +// if(StringUtils.isEmpty(req.get("code")))return new ApiResult<>(EnumResultVo.ParamsError.getIndex(),"参数错误，快递单号不能为空"); +// Integer shopId = 13; +// var shop = shopService.getShop(shopId); +// var settingEntity = thirdSettingService.getEntity(shop.getType()); +// AccessTokenKsMerchantClient tokenKsMerchantClient = new AccessTokenKsMerchantClient(appKey); +// KsMerchantOrderLogisticsUpdateRequest ksMerchantLogisticsRequest=new KsMerchantOrderLogisticsUpdateRequest(); +// try { +// ksMerchantLogisticsRequest.setAccessToken(settingEntity.getAccess_token()); +// ksMerchantLogisticsRequest.setUid(sellerId); +// ksMerchantLogisticsRequest.setApiMethodVersion(1); +// ksMerchantLogisticsRequest.setOrderId(req.getLong("orderId")); +// ksMerchantLogisticsRequest.setExpressCode(EnumKwaiExpressCodeVo.getIndex(req.getString("name"))); +// ksMerchantLogisticsRequest.setExpressNo(req.getString("code")); +// ksMerchantLogisticsRequest.setSellerId(sellerId); +// var ksResponse = tokenKsMerchantClient.execute(ksMerchantLogisticsRequest); +// if(ksResponse.getResult()==1){ +// kwaiOrderService.updKwaiOrderStatus(req.getLong("orderId")); +// return new ApiResult<>(ApiResultEnum.SUCCESS.getIndex(), "成功"); +// }else return new ApiResult<>(ApiResultEnum.Fail.getIndex(), ksResponse.getErrorMsg()); +// }catch (KsMerchantApiException e) { +// return new ApiResult<>(ApiResultEnum.Fail.getIndex(), "异常："+e.getErrorMsg()); +// } +// } +} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/controller/HomeController.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/controller/HomeController.java new file mode 100644 index 00000000..9e7b2477 --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/controller/HomeController.java @@ -0,0 +1,4 @@ +package com.qihang.kwai.controller; + +public class HomeController { +} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/controller/KwaiOAuthController.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/controller/KwaiOAuthController.java new file mode 100644 index 00000000..3c738a68 --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/controller/KwaiOAuthController.java @@ -0,0 +1,73 @@ +package com.qihang.kwai.controller; + +import com.kuaishou.merchant.open.api.KsMerchantApiException; +import com.kuaishou.merchant.open.api.client.oauth.OauthAccessTokenKsClient; +import com.kuaishou.merchant.open.api.response.KsAccessTokenResponse; +import com.qihang.common.enums.EnumShopType; +import com.qihang.kwai.service.SysPlatformService; +import com.qihang.kwai.service.SysShopService; +import jakarta.servlet.http.HttpServletRequest; +import lombok.AllArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.io.IOException; + +/** + * 描述： + * 阿里授权Controller + * + * @author qlp + * @date 2019-09-12 14:13 + */ +@AllArgsConstructor +@RequestMapping("/kwai") +@RestController +public class KwaiOAuthController { + + private final SysPlatformService platformService; + private final SysShopService shopService; + private static String clientId="ks701717119425407331"; + private static String clientSecret="0qBrIYOPrqGb8SM9ouVx9w"; + private static Logger log = LoggerFactory.getLogger(KwaiOAuthController.class); + + + /** + * 调取授权页面 + * @return + * @throws IOException + * @throws InterruptedException + */ + @RequestMapping("/callback") + public String aliOAuth(HttpServletRequest req) throws IOException, InterruptedException { + String grantCode = req.getParameter("code"); + String shopId = req.getParameter("state"); + + OauthAccessTokenKsClient oauthAccessTokenKsClient = new OauthAccessTokenKsClient(clientId, clientSecret); + try { + KsAccessTokenResponse response = oauthAccessTokenKsClient.getAccessToken(grantCode); + Long expireIn=response.getExpiresIn(); + shopService.updateAccessToken(Integer.parseInt(shopId), response.getAccessToken(), response.getRefreshToken(),expireIn); + } catch (KsMerchantApiException e) { + e.printStackTrace(); + } + return "redirect:/"; + } + + @RequestMapping("/oauth2") + public String callback(@RequestParam Integer shopId) throws IOException, InterruptedException { + + var platform = platformService.getById(EnumShopType.KWAI.getIndex()); + String redirect_uri = platform.getRedirectUri(); + String appId= platform.getAppKey(); + + String url = "https://s.kwaixiaodian.com/oauth/authorize?response_type=code&app_id="+appId+"&scope=user_info,merchant_item,merchant_order,merchant_refund&redirect_uri="+redirect_uri+"&state="+shopId; + + return url; + } +} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/controller/KwaiOrderController.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/controller/KwaiOrderController.java new file mode 100644 index 00000000..c31cdf3f --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/controller/KwaiOrderController.java @@ -0,0 +1,110 @@ +//package com.qihang.kwai.controller; +// +//import com.qihang.kwai.service.KwaiOrderService; +//import com.qihang.kwai.service.SysShopService; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Controller; +//import org.springframework.ui.Model; +//import org.springframework.util.StringUtils; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RequestMethod; +//import org.springframework.web.bind.annotation.RequestParam; +//import org.springframework.web.bind.annotation.RestController; +// +///** +// * 描述： +// * +// * @author qlp +// * @date 2019-11-13 14:44 +// */ +//@RestController +//@RequestMapping("/kwai") +//public class KwaiOrderController { +// @Autowired +// private SysShopService shopService; +// @Autowired +// private KwaiOrderService kwaiOrderService; +// /** +// * 订单列表 +// * @param model +// * @param request +// * @return +// */ +// @RequestMapping("/order_list") +// public String orderList(){ +// Integer shopId= 13; +// //查询店铺信息 +// var shop = shopService.getShop(shopId); +// model.addAttribute("shop",shop); +// +// model.addAttribute("menuId","order_list"); +// model.addAttribute("shopId",shopId); +// String orderNum=""; +// if (!StringUtils.isEmpty(request.getParameter("orderNum"))) { +// orderNum = request.getParameter("orderNum"); +// model.addAttribute("orderNum", orderNum); +// } +// String status=""; +// if (!StringUtils.isEmpty(request.getParameter("status"))) status = request.getParameter("status"); +// Integer startTime=null; +// if (!StringUtils.isEmpty(request.getParameter("startTime"))){ +// startTime = DateUtil.dateToStamp(request.getParameter("startTime")) ; +// model.addAttribute("startTime",request.getParameter("startTime")); +// } +// Integer endTime=null; +// if (!StringUtils.isEmpty(request.getParameter("endTime"))) { +// endTime = DateUtil.dateTimeToStamp(request.getParameter("endTime") + " 23:59:59"); +// model.addAttribute("endTime",request.getParameter("endTime")); +// } +// Integer pageIndex = 1, pageSize = DataConfigObject.getInstance().getPageSize(); +// if (!StringUtils.isEmpty(request.getParameter("page"))) { +// pageIndex = Integer.parseInt(request.getParameter("page")); +// } +// +// PagingResponse result =kwaiOrderService.getKwaiOrders(pageIndex,pageSize,orderNum,startTime,endTime,status); +// model.addAttribute("pageIndex", pageIndex); +// model.addAttribute("pageSize", pageSize); +// model.addAttribute("totalSize", result.getTotalSize()); +// model.addAttribute("lists", result.getList()); +// +// return "v3/order_list_kwai"; +// } +// /** +// * 订单详情（douyin） +// * +// * @param model +// * @param id +// * @param shopId +// * @param request +// * @return +// */ +// @RequestMapping(value = "/orderDetail", method = RequestMethod.GET) +// public String orderDetailTmall(Model model, @RequestParam Long id, @RequestParam Integer shopId, HttpServletRequest request) { +// +// DcKwaiOrderEntity orderDetail = kwaiOrderService.getOderDetailByOrderId(id); +// +// model.addAttribute("orderVo", orderDetail); +// +// //查询店铺信息 +// var shop = shopService.getShop(shopId); +// model.addAttribute("shop", shop); +// model.addAttribute("menuId", "order_list"); +// +// return "v3/order_detail_kwai"; +// } +// +// /** +// * 订单确认页面 +// * @param model +// * @param orderId +// * @param request +// * @return +// */ +// @RequestMapping("/order_confirm") +// public String orderList(Model model,@RequestParam Long orderId, HttpServletRequest request){ +// DcKwaiOrderEntity orderDetail = kwaiOrderService.getOderDetailByOrderId(orderId); +// model.addAttribute("orderVo", orderDetail); +// +// return "v3/order_confirm_kwai"; +// } +//} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/KwaiOrder.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/KwaiOrder.java new file mode 100644 index 00000000..d8aa34f6 --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/KwaiOrder.java @@ -0,0 +1,139 @@ +package com.qihang.kwai.domain; + +import java.io.Serializable; +import java.math.BigDecimal; +import lombok.Data; + +/** + * 快手订单 + * @TableName kwai_order + */ +@Data +public class KwaiOrder implements Serializable { + /** + * dc订单id + */ + private Long id; + + /** + * 快手订单id + */ + private Long oid; + + /** + * 创建时间 + */ + private Long createtime; + + /** + * 折扣价格 + */ + private BigDecimal discountfee; + + /** + * 运费 + */ + private BigDecimal expressfee; + + /** + * sku数量 + */ + private Integer num; + + /** + * 收件人姓名 + */ + private String consignee; + + /** + * 收件人手机号 + */ + private String mobile; + + /** + * 支付时间 + */ + private Long paytime; + + /** + * 买家备注 + */ + private String buyerremark; + + /** + * 卖家备注 + */ + private String sellerremark; + + /** + * 订单状态 + */ + private Integer status; + + /** + * 是否退款 0未退款 1该订单申请过退款 + */ + private Integer refund; + + /** + * 子订单商品总价 + */ + private BigDecimal totalfee; + + /** + * 省 + */ + private String province; + + /** + * 市 + */ + private String city; + + /** + * 区 + */ + private String district; + + /** + * 详细地址 + */ + private String address; + + /** + * 快递公司 + */ + private String logisticscompany; + + /** + * 快递公司编码 + */ + private String logisticscompanycode; + + /** + * 快递单号 + */ + private String logisticscode; + + /** + * 订单审核状态（0待审核1已审核） + */ + private Integer auditstatus; + + /** + * 创建时间 + */ + private Long createon; + + /** + * 发货状态（0待出库1拣货中2已拣货3已出库4已发货） + */ + private Integer sendstatus; + + /** + * 发货时间（仓库真实发货时间） + */ + private Long sendtime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/KwaiOrdersItem.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/KwaiOrdersItem.java new file mode 100644 index 00000000..e215f3c5 --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/KwaiOrdersItem.java @@ -0,0 +1,93 @@ +package com.qihang.kwai.domain; + +import java.io.Serializable; +import lombok.Data; + +/** + * + * @TableName kwai_orders_item + */ +@Data +public class KwaiOrdersItem implements Serializable { + /** + * id，自增 + */ + private Long id; + + /** + * 快手子订单id + */ + private Long itemid; + + /** + * 订单ID + */ + private Long orderid; + + /** + * erp系统商品id + */ + private Integer erpgoodsid; + + /** + * erp系统商品规格id + */ + private Integer erpgoodsspecid; + + /** + * 商品名称 + */ + private String itemtitle; + + /** + * 商品图片 + */ + private String itempicurl; + + /** + * 商品编码 + */ + private String goodsnum; + + /** + * 商品规格 + */ + private String goodsspec; + + /** + * 商品规格编码 + */ + private String skunick; + + /** + * 商品单价 + */ + private Double price; + + /** + * 商品数量 + */ + private Integer num; + + /** + * 退货Id + */ + private Long refundid; + + /** + * 退货状态 + */ + private Integer refundstatus; + + /** + * + */ + private String remark; + + /** + * 是否赠品0:否1:是 + */ + private Integer isgift; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/SysPlatform.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/SysPlatform.java new file mode 100644 index 00000000..098642ca --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/SysPlatform.java @@ -0,0 +1,48 @@ +package com.qihang.kwai.domain; + +import java.io.Serializable; +import lombok.Data; + +/** + * + * @TableName sys_platform + */ +@Data +public class SysPlatform implements Serializable { + /** + * + */ + private Integer id; + + /** + * 平台名 + */ + private String name; + + /** + * 平台编码 + */ + private String code; + + /** + * + */ + private String appKey; + + /** + * + */ + private String appSecret; + + /** + * 平台回调uri + */ + private String redirectUri; + + /** + * 接口访问地址 + */ + private String serverUrl; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/SysShop.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/SysShop.java new file mode 100644 index 00000000..01c247ce --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/SysShop.java @@ -0,0 +1,98 @@ +package com.qihang.kwai.domain; + +import java.io.Serializable; +import lombok.Data; + +/** + * 数据中心-店铺 + * @TableName sys_shop + */ +@Data +public class SysShop implements Serializable { + /** + * 主键 + */ + private Integer id; + + /** + * 店铺名 + */ + private String name; + + /** + * 对应第三方平台Id + */ + private Integer type; + + /** + * 店铺url + */ + private String url; + + /** + * 排序 + */ + private Integer sort; + + /** + * 状态（1正常2已删除） + */ + private Integer status; + + /** + * 更新时间 + */ + private Long modifyOn; + + /** + * 描述 + */ + private String remark; + + /** + * 第三方平台店铺id，淘宝天猫开放平台使用 + */ + private Long sellerId; + + /** + * Appkey + */ + private String appKey; + + /** + * Appsercet + */ + private String appSercet; + + /** + * 第三方平台sessionKey（access_token） + */ + private String accessToken; + + /** + * 到期 + */ + private Long expiresIn; + + /** + * access_token开始时间 + */ + private Long accessTokenBegin; + + /** + * 刷新token + */ + private String refreshToken; + + /** + * 刷新token过期时间 + */ + private Long refreshTokenTimeout; + + /** + * 请求url + */ + private String apiRequestUrl; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/KwaiOrderMapper.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/KwaiOrderMapper.java new file mode 100644 index 00000000..f5e45fda --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/KwaiOrderMapper.java @@ -0,0 +1,18 @@ +package com.qihang.kwai.mapper; + +import com.qihang.kwai.domain.KwaiOrder; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【kwai_order(快手订单)】的数据库操作Mapper +* @createDate 2024-03-30 10:04:16 +* @Entity com.qihang.kwai.domain.KwaiOrder +*/ +public interface KwaiOrderMapper extends BaseMapper { + +} + + + + diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/KwaiOrdersItemMapper.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/KwaiOrdersItemMapper.java new file mode 100644 index 00000000..7d727a0d --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/KwaiOrdersItemMapper.java @@ -0,0 +1,18 @@ +package com.qihang.kwai.mapper; + +import com.qihang.kwai.domain.KwaiOrdersItem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【kwai_orders_item】的数据库操作Mapper +* @createDate 2024-03-30 10:04:16 +* @Entity com.qihang.kwai.domain.KwaiOrdersItem +*/ +public interface KwaiOrdersItemMapper extends BaseMapper { + +} + + + + diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/SysPlatformMapper.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/SysPlatformMapper.java new file mode 100644 index 00000000..59b93847 --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/SysPlatformMapper.java @@ -0,0 +1,18 @@ +package com.qihang.kwai.mapper; + +import com.qihang.kwai.domain.SysPlatform; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【sys_platform】的数据库操作Mapper +* @createDate 2024-03-30 10:04:16 +* @Entity com.qihang.kwai.domain.SysPlatform +*/ +public interface SysPlatformMapper extends BaseMapper { + +} + + + + diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/SysShopMapper.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/SysShopMapper.java new file mode 100644 index 00000000..b809ca9d --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/SysShopMapper.java @@ -0,0 +1,18 @@ +package com.qihang.kwai.mapper; + +import com.qihang.kwai.domain.SysShop; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author qilip +* @description 针对表【sys_shop(数据中心-店铺)】的数据库操作Mapper +* @createDate 2024-03-30 10:04:16 +* @Entity com.qihang.kwai.domain.SysShop +*/ +public interface SysShopMapper extends BaseMapper { + +} + + + + diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/SysUserMapper.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/SysUserMapper.java new file mode 100644 index 00000000..4fe879bd --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/mapper/SysUserMapper.java @@ -0,0 +1,130 @@ +package com.qihang.kwai.mapper; + +import com.qihang.security.entity.SysUser; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 用户表 数据层 + * + * @author qihang + */ +@Mapper +public interface SysUserMapper +{ + /** + * 根据条件分页查询用户列表 + * + * @param sysUser 用户信息 + * @return 用户信息集合信息 + */ + public List selectUserList(SysUser sysUser); + + /** + * 根据条件分页查询已配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectAllocatedList(SysUser user); + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + public List selectUnallocatedList(SysUser user); + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + public SysUser selectUserByUserName(String userName); + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + public SysUser selectUserById(Long userId); + + /** + * 新增用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int insertUser(SysUser user); + + /** + * 修改用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + public int updateUser(SysUser user); + + /** + * 修改用户头像 + * + * @param userName 用户名 + * @param avatar 头像地址 + * @return 结果 + */ + public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); + + /** + * 重置用户密码 + * + * @param userName 用户名 + * @param password 密码 + * @return 结果 + */ + public int resetUserPwd(@Param("userName") String userName, @Param("password") String password); + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + public int deleteUserById(Long userId); + + /** + * 批量删除用户信息 + * + * @param userIds 需要删除的用户ID + * @return 结果 + */ + public int deleteUserByIds(Long[] userIds); + + /** + * 校验用户名称是否唯一 + * + * @param userName 用户名称 + * @return 结果 + */ + public SysUser checkUserNameUnique(String userName); + + /** + * 校验手机号码是否唯一 + * + * @param phonenumber 手机号码 + * @return 结果 + */ + public SysUser checkPhoneUnique(String phonenumber); + + /** + * 校验email是否唯一 + * + * @param email 用户邮箱 + * @return 结果 + */ + public SysUser checkEmailUnique(String email); +} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/service/KwaiOrderService.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/KwaiOrderService.java new file mode 100644 index 00000000..954c137b --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/KwaiOrderService.java @@ -0,0 +1,13 @@ +package com.qihang.kwai.service; + +import com.qihang.kwai.domain.KwaiOrder; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【kwai_order(快手订单)】的数据库操作Service +* @createDate 2024-03-30 10:04:16 +*/ +public interface KwaiOrderService extends IService { + +} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/service/KwaiOrdersItemService.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/KwaiOrdersItemService.java new file mode 100644 index 00000000..b46bca62 --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/KwaiOrdersItemService.java @@ -0,0 +1,13 @@ +package com.qihang.kwai.service; + +import com.qihang.kwai.domain.KwaiOrdersItem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【kwai_orders_item】的数据库操作Service +* @createDate 2024-03-30 10:04:16 +*/ +public interface KwaiOrdersItemService extends IService { + +} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/service/SysPlatformService.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/SysPlatformService.java new file mode 100644 index 00000000..e964921e --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/SysPlatformService.java @@ -0,0 +1,13 @@ +package com.qihang.kwai.service; + +import com.qihang.kwai.domain.SysPlatform; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【sys_platform】的数据库操作Service +* @createDate 2024-03-30 10:04:16 +*/ +public interface SysPlatformService extends IService { + +} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/service/SysShopService.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/SysShopService.java new file mode 100644 index 00000000..a4bf378c --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/SysShopService.java @@ -0,0 +1,13 @@ +package com.qihang.kwai.service; + +import com.qihang.kwai.domain.SysShop; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author qilip +* @description 针对表【sys_shop(数据中心-店铺)】的数据库操作Service +* @createDate 2024-03-30 10:04:16 +*/ +public interface SysShopService extends IService { + void updateAccessToken(Integer shopId,String accessToken,String refreshToken,Long expireIn); +} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/service/SysUserServiceImpl.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/SysUserServiceImpl.java new file mode 100644 index 00000000..79b68876 --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/SysUserServiceImpl.java @@ -0,0 +1,298 @@ +package com.qihang.kwai.service; + +import com.qihang.common.common.ServiceException; +import com.qihang.common.constant.UserConstants; +import com.qihang.common.utils.StringUtils; +import com.qihang.kwai.mapper.SysUserMapper; +import com.qihang.security.entity.SysUser; +import com.qihang.security.service.ISysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +/** + * 用户 业务层处理 + * + * @author qihang + */ +@Service +public class SysUserServiceImpl implements ISysUserService +{ + private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class); + + @Autowired + private SysUserMapper userMapper; + + /** + * 根据条件分页查询用户列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + public List selectUserList(SysUser user) + { + return userMapper.selectUserList(user); + } + + /** + * 根据条件分页查询已分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + public List selectAllocatedList(SysUser user) + { + return userMapper.selectAllocatedList(user); + } + + /** + * 根据条件分页查询未分配用户角色列表 + * + * @param user 用户信息 + * @return 用户信息集合信息 + */ + @Override + public List selectUnallocatedList(SysUser user) + { + return userMapper.selectUnallocatedList(user); + } + + /** + * 通过用户名查询用户 + * + * @param userName 用户名 + * @return 用户对象信息 + */ + @Override + public SysUser selectUserByUserName(String userName) + { + return userMapper.selectUserByUserName(userName); + } + + /** + * 通过用户ID查询用户 + * + * @param userId 用户ID + * @return 用户对象信息 + */ + @Override + public SysUser selectUserById(Long userId) + { + return userMapper.selectUserById(userId); + } + + /** + * 校验用户名称是否唯一 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean checkUserNameUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkUserNameUnique(user.getUserName()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验手机号码是否唯一 + * + * @param user 用户信息 + * @return + */ + @Override + public boolean checkPhoneUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验email是否唯一 + * + * @param user 用户信息 + * @return + */ + @Override + public boolean checkEmailUnique(SysUser user) + { + Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + SysUser info = userMapper.checkEmailUnique(user.getEmail()); + if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验用户是否允许操作 + * + * @param user 用户信息 + */ + @Override + public void checkUserAllowed(SysUser user) + { + if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) + { + throw new ServiceException("不允许操作超级管理员用户"); + } + } + + /** + * 新增保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + @Transactional + public int insertUser(SysUser user) + { + // 新增用户信息 + int rows = userMapper.insertUser(user); +// // 新增用户岗位关联 +// insertUserPost(user); +// // 新增用户与角色管理 +// insertUserRole(user); + return rows; + } + + /** + * 注册用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public boolean registerUser(SysUser user) + { + return userMapper.insertUser(user) > 0; + } + + /** + * 修改保存用户信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + @Transactional + public int updateUser(SysUser user) + { + Long userId = user.getUserId(); +// // 删除用户与角色关联 +// userRoleMapper.deleteUserRoleByUserId(userId); +// // 新增用户与角色管理 +// insertUserRole(user); +// // 删除用户与岗位关联 +// userPostMapper.deleteUserPostByUserId(userId); + // 新增用户与岗位管理 +// insertUserPost(user); + return userMapper.updateUser(user); + } + + + /** + * 修改用户状态 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int updateUserStatus(SysUser user) + { + return userMapper.updateUser(user); + } + + /** + * 修改用户基本信息 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int updateUserProfile(SysUser user) + { + return userMapper.updateUser(user); + } + + /** + * 修改用户头像 + * + * @param userName 用户名 + * @param avatar 头像地址 + * @return 结果 + */ + @Override + public boolean updateUserAvatar(String userName, String avatar) + { + return userMapper.updateUserAvatar(userName, avatar) > 0; + } + + /** + * 重置用户密码 + * + * @param user 用户信息 + * @return 结果 + */ + @Override + public int resetPwd(SysUser user) + { + return userMapper.updateUser(user); + } + + /** + * 重置用户密码 + * + * @param userName 用户名 + * @param password 密码 + * @return 结果 + */ + @Override + public int resetUserPwd(String userName, String password) + { + return userMapper.resetUserPwd(userName, password); + } + + + + /** + * 通过用户ID删除用户 + * + * @param userId 用户ID + * @return 结果 + */ + @Override + @Transactional + public int deleteUserById(Long userId) + { +// // 删除用户与角色关联 +// userRoleMapper.deleteUserRoleByUserId(userId); +// // 删除用户与岗位表 +// userPostMapper.deleteUserPostByUserId(userId); + return userMapper.deleteUserById(userId); + } + + @Override + public void checkUserDataScope(Long userId) { + + } + +} diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/service/impl/KwaiOrderServiceImpl.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/impl/KwaiOrderServiceImpl.java new file mode 100644 index 00000000..7e673844 --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/impl/KwaiOrderServiceImpl.java @@ -0,0 +1,22 @@ +package com.qihang.kwai.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qihang.kwai.domain.KwaiOrder; +import com.qihang.kwai.service.KwaiOrderService; +import com.qihang.kwai.mapper.KwaiOrderMapper; +import org.springframework.stereotype.Service; + +/** +* @author qilip +* @description 针对表【kwai_order(快手订单)】的数据库操作Service实现 +* @createDate 2024-03-30 10:04:16 +*/ +@Service +public class KwaiOrderServiceImpl extends ServiceImpl + implements KwaiOrderService{ + +} + + + + diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/service/impl/KwaiOrdersItemServiceImpl.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/impl/KwaiOrdersItemServiceImpl.java new file mode 100644 index 00000000..76179f80 --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/impl/KwaiOrdersItemServiceImpl.java @@ -0,0 +1,22 @@ +package com.qihang.kwai.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qihang.kwai.domain.KwaiOrdersItem; +import com.qihang.kwai.service.KwaiOrdersItemService; +import com.qihang.kwai.mapper.KwaiOrdersItemMapper; +import org.springframework.stereotype.Service; + +/** +* @author qilip +* @description 针对表【kwai_orders_item】的数据库操作Service实现 +* @createDate 2024-03-30 10:04:16 +*/ +@Service +public class KwaiOrdersItemServiceImpl extends ServiceImpl + implements KwaiOrdersItemService{ + +} + + + + diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/service/impl/SysPlatformServiceImpl.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/impl/SysPlatformServiceImpl.java new file mode 100644 index 00000000..e1c4551f --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/impl/SysPlatformServiceImpl.java @@ -0,0 +1,22 @@ +package com.qihang.kwai.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qihang.kwai.domain.SysPlatform; +import com.qihang.kwai.service.SysPlatformService; +import com.qihang.kwai.mapper.SysPlatformMapper; +import org.springframework.stereotype.Service; + +/** +* @author qilip +* @description 针对表【sys_platform】的数据库操作Service实现 +* @createDate 2024-03-30 10:04:16 +*/ +@Service +public class SysPlatformServiceImpl extends ServiceImpl + implements SysPlatformService{ + +} + + + + diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/service/impl/SysShopServiceImpl.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/impl/SysShopServiceImpl.java new file mode 100644 index 00000000..db8d70dd --- /dev/null +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/service/impl/SysShopServiceImpl.java @@ -0,0 +1,34 @@ +package com.qihang.kwai.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qihang.kwai.domain.SysShop; +import com.qihang.kwai.service.SysShopService; +import com.qihang.kwai.mapper.SysShopMapper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** +* @author qilip +* @description 针对表【sys_shop(数据中心-店铺)】的数据库操作Service实现 +* @createDate 2024-03-30 10:04:16 +*/ +@AllArgsConstructor +@Service +public class SysShopServiceImpl extends ServiceImpl + implements SysShopService{ + private final SysShopMapper mapper; + + @Override + public void updateAccessToken(Integer shopId, String accessToken, String refreshToken, Long expireIn) { + SysShop shop =new SysShop(); + shop.setId(shopId); + shop.setAccessToken(accessToken); + shop.setRefreshToken(refreshToken); + shop.setExpiresIn(expireIn); + mapper.updateById(shop); + } +} + + + + diff --git a/open-api/kwai-api/src/main/resources/application.yml b/open-api/kwai-api/src/main/resources/application.yml new file mode 100644 index 00000000..7b775ac2 --- /dev/null +++ b/open-api/kwai-api/src/main/resources/application.yml @@ -0,0 +1,23 @@ +spring: + cloud: + nacos: +# serverAddr: 127.0.0.1:8848 + discovery: + server-addr: 127.0.0.1:8848 + config: + server-addr: 127.0.0.1:8848 + config: + import: + - nacos:qihang-oms.yaml?refresh=true + application: + name: kwai-api + +server: + port: 8088 + + +mybatis-plus: + mapper-locations: classpath*:mapper/**/*Mapper.xml + type-aliases-package: com.qihang.kwai.domain;com.qihang.security.entity; + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志 \ No newline at end of file diff --git a/open-api/kwai-api/src/main/resources/mapper/KwaiOrderMapper.xml b/open-api/kwai-api/src/main/resources/mapper/KwaiOrderMapper.xml new file mode 100644 index 00000000..27da4cce --- /dev/null +++ b/open-api/kwai-api/src/main/resources/mapper/KwaiOrderMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,oid,createTime, + discountFee,expressFee,num, + consignee,mobile,payTime, + buyerRemark,sellerRemark,status, + refund,totalFee,province, + city,district,address, + logisticsCompany,logisticsCompanyCode,logisticsCode, + auditStatus,createOn,sendStatus, + sendTime + + diff --git a/open-api/kwai-api/src/main/resources/mapper/KwaiOrdersItemMapper.xml b/open-api/kwai-api/src/main/resources/mapper/KwaiOrdersItemMapper.xml new file mode 100644 index 00000000..82dc135c --- /dev/null +++ b/open-api/kwai-api/src/main/resources/mapper/KwaiOrdersItemMapper.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id,itemId,orderId, + erpGoodsId,erpGoodsSpecId,itemTitle, + itemPicUrl,goodsNum,goodsSpec, + skuNick,price,num, + refundId,refundStatus,remark, + isGift + + diff --git a/open-api/kwai-api/src/main/resources/mapper/SysPlatformMapper.xml b/open-api/kwai-api/src/main/resources/mapper/SysPlatformMapper.xml new file mode 100644 index 00000000..a0504a1e --- /dev/null +++ b/open-api/kwai-api/src/main/resources/mapper/SysPlatformMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + id,name,code, + app_key,app_secret,redirect_uri, + server_url + + diff --git a/open-api/kwai-api/src/main/resources/mapper/SysShopMapper.xml b/open-api/kwai-api/src/main/resources/mapper/SysShopMapper.xml new file mode 100644 index 00000000..2fb88de6 --- /dev/null +++ b/open-api/kwai-api/src/main/resources/mapper/SysShopMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id,name,type, + url,sort,status, + modify_on,remark,seller_id, + app_key,app_sercet,access_token, + expires_in,access_token_begin,refresh_token, + refresh_token_timeout,api_request_url + + diff --git a/open-api/kwai-api/src/main/resources/mapper/SysUserMapper.xml b/open-api/kwai-api/src/main/resources/mapper/SysUserMapper.xml new file mode 100644 index 00000000..3b4086a0 --- /dev/null +++ b/open-api/kwai-api/src/main/resources/mapper/SysUserMapper.xml @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark + + from sys_user u + + + + + + + + + + + + + + + + + + + + insert into sys_user( + user_id, + dept_id, + user_name, + nick_name, + email, + avatar, + phonenumber, + sex, + password, + status, + create_by, + remark, + create_time + )values( + #{userId}, + #{deptId}, + #{userName}, + #{nickName}, + #{email}, + #{avatar}, + #{phonenumber}, + #{sex}, + #{password}, + #{status}, + #{createBy}, + #{remark}, + current_timestamp() + ) + + + + update sys_user + + dept_id = #{deptId}, + user_name = #{userName}, + nick_name = #{nickName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + status = #{status}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = current_timestamp() + + where user_id = #{userId} + + + + update sys_user set status = #{status} where user_id = #{userId} + + + + update sys_user set avatar = #{avatar} where user_name = #{userName} + + + + update sys_user set password = #{password} where user_name = #{userName} + + + + update sys_user set del_flag = '2' where user_id = #{userId} + + + + update sys_user set del_flag = '2' where user_id in + + #{userId} + + + + \ No newline at end of file diff --git a/open-api/kwai-api/src/test/java/com/qihang/kwai/AppTest.java b/open-api/kwai-api/src/test/java/com/qihang/kwai/AppTest.java new file mode 100644 index 00000000..2b43d55b --- /dev/null +++ b/open-api/kwai-api/src/test/java/com/qihang/kwai/AppTest.java @@ -0,0 +1,38 @@ +package com.qihang.kwai; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff --git a/wei-api/pom.xml b/open-api/pom.xml similarity index 88% rename from wei-api/pom.xml rename to open-api/pom.xml index 5de4e270..b1adb1df 100644 --- a/wei-api/pom.xml +++ b/open-api/pom.xml @@ -1,24 +1,23 @@ - + 4.0.0 - - - - - org.springframework.boot spring-boot-starter-parent 3.0.2 - com.qihang.wei - wei-api - jar - - wei-api - http://maven.apache.org + com.qihang + open-api + 1.0.0 + pom + + wei-api + kwai-api + 17 UTF-8 @@ -27,7 +26,6 @@ 2022.0.0.0 0.11.5 - org.springframework.boot @@ -100,4 +98,4 @@ - + \ No newline at end of file diff --git a/wei-api/.gitignore b/open-api/wei-api/.gitignore similarity index 100% rename from wei-api/.gitignore rename to open-api/wei-api/.gitignore diff --git a/open-api/wei-api/pom.xml b/open-api/wei-api/pom.xml new file mode 100644 index 00000000..2bc4c491 --- /dev/null +++ b/open-api/wei-api/pom.xml @@ -0,0 +1,98 @@ + + 4.0.0 + + com.qihang + open-api + 1.0.0 + + + com.qihang.wei + wei-api + jar + + wei-api + http://maven.apache.org + + + 17 + UTF-8 + UTF-8 + 3.0.2 + 2022.0.0.0 + 0.11.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wei-api/src/main/java/com/qihang/wei/WeiApi.java b/open-api/wei-api/src/main/java/com/qihang/wei/WeiApi.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/WeiApi.java rename to open-api/wei-api/src/main/java/com/qihang/wei/WeiApi.java diff --git a/wei-api/src/main/java/com/qihang/wei/config/MybatisPlusConfig.java b/open-api/wei-api/src/main/java/com/qihang/wei/config/MybatisPlusConfig.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/config/MybatisPlusConfig.java rename to open-api/wei-api/src/main/java/com/qihang/wei/config/MybatisPlusConfig.java diff --git a/wei-api/src/main/java/com/qihang/wei/controller/GoodsApiController.java b/open-api/wei-api/src/main/java/com/qihang/wei/controller/GoodsApiController.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/controller/GoodsApiController.java rename to open-api/wei-api/src/main/java/com/qihang/wei/controller/GoodsApiController.java diff --git a/wei-api/src/main/java/com/qihang/wei/controller/HomeController.java b/open-api/wei-api/src/main/java/com/qihang/wei/controller/HomeController.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/controller/HomeController.java rename to open-api/wei-api/src/main/java/com/qihang/wei/controller/HomeController.java diff --git a/wei-api/src/main/java/com/qihang/wei/controller/OrderApiController.java b/open-api/wei-api/src/main/java/com/qihang/wei/controller/OrderApiController.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/controller/OrderApiController.java rename to open-api/wei-api/src/main/java/com/qihang/wei/controller/OrderApiController.java diff --git a/wei-api/src/main/java/com/qihang/wei/domain/OGoodsSku.java b/open-api/wei-api/src/main/java/com/qihang/wei/domain/OGoodsSku.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/domain/OGoodsSku.java rename to open-api/wei-api/src/main/java/com/qihang/wei/domain/OGoodsSku.java diff --git a/wei-api/src/main/java/com/qihang/wei/domain/SysPlatform.java b/open-api/wei-api/src/main/java/com/qihang/wei/domain/SysPlatform.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/domain/SysPlatform.java rename to open-api/wei-api/src/main/java/com/qihang/wei/domain/SysPlatform.java diff --git a/wei-api/src/main/java/com/qihang/wei/domain/SysShop.java b/open-api/wei-api/src/main/java/com/qihang/wei/domain/SysShop.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/domain/SysShop.java rename to open-api/wei-api/src/main/java/com/qihang/wei/domain/SysShop.java diff --git a/wei-api/src/main/java/com/qihang/wei/domain/WeiGoods.java b/open-api/wei-api/src/main/java/com/qihang/wei/domain/WeiGoods.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/domain/WeiGoods.java rename to open-api/wei-api/src/main/java/com/qihang/wei/domain/WeiGoods.java diff --git a/wei-api/src/main/java/com/qihang/wei/domain/WeiGoodsSku.java b/open-api/wei-api/src/main/java/com/qihang/wei/domain/WeiGoodsSku.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/domain/WeiGoodsSku.java rename to open-api/wei-api/src/main/java/com/qihang/wei/domain/WeiGoodsSku.java diff --git a/wei-api/src/main/java/com/qihang/wei/domain/WeiOrder.java b/open-api/wei-api/src/main/java/com/qihang/wei/domain/WeiOrder.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/domain/WeiOrder.java rename to open-api/wei-api/src/main/java/com/qihang/wei/domain/WeiOrder.java diff --git a/wei-api/src/main/java/com/qihang/wei/domain/WeiOrderItem.java b/open-api/wei-api/src/main/java/com/qihang/wei/domain/WeiOrderItem.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/domain/WeiOrderItem.java rename to open-api/wei-api/src/main/java/com/qihang/wei/domain/WeiOrderItem.java diff --git a/wei-api/src/main/java/com/qihang/wei/mapper/OGoodsSkuMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/OGoodsSkuMapper.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/mapper/OGoodsSkuMapper.java rename to open-api/wei-api/src/main/java/com/qihang/wei/mapper/OGoodsSkuMapper.java diff --git a/wei-api/src/main/java/com/qihang/wei/mapper/SysPlatformMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SysPlatformMapper.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/mapper/SysPlatformMapper.java rename to open-api/wei-api/src/main/java/com/qihang/wei/mapper/SysPlatformMapper.java diff --git a/wei-api/src/main/java/com/qihang/wei/mapper/SysShopMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SysShopMapper.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/mapper/SysShopMapper.java rename to open-api/wei-api/src/main/java/com/qihang/wei/mapper/SysShopMapper.java diff --git a/wei-api/src/main/java/com/qihang/wei/mapper/SysUserMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/SysUserMapper.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/mapper/SysUserMapper.java rename to open-api/wei-api/src/main/java/com/qihang/wei/mapper/SysUserMapper.java diff --git a/wei-api/src/main/java/com/qihang/wei/mapper/WeiGoodsMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/WeiGoodsMapper.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/mapper/WeiGoodsMapper.java rename to open-api/wei-api/src/main/java/com/qihang/wei/mapper/WeiGoodsMapper.java diff --git a/wei-api/src/main/java/com/qihang/wei/mapper/WeiGoodsSkuMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/WeiGoodsSkuMapper.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/mapper/WeiGoodsSkuMapper.java rename to open-api/wei-api/src/main/java/com/qihang/wei/mapper/WeiGoodsSkuMapper.java diff --git a/wei-api/src/main/java/com/qihang/wei/mapper/WeiOrderItemMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/WeiOrderItemMapper.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/mapper/WeiOrderItemMapper.java rename to open-api/wei-api/src/main/java/com/qihang/wei/mapper/WeiOrderItemMapper.java diff --git a/wei-api/src/main/java/com/qihang/wei/mapper/WeiOrderMapper.java b/open-api/wei-api/src/main/java/com/qihang/wei/mapper/WeiOrderMapper.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/mapper/WeiOrderMapper.java rename to open-api/wei-api/src/main/java/com/qihang/wei/mapper/WeiOrderMapper.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/ApiCommon.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/ApiCommon.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/ApiCommon.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/ApiCommon.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/OrderApiHelper.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/OrderApiHelper.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/OrderApiHelper.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/OrderApiHelper.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/PullRequest.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/PullRequest.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/PullRequest.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/PullRequest.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/bo/CreateTimeRangeBo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/bo/CreateTimeRangeBo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/bo/CreateTimeRangeBo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/bo/CreateTimeRangeBo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/bo/GoodsDetailApiBo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/bo/GoodsDetailApiBo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/bo/GoodsDetailApiBo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/bo/GoodsDetailApiBo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/bo/GoodsListApiBo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/bo/GoodsListApiBo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/bo/GoodsListApiBo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/bo/GoodsListApiBo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/bo/OrderDetailBo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/bo/OrderDetailBo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/bo/OrderDetailBo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/bo/OrderDetailBo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/bo/OrderListBo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/bo/OrderListBo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/bo/OrderListBo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/bo/OrderListBo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/service/GoodsApiService.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/service/GoodsApiService.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/service/GoodsApiService.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/service/GoodsApiService.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/service/OrderApiService.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/service/OrderApiService.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/service/OrderApiService.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/service/OrderApiService.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/service/ShopInfoApiService.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/service/ShopInfoApiService.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/service/ShopInfoApiService.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/service/ShopInfoApiService.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/service/TokenApiService.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/service/TokenApiService.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/service/TokenApiService.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/service/TokenApiService.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/BaseResVo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/BaseResVo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/BaseResVo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/BaseResVo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/GoodsDetailVo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/GoodsDetailVo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/GoodsDetailVo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/GoodsDetailVo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/GoodsListVo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/GoodsListVo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/GoodsListVo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/GoodsListVo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderDetailVo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderDetailVo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderDetailVo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderDetailVo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderListVo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderListVo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderListVo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderListVo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDeliverInfoAddress.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDeliverInfoAddress.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDeliverInfoAddress.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDeliverInfoAddress.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDeliveryInfo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDeliveryInfo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDeliveryInfo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDeliveryInfo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDetail.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDetail.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDetail.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDetail.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDetailProductInfo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDetailProductInfo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDetailProductInfo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/OrderVoDetailProductInfo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/ProductSkuVo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/ProductSkuVo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/ProductSkuVo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/ProductSkuVo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/ProductVo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/ProductVo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/ProductVo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/ProductVo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/ShopApiResultVo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/ShopApiResultVo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/ShopApiResultVo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/ShopApiResultVo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/ShopInfoVo.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/ShopInfoVo.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/ShopInfoVo.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/ShopInfoVo.java diff --git a/wei-api/src/main/java/com/qihang/wei/openApi/vo/Token.java b/open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/Token.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/openApi/vo/Token.java rename to open-api/wei-api/src/main/java/com/qihang/wei/openApi/vo/Token.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/OGoodsSkuService.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/OGoodsSkuService.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/OGoodsSkuService.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/OGoodsSkuService.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/SysPlatformService.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/SysPlatformService.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/SysPlatformService.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/SysPlatformService.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/SysShopService.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/SysShopService.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/SysShopService.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/SysShopService.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/SysUserServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/SysUserServiceImpl.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/SysUserServiceImpl.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/SysUserServiceImpl.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/WeiGoodsService.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/WeiGoodsService.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/WeiGoodsService.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/WeiGoodsService.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/WeiGoodsSkuService.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/WeiGoodsSkuService.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/WeiGoodsSkuService.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/WeiGoodsSkuService.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/WeiOrderItemService.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/WeiOrderItemService.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/WeiOrderItemService.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/WeiOrderItemService.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/WeiOrderService.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/WeiOrderService.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/WeiOrderService.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/WeiOrderService.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/impl/OGoodsSkuServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/OGoodsSkuServiceImpl.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/impl/OGoodsSkuServiceImpl.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/impl/OGoodsSkuServiceImpl.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/impl/SysPlatformServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SysPlatformServiceImpl.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/impl/SysPlatformServiceImpl.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SysPlatformServiceImpl.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/impl/SysShopServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SysShopServiceImpl.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/impl/SysShopServiceImpl.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/impl/SysShopServiceImpl.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/impl/WeiGoodsServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/WeiGoodsServiceImpl.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/impl/WeiGoodsServiceImpl.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/impl/WeiGoodsServiceImpl.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/impl/WeiGoodsSkuServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/WeiGoodsSkuServiceImpl.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/impl/WeiGoodsSkuServiceImpl.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/impl/WeiGoodsSkuServiceImpl.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/impl/WeiOrderItemServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/WeiOrderItemServiceImpl.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/impl/WeiOrderItemServiceImpl.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/impl/WeiOrderItemServiceImpl.java diff --git a/wei-api/src/main/java/com/qihang/wei/service/impl/WeiOrderServiceImpl.java b/open-api/wei-api/src/main/java/com/qihang/wei/service/impl/WeiOrderServiceImpl.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/service/impl/WeiOrderServiceImpl.java rename to open-api/wei-api/src/main/java/com/qihang/wei/service/impl/WeiOrderServiceImpl.java diff --git a/wei-api/src/main/java/com/qihang/wei/utils/RemoteUtil.java b/open-api/wei-api/src/main/java/com/qihang/wei/utils/RemoteUtil.java similarity index 100% rename from wei-api/src/main/java/com/qihang/wei/utils/RemoteUtil.java rename to open-api/wei-api/src/main/java/com/qihang/wei/utils/RemoteUtil.java diff --git a/wei-api/src/main/resources/application.yml b/open-api/wei-api/src/main/resources/application.yml similarity index 100% rename from wei-api/src/main/resources/application.yml rename to open-api/wei-api/src/main/resources/application.yml diff --git a/wei-api/src/main/resources/mapper/OGoodsSkuMapper.xml b/open-api/wei-api/src/main/resources/mapper/OGoodsSkuMapper.xml similarity index 100% rename from wei-api/src/main/resources/mapper/OGoodsSkuMapper.xml rename to open-api/wei-api/src/main/resources/mapper/OGoodsSkuMapper.xml diff --git a/wei-api/src/main/resources/mapper/SysPlatformMapper.xml b/open-api/wei-api/src/main/resources/mapper/SysPlatformMapper.xml similarity index 100% rename from wei-api/src/main/resources/mapper/SysPlatformMapper.xml rename to open-api/wei-api/src/main/resources/mapper/SysPlatformMapper.xml diff --git a/wei-api/src/main/resources/mapper/SysShopMapper.xml b/open-api/wei-api/src/main/resources/mapper/SysShopMapper.xml similarity index 100% rename from wei-api/src/main/resources/mapper/SysShopMapper.xml rename to open-api/wei-api/src/main/resources/mapper/SysShopMapper.xml diff --git a/wei-api/src/main/resources/mapper/SysUserMapper.xml b/open-api/wei-api/src/main/resources/mapper/SysUserMapper.xml similarity index 100% rename from wei-api/src/main/resources/mapper/SysUserMapper.xml rename to open-api/wei-api/src/main/resources/mapper/SysUserMapper.xml diff --git a/wei-api/src/main/resources/mapper/WeiGoodsMapper.xml b/open-api/wei-api/src/main/resources/mapper/WeiGoodsMapper.xml similarity index 100% rename from wei-api/src/main/resources/mapper/WeiGoodsMapper.xml rename to open-api/wei-api/src/main/resources/mapper/WeiGoodsMapper.xml diff --git a/wei-api/src/main/resources/mapper/WeiGoodsSkuMapper.xml b/open-api/wei-api/src/main/resources/mapper/WeiGoodsSkuMapper.xml similarity index 100% rename from wei-api/src/main/resources/mapper/WeiGoodsSkuMapper.xml rename to open-api/wei-api/src/main/resources/mapper/WeiGoodsSkuMapper.xml diff --git a/wei-api/src/main/resources/mapper/WeiOrderItemMapper.xml b/open-api/wei-api/src/main/resources/mapper/WeiOrderItemMapper.xml similarity index 100% rename from wei-api/src/main/resources/mapper/WeiOrderItemMapper.xml rename to open-api/wei-api/src/main/resources/mapper/WeiOrderItemMapper.xml diff --git a/wei-api/src/main/resources/mapper/WeiOrderMapper.xml b/open-api/wei-api/src/main/resources/mapper/WeiOrderMapper.xml similarity index 100% rename from wei-api/src/main/resources/mapper/WeiOrderMapper.xml rename to open-api/wei-api/src/main/resources/mapper/WeiOrderMapper.xml diff --git a/wei-api/src/test/java/com/qihang/wei/AppTest.java b/open-api/wei-api/src/test/java/com/qihang/wei/AppTest.java similarity index 100% rename from wei-api/src/test/java/com/qihang/wei/AppTest.java rename to open-api/wei-api/src/test/java/com/qihang/wei/AppTest.java diff --git a/pom.xml b/pom.xml index 3c25df3e..8e702a6a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,7 @@ oms-api pdd-api dou-api - wei-api - + open-api