diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java index e914883c..0b7f3f7e 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java @@ -6,6 +6,7 @@ import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.model.entity.OShopPlatform; +import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -15,7 +16,7 @@ import org.springframework.util.StringUtils; @Component public class PddApiCommon { private final OShopService shopService; -// private final OShopPlatformService platformService; + private final OShopPlatformService platformService; /** * 更新前的检查 @@ -38,13 +39,23 @@ public class PddApiCommon { // if (shop.getSellerId() == null || shop.getSellerId()<=0) { // return ResultVo.error(HttpStatus.PARAMS_ERROR, "参数错误,请设置抖店平台店铺ID(shopId)"); // } + String appKey = shop.getAppKey(); + String appSecret = shop.getAppSecret(); + String callbackUrl = shop.getApiRedirectUrl(); + if(StringUtils.isEmpty(appKey) || StringUtils.isEmpty(appSecret)){ + OShopPlatform platform = platformService.getById(EnumShopType.PDD.getIndex()); + if(platform != null){ + appKey = platform.getAppKey(); + appSecret = platform.getAppSecret(); + callbackUrl = platform.getRedirectUri(); + } + } +// -// OShopPlatform platform = platformService.getById(EnumShopType.PDD.getIndex()); - - if (!StringUtils.hasText(shop.getAppKey())) { + if (!StringUtils.hasText(appKey)) { return ResultVo.error(HttpStatus.PARAMS_ERROR, "平台配置错误,没有找到AppKey"); } - if (!StringUtils.hasText(shop.getAppSecret())) { + if (!StringUtils.hasText(appSecret)) { return ResultVo.error(HttpStatus.PARAMS_ERROR, "第三方平台配置错误,没有找到AppSercet"); } // if (!StringUtils.hasText(platform.getRedirectUri())) { @@ -59,11 +70,11 @@ public class PddApiCommon { // } ShopApiParams params = new ShopApiParams(); - params.setAppKey(shop.getAppKey()); - params.setAppSecret(shop.getAppSecret()); + params.setAppKey(appKey); + params.setAppSecret(appSecret); params.setAccessToken(shop.getAccessToken()); - params.setRedirectUri(shop.getApiRedirectUrl()); - params.setServerUrl(shop.getApiRequestUrl()); + params.setRedirectUri(callbackUrl); +// params.setServerUrl(shop.getApiRequestUrl()); params.setSellerId(shop.getSellerId()); if (!StringUtils.hasText(shop.getAccessToken())) { diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java index f5865e64..fdad9ce3 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java @@ -23,6 +23,7 @@ import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import java.time.Duration; import java.time.LocalDateTime; @@ -203,28 +204,27 @@ public class PddOrderApiController { * @return * @throws */ -// @RequestMapping("/pull_order_detail") -// @ResponseBody -// public AjaxResult getOrderPullDetail(@RequestBody PullRequest req) throws Exception { -// log.info("/**************主动更新pdd订单by number****************/"); -// if (req.getShopId() == null || req.getShopId() <= 0) { -// return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误,没有店铺Id"); -// } -// if (req.getOrderId() !=null) { -// return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误,缺少orderId"); -// } -// -// var checkResult = apiCommon.checkBefore(req.getShopId()); -// if (checkResult.getCode() != HttpStatus.SUCCESS) { -// return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(), checkResult.getData()); -// } -// String accessToken = checkResult.getData().getAccessToken(); -// String url = checkResult.getData().getServerUrl(); -// String appKey = checkResult.getData().getAppKey(); -// String appSecret = checkResult.getData().getAppSecret(); -// -// -// ApiResultVo resultVo = OrderApiHelper.pullOrderDetail(appKey, appSecret, accessToken,req.getOrderId()); + @PostMapping("/pull_order_detail") + @ResponseBody + public AjaxResult getOrderPullDetail(@RequestBody PddPullRequest req) throws Exception { + log.info("/**************主动更新pdd订单by number****************/"); + if (req.getShopId() == null || req.getShopId() <= 0) { + return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误,没有店铺Id"); + } + if (StringUtils.isEmpty(req.getOrderId())) { + return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误,缺少orderId"); + } + + var checkResult = pddApiCommon.checkBefore(req.getShopId()); + if (checkResult.getCode() != HttpStatus.SUCCESS) { + return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(),checkResult.getData()); + } + String accessToken = checkResult.getData().getAccessToken(); + String appKey = checkResult.getData().getAppKey(); + String appSecret = checkResult.getData().getAppSecret(); + + +// ApiResultVo resultVo = PddOrderApiHelper.pullOrderDetail(appKey, appSecret, accessToken,req.getOrderId()); // if (resultVo.getCode() == ResultVoEnum.SUCCESS.getIndex()) { // PddOrder pddOrder = new PddOrder(); // BeanUtils.copyProperties(resultVo.getData(),pddOrder); @@ -251,5 +251,6 @@ public class PddOrderApiController { // } else { // return AjaxResult.error(resultVo.getCode(), resultVo.getMsg()); // } -// } + return AjaxResult.error("未知错误"); + } } diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java index bf8ace0f..a07c0497 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java @@ -11,12 +11,16 @@ import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.module.open.pdd.domain.PddOrder; import cn.qihangerp.module.open.pdd.domain.bo.PddOrderBo; +import cn.qihangerp.module.open.pdd.domain.bo.PddOrderConfirmBo; import cn.qihangerp.module.open.pdd.domain.bo.PddOrderPushBo; import cn.qihangerp.module.open.pdd.service.PddOrderService; import cn.qihangerp.security.common.BaseController; +import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; +@Slf4j @AllArgsConstructor @RestController @RequestMapping("/pdd/order") @@ -54,4 +58,15 @@ public class PddOrderController extends BaseController { } return success(); } + + @PostMapping("/confirmOrder") + public AjaxResult confirmOrder(@RequestBody PddOrderConfirmBo bo) { + log.info("=========确认订单======={}", JSONObject.toJSONString(bo)); + +// var result = orderService.confirmOrder(bo); +// if(result.getCode()==0) return success(); +// else return AjaxResult.error(result.getMsg()); + + return AjaxResult.error("未实现"); + } } diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java index b56fd209..2794f698 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java @@ -1,6 +1,5 @@ package cn.qihangerp.api.tao.controller; - import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -12,12 +11,16 @@ import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.module.open.tao.domain.TaoOrder; import cn.qihangerp.module.open.tao.domain.bo.TaoOrderBo; +import cn.qihangerp.module.open.tao.domain.bo.TaoOrderConfirmBo; import cn.qihangerp.module.open.tao.domain.bo.TaoOrderPushBo; import cn.qihangerp.module.open.tao.service.TaoOrderService; import cn.qihangerp.security.common.BaseController; +import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; +@Slf4j @AllArgsConstructor @RestController @RequestMapping("/tao/order") @@ -56,5 +59,14 @@ public class TaoOrderController extends BaseController { return success(); } + @PostMapping("/confirmOrder") + public AjaxResult confirmOrder(@RequestBody TaoOrderConfirmBo bo) { + log.info("=========确认订单======={}", JSONObject.toJSONString(bo)); +// var result = orderService.confirmOrder(bo); +// if(result.getCode()==0) return success(); +// else return AjaxResult.error(result.getMsg()); + + return AjaxResult.error("未实现"); + } } diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderConfirmBo.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderConfirmBo.java new file mode 100644 index 00000000..eb98dc38 --- /dev/null +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderConfirmBo.java @@ -0,0 +1,31 @@ +package cn.qihangerp.module.open.pdd.domain.bo; + +import lombok.Data; + +@Data +public class PddOrderConfirmBo { + private Long orderId; + /** + * 收货人的姓名 + */ + private String receiver; + + /** + * 收货人的手机号码 + */ + private String mobile; + + private String province; + private String city; + private String town; + /** + * 收货人的详细地址 + */ + private String address; + + /** + * 发货类型 0仓库发货1供应商代发 + */ +// private Integer shipType; + +} diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderConfirmBo.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderConfirmBo.java new file mode 100644 index 00000000..3db47701 --- /dev/null +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderConfirmBo.java @@ -0,0 +1,31 @@ +package cn.qihangerp.module.open.tao.domain.bo; + +import lombok.Data; + +@Data +public class TaoOrderConfirmBo { + private Long orderId; + /** + * 收货人的姓名 + */ + private String receiver; + + /** + * 收货人的手机号码 + */ + private String mobile; + + private String province; + private String city; + private String town; + /** + * 收货人的详细地址 + */ + private String address; + + /** + * 发货类型 0仓库发货1供应商代发 + */ +// private Integer shipType; + +} diff --git a/vue/src/api/pdd/order.js b/vue/src/api/pdd/order.js index 4e58eb93..6cf78bbf 100644 --- a/vue/src/api/pdd/order.js +++ b/vue/src/api/pdd/order.js @@ -19,13 +19,22 @@ export function getOrder(id) { // 接口拉取淘宝订单 -export function pullOrder(query) { +export function pullOrder(data) { return request({ url: '/api/open-api/pdd/order/pull_order', - method: 'get', - params: query + method: 'post', + data: data }) } + +export function pullOrderDetail(data) { + return request({ + url: '/api/open-api/pdd/order/pull_order_detail', + method: 'post', + data: data + }) +} + export function pushOms(data) { return request({ url: '/api/open-api/pdd/order/push_oms', @@ -33,3 +42,11 @@ export function pushOms(data) { data: data }) } +// 确认订单 +export function confirmOrder(data) { + return request({ + url: '/api/open-api/pdd/order/confirmOrder', + method: 'post', + data: data + }) +} diff --git a/vue/src/views/pdd/order/index.vue b/vue/src/views/pdd/order/index.vue index b05f9af4..ea5fbfaf 100644 --- a/vue/src/views/pdd/order/index.vue +++ b/vue/src/views/pdd/order/index.vue @@ -172,7 +172,15 @@