diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java index ef23f489..5274f02c 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java @@ -80,7 +80,7 @@ public class ShopController extends BaseController { { if(shop.getType()==null) return AjaxResult.error("请选择店铺平台"); shop.setModifyOn(System.currentTimeMillis()/1000); - + shop.setCreateOn(System.currentTimeMillis()/1000); // shop.setCreateTime(new Date()); return toAjax(shopService.save(shop)); } diff --git a/api/open-api/libs/open-sdk-1.4.30.jar b/api/open-api/libs/open-sdk-1.5.1.jar similarity index 91% rename from api/open-api/libs/open-sdk-1.4.30.jar rename to api/open-api/libs/open-sdk-1.5.1.jar index d7df905b..b373fa9b 100644 Binary files a/api/open-api/libs/open-sdk-1.4.30.jar and b/api/open-api/libs/open-sdk-1.5.1.jar differ diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml index 3e4d2fc4..3480e35f 100644 --- a/api/open-api/pom.xml +++ b/api/open-api/pom.xml @@ -87,9 +87,9 @@ cn.qihangerp.open open-sdk - 1.0.2 + 1.0 system - ${project.basedir}/libs/open-sdk-1.4.30.jar + ${project.basedir}/libs/open-sdk-1.5.1.jar diff --git a/core/common/src/main/java/cn/qihangerp/common/ResultVoEnum.java b/core/common/src/main/java/cn/qihangerp/common/ResultVoEnum.java index 235a0abb..51c78c42 100644 --- a/core/common/src/main/java/cn/qihangerp/common/ResultVoEnum.java +++ b/core/common/src/main/java/cn/qihangerp/common/ResultVoEnum.java @@ -13,7 +13,7 @@ public enum ResultVoEnum { TokenFail("TokenFail", 1401),//没有找到 Unable("Unable", 1403),//无法处理 UNAUTHORIZED("UNAUTHORIZED", 1401),//token过期 - StateError("StateError", 1402),//状态错误 + StateError("StateError", 1502),//状态错误 Locking("Locking", 1405),//锁定,不能操作 NumberLess("数量不足", 1406), StatusError("状态不正确", 1407), @@ -23,7 +23,8 @@ public enum ResultVoEnum { HasAssociatedData("存在关联数据", 1501),//存在关联数据 Exist("已存在相同的数据", 1502),//已存在相同的数据 SystemException("系统异常", 1505),//系统异常 - Fail("失败", 1001); + Fail("失败", 1001), + API_FAIL("失败", 2001); private String name; private int index; diff --git a/core/common/src/main/java/cn/qihangerp/domain/OShop.java b/core/common/src/main/java/cn/qihangerp/domain/OShop.java index fa82fe0e..521fcb9c 100644 --- a/core/common/src/main/java/cn/qihangerp/domain/OShop.java +++ b/core/common/src/main/java/cn/qihangerp/domain/OShop.java @@ -1,21 +1,24 @@ package cn.qihangerp.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; /** - * 数据中心-店铺 - * @TableName sys_shop + * 店铺表 + * @TableName o_shop */ +@TableName(value ="o_shop") @Data public class OShop implements Serializable { /** * 主键 */ - @TableId(value = "id", type = IdType.AUTO) + @TableId(type = IdType.AUTO) private Long id; /** @@ -43,11 +46,6 @@ public class OShop implements Serializable { */ private Integer status; - /** - * 更新时间 - */ - private Long modifyOn; - /** * 描述 */ @@ -66,7 +64,7 @@ public class OShop implements Serializable { /** * Appsercet */ - private String appSercet; + private String appSecret; /** * 第三方平台sessionKey(access_token) @@ -98,7 +96,36 @@ public class OShop implements Serializable { */ private String apiRequestUrl; + /** + * 回调url + */ + private String apiRedirectUrl; + + /** + * 负责人id + */ + private Long manageUserId; + + /** + * 负责人部门id + */ + private Long manageDeptId; + + /** + * 国家/地区 + */ + private Long regionId; + + /** + * 更新时间 + */ + private Long modifyOn; + + /** + * 创建时间 + */ + private Long createOn; + + @TableField(exist = false) private static final long serialVersionUID = 1L; - - } \ No newline at end of file diff --git a/api/open-api/libs/open-sdk-1.4.20.jar b/microservices/dou-api/libs/open-sdk-1.5.1.jar similarity index 91% rename from api/open-api/libs/open-sdk-1.4.20.jar rename to microservices/dou-api/libs/open-sdk-1.5.1.jar index 83a202a4..b373fa9b 100644 Binary files a/api/open-api/libs/open-sdk-1.4.20.jar and b/microservices/dou-api/libs/open-sdk-1.5.1.jar differ diff --git a/microservices/dou-api/pom.xml b/microservices/dou-api/pom.xml index 5e51bd60..816a897a 100644 --- a/microservices/dou-api/pom.xml +++ b/microservices/dou-api/pom.xml @@ -21,9 +21,9 @@ cn.qihangerp.open open-sdk - 1.0.2 + 1.0 system - ${project.basedir}/libs/open-sdk-1.4.20.jar + ${project.basedir}/libs/open-sdk-1.5.1.jar cn.qihangerp.module diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java index c5f00043..d142ac8c 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java @@ -1,12 +1,16 @@ package cn.qihangerp.api.dou; import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.api.ShopApiParams; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.domain.OShopPlatform; import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; +import cn.qihangerp.open.common.ApiResultVo; +import cn.qihangerp.sdk.dou.DouTokenApiHelper; +import cn.qihangerp.sdk.dou.model.Token; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; @@ -15,7 +19,7 @@ import org.springframework.util.StringUtils; @Component public class DouApiCommon { private final OShopService shopService; - private final OShopPlatformService platformService; +// private final OShopPlatformService platformService; /** * 更新前的检查 @@ -39,13 +43,13 @@ public class DouApiCommon { return ResultVo.error(HttpStatus.PARAMS_ERROR, "参数错误,请设置抖店平台店铺ID(shopId)"); } - OShopPlatform platform = platformService.getById(EnumShopType.DOU.getIndex()); +// OShopPlatform platform = platformService.getById(EnumShopType.DOU.getIndex()); - if (!StringUtils.hasText(platform.getAppKey())) { - return ResultVo.error(HttpStatus.PARAMS_ERROR, "平台配置错误,没有找到AppKey"); + if (!StringUtils.hasText(shop.getAppKey())) { + return ResultVo.error(HttpStatus.PARAMS_ERROR, "店铺配置错误,没有找到AppKey"); } - if (!StringUtils.hasText(platform.getAppSecret())) { - return ResultVo.error(HttpStatus.PARAMS_ERROR, "第三方平台配置错误,没有找到AppSercet"); + if (!StringUtils.hasText(shop.getAppSecret())) { + return ResultVo.error(HttpStatus.PARAMS_ERROR, "店铺配置错误,没有找到AppSecret"); } // if (!StringUtils.hasText(platform.getRedirectUri())) { // return ResultVo.error(HttpStatus.PARAMS_ERROR, "第三方平台配置错误,没有找到RedirectUri"); @@ -59,16 +63,28 @@ public class DouApiCommon { // } ShopApiParams params = new ShopApiParams(); - params.setAppKey(platform.getAppKey()); - params.setAppSecret(platform.getAppSecret()); + params.setAppKey(shop.getAppKey()); + params.setAppSecret(shop.getAppSecret()); params.setAccessToken(shop.getAccessToken()); - params.setRedirectUri(platform.getRedirectUri()); - params.setServerUrl(platform.getServerUrl()); + params.setRedirectUri(shop.getApiRedirectUrl()); +// params.setServerUrl(platform.getServerUrl()); params.setSellerId(shop.getSellerId()); -// if (!StringUtils.hasText(shop.getAccessToken())) { -// return ResultVo.error(HttpStatus.UNAUTHORIZED, "Token已过期,请重新授权", params); -// } + if (!StringUtils.hasText(shop.getAccessToken())) { + ApiResultVo token = DouTokenApiHelper.getToken(shop.getAppKey(), shop.getAppSecret(), shop.getSellerId()); + if(token.getCode()!=0) { + return ResultVo.error(ResultVoEnum.API_FAIL.getIndex(), token.getMsg(), params); + }else{ + shopService.updateSessionKey(shopId,token.getData().getAccessToken(),token.getData().getRefreshToken()); + params.setAccessToken(token.getData().getAccessToken()); + } + }else{ + ApiResultVo token1= DouTokenApiHelper.refreshToken(shop.getAppKey(),shop.getAppSecret(),shop.getAccessToken(),shop.getRefreshToken()); + if(token1.getCode()==0){ + shopService.updateSessionKey(shopId,token1.getData().getAccessToken(),token1.getData().getRefreshToken()); + params.setAccessToken(token1.getData().getAccessToken()); + } + } return ResultVo.success(HttpStatus.SUCCESS, params); } diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java index c04cc9ad..c087e7c6 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java @@ -57,7 +57,7 @@ public class DouGoodsApiController { Date currDateTime = new Date(); var checkResult = douApiCommon.checkBefore(params.getShopId()); if (checkResult.getCode() != HttpStatus.SUCCESS) { - return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(), checkResult.getData()); + return AjaxResult.error(checkResult.getCode(), checkResult.getMsg()); } String accessToken = checkResult.getData().getAccessToken(); String serverUrl = checkResult.getData().getServerUrl(); diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java index 22067707..2702c21a 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java @@ -18,7 +18,6 @@ import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.open.common.ApiResultVo; import cn.qihangerp.open.dou.DouOrderApiHelper; -import cn.qihangerp.open.dou.DouTokenApiHelper; import cn.qihangerp.open.dou.model.Token; import cn.qihangerp.open.dou.model.order.Order; import cn.qihangerp.sdk.dou.PullRequest; @@ -104,15 +103,14 @@ public class DouOrderApiController { Long endTimestamp = endTime.toEpochSecond(ZoneOffset.ofHours(8)); String pullParams = "{startTime:"+startTime+",endTime:"+endTime+"}"; - ApiResultVo token = DouTokenApiHelper.getToken(appKey, appSecret,checkResult.getData().getSellerId()); - - if(token.getCode()==0) { - accessToken = token.getData().getAccessToken(); - }else{ - return AjaxResult.error(token.getMsg()); - } +// ApiResultVo token = DouTokenApiHelper.getToken(appKey, appSecret,checkResult.getData().getSellerId()); +// +// if(token.getCode()==0) { +// accessToken = token.getData().getAccessToken(); +// }else{ +// return AjaxResult.error(token.getMsg()); +// } //第一次获取 -// ApiResultVo resultVo = OrderApiHelper.pullOrderList(appKey,appSecret,douShopId,startTime, endTime); ApiResultVo resultVo = DouOrderApiHelper.pullOrderList(startTimestamp, endTimestamp, 0, 20, appKey, appSecret, accessToken); if(resultVo.getCode() !=0 ){ OShopPullLogs logs = new OShopPullLogs(); diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java index 164a16fe..9605195b 100644 --- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java @@ -1,6 +1,5 @@ package cn.qihangerp.api.dou.controller; - import cn.qihangerp.api.dou.DouApiCommon; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.ResultVoEnum; @@ -15,11 +14,8 @@ import cn.qihangerp.module.open.dou.domain.DouRefund; import cn.qihangerp.module.open.dou.service.DouRefundService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; - import cn.qihangerp.open.common.ApiResultVo; - import cn.qihangerp.open.dou.DouRefundApiHelper; -import cn.qihangerp.open.dou.DouTokenApiHelper; import cn.qihangerp.open.dou.model.Token; import cn.qihangerp.open.dou.model.after.AfterSale; import cn.qihangerp.sdk.dou.PullRequest; @@ -102,12 +98,12 @@ public class DouRefundApiController { // } } String pullParams = "{startTime:"+startTime+",endTime:"+endTime+"}"; - ApiResultVo token = DouTokenApiHelper.getToken(appKey, appSecret,checkResult.getData().getSellerId()); - if(token.getCode()==0) { - accessToken = token.getData().getAccessToken(); - }else{ - return AjaxResult.error(token.getMsg()); - } +// ApiResultVo token = DouTokenApiHelper.getToken(appKey, appSecret,checkResult.getData().getSellerId()); +// if(token.getCode()==0) { +// accessToken = token.getData().getAccessToken(); +// }else{ +// return AjaxResult.error(token.getMsg()); +// } String startTimeStr = startTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); String endTimeStr = endTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); Long startTimestamp = startTime.toEpochSecond(ZoneOffset.ofHours(8)); diff --git a/microservices/dou-api/libs/open-sdk-1.4.20.jar b/microservices/jd-api/libs/open-sdk-1.5.1.jar similarity index 91% rename from microservices/dou-api/libs/open-sdk-1.4.20.jar rename to microservices/jd-api/libs/open-sdk-1.5.1.jar index 83a202a4..b373fa9b 100644 Binary files a/microservices/dou-api/libs/open-sdk-1.4.20.jar and b/microservices/jd-api/libs/open-sdk-1.5.1.jar differ diff --git a/microservices/jd-api/pom.xml b/microservices/jd-api/pom.xml index 94fbe74c..8e72c3cd 100644 --- a/microservices/jd-api/pom.xml +++ b/microservices/jd-api/pom.xml @@ -23,7 +23,7 @@ open-sdk 1.0.2 system - ${project.basedir}/libs/open-sdk-1.4.20.jar + ${project.basedir}/libs/open-sdk-1.5.1.jar org.codehaus.jackson diff --git a/microservices/pdd-api/libs/open-sdk-1.4.20.jar b/microservices/pdd-api/libs/open-sdk-1.4.20.jar deleted file mode 100644 index 83a202a4..00000000 Binary files a/microservices/pdd-api/libs/open-sdk-1.4.20.jar and /dev/null differ diff --git a/microservices/jd-api/libs/open-sdk-1.4.20.jar b/microservices/pdd-api/libs/open-sdk-1.5.1.jar similarity index 91% rename from microservices/jd-api/libs/open-sdk-1.4.20.jar rename to microservices/pdd-api/libs/open-sdk-1.5.1.jar index 83a202a4..b373fa9b 100644 Binary files a/microservices/jd-api/libs/open-sdk-1.4.20.jar and b/microservices/pdd-api/libs/open-sdk-1.5.1.jar differ diff --git a/microservices/pdd-api/pom.xml b/microservices/pdd-api/pom.xml index 4919fd4a..54f15632 100644 --- a/microservices/pdd-api/pom.xml +++ b/microservices/pdd-api/pom.xml @@ -23,7 +23,7 @@ open-sdk 1.0.2 system - ${project.basedir}/libs/open-sdk-1.4.20.jar + ${project.basedir}/libs/open-sdk-1.5.1.jar cn.qihangerp.module diff --git a/microservices/pom.xml b/microservices/pom.xml index c54d5225..dd4e5752 100644 --- a/microservices/pom.xml +++ b/microservices/pom.xml @@ -68,6 +68,13 @@ security 1.0 + + + + + + + org.projectlombok lombok diff --git a/microservices/tao-api/libs/open-sdk-1.4.20.jar b/microservices/tao-api/libs/open-sdk-1.4.20.jar deleted file mode 100644 index 83a202a4..00000000 Binary files a/microservices/tao-api/libs/open-sdk-1.4.20.jar and /dev/null differ diff --git a/microservices/tao-api/libs/open-sdk-1.5.1.jar b/microservices/tao-api/libs/open-sdk-1.5.1.jar new file mode 100644 index 00000000..b373fa9b Binary files /dev/null and b/microservices/tao-api/libs/open-sdk-1.5.1.jar differ diff --git a/microservices/tao-api/pom.xml b/microservices/tao-api/pom.xml index 5636cd7c..7f2dfc65 100644 --- a/microservices/tao-api/pom.xml +++ b/microservices/tao-api/pom.xml @@ -23,7 +23,7 @@ open-sdk 1.0.2 system - ${project.basedir}/libs/open-sdk-1.4.20.jar + ${project.basedir}/libs/open-sdk-1.5.1.jar cn.qihangerp.module diff --git a/microservices/wei-api/libs/open-sdk-1.4.20.jar b/microservices/wei-api/libs/open-sdk-1.4.20.jar deleted file mode 100644 index 83a202a4..00000000 Binary files a/microservices/wei-api/libs/open-sdk-1.4.20.jar and /dev/null differ diff --git a/microservices/wei-api/libs/open-sdk-1.5.1.jar b/microservices/wei-api/libs/open-sdk-1.5.1.jar new file mode 100644 index 00000000..b373fa9b Binary files /dev/null and b/microservices/wei-api/libs/open-sdk-1.5.1.jar differ diff --git a/microservices/wei-api/pom.xml b/microservices/wei-api/pom.xml index ca8d1e22..60823f44 100644 --- a/microservices/wei-api/pom.xml +++ b/microservices/wei-api/pom.xml @@ -23,7 +23,7 @@ open-sdk 1.0.2 system - ${project.basedir}/libs/open-sdk-1.4.20.jar + ${project.basedir}/libs/open-sdk-1.5.1.jar cn.qihangerp.module diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java index 4ed9b6f6..2b708de1 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/WeiApiCommon.java @@ -36,7 +36,7 @@ public class WeiApiCommon { if(!StringUtils.hasText(shop.getAppKey())) { return ResultVo.error(HttpStatus.PARAMS_ERROR, "店铺参数配置错误,没有找到AppKey"); } - if(!StringUtils.hasText(shop.getAppSercet())) { + if(!StringUtils.hasText(shop.getAppSecret())) { return ResultVo.error(HttpStatus.PARAMS_ERROR, "店铺参数配置错误,没有找到AppSercet"); } if(!StringUtils.hasText(shop.getApiRequestUrl())) { @@ -45,7 +45,7 @@ public class WeiApiCommon { ShopApiParams params = new ShopApiParams(); params.setAppKey(shop.getAppKey()); - params.setAppSecret(shop.getAppSercet()); + params.setAppSecret(shop.getAppSecret()); params.setAccessToken(shop.getAccessToken()); params.setServerUrl(shop.getApiRequestUrl()); params.setSellerId(shop.getSellerId()); diff --git a/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopMapper.java b/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopMapper.java index 96545308..f2db8248 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopMapper.java +++ b/module/shop/src/main/java/cn/qihangerp/module/mapper/OShopMapper.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip -* @description 针对表【sys_shop(数据中心-店铺)】的数据库操作Mapper -* @createDate 2024-03-17 15:17:34 -* @Entity cn.qihangerp.oms.domain.SysShop +* @description 针对表【o_shop(店铺表)】的数据库操作Mapper +* @createDate 2025-05-20 18:28:35 +* @Entity cn.qihangerp.module.domain.OShop */ public interface OShopMapper extends BaseMapper { diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/OShopService.java b/module/shop/src/main/java/cn/qihangerp/module/service/OShopService.java index 3a8a7143..510cd6a8 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/OShopService.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/OShopService.java @@ -23,4 +23,5 @@ public interface OShopService extends IService { // int updateShopPlatformById(SysPlatform platform); List selectShopByShopType(EnumShopType shopType); void updateSessionKey(Long shopId,String sessionKey); + void updateSessionKey(Long shopId,String token,String refreshToken); } diff --git a/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java b/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java index 167074cf..c70b6dff 100644 --- a/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java +++ b/module/shop/src/main/java/cn/qihangerp/module/service/impl/OShopServiceImpl.java @@ -68,6 +68,14 @@ public class OShopServiceImpl extends ServiceImpl shop.setAccessToken(sessionKey); mapper.updateById(shop); } + @Override + public void updateSessionKey(Long shopId, String token, String refreshToken) { + OShop shop = new OShop(); + shop.setId(shopId); + shop.setAccessToken(token); + shop.setRefreshToken(refreshToken); + mapper.updateById(shop); + } // @Override // public List selectShopPlatformList() { // return platformMapper.selectList(new LambdaQueryWrapper<>()); diff --git a/module/shop/src/main/resources/mapper/OShopMapper.xml b/module/shop/src/main/resources/mapper/OShopMapper.xml index e3da61b1..3cb31d53 100644 --- a/module/shop/src/main/resources/mapper/OShopMapper.xml +++ b/module/shop/src/main/resources/mapper/OShopMapper.xml @@ -5,31 +5,38 @@ - + - - + + + + + + + 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 + remark,seller_id,app_key, + app_secret,access_token,expires_in, + access_token_begin,refresh_token,refresh_token_timeout, + api_request_url,api_redirect_url,manage_user_id, + manage_dept_id,region_id,modify_on, + create_on diff --git a/vue/src/utils/request.js b/vue/src/utils/request.js index 0778c867..13070a81 100644 --- a/vue/src/utils/request.js +++ b/vue/src/utils/request.js @@ -75,7 +75,10 @@ service.interceptors.response.use(res => { if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') { return res.data } - if (code === 401) { + if(code>1000){ + return res.data + } + else if (code === 401) { if (!isRelogin.show) { isRelogin.show = true; MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { diff --git a/vue/src/views/dou/goods/goods_list.vue b/vue/src/views/dou/goods/goods_list.vue index 8aa9e15e..9f3c8b5b 100644 --- a/vue/src/views/dou/goods/goods_list.vue +++ b/vue/src/views/dou/goods/goods_list.vue @@ -330,10 +330,13 @@ export default { }); // return Promise.reject('无效的会话,或者会话已过期,请重新登录。') - }else{ + }else if(response.code==200){ this.pullLoading = false this.getList() this.$modal.msgSuccess(JSON.stringify(response)); + }else{ + this.pullLoading = false + this.$modal.msgError(response.msg); } this.pullLoading = false diff --git a/vue/src/views/shop/online_shop.vue b/vue/src/views/shop/online_shop.vue index 8aaffa4d..2d40a78c 100644 --- a/vue/src/views/shop/online_shop.vue +++ b/vue/src/views/shop/online_shop.vue @@ -133,13 +133,10 @@ - - - - + - - - + + + + + + + + + + + + + + @@ -250,7 +259,10 @@ export default { name: [{ required: true, message: "店铺名不能为空", trigger: "blur" }], type: [{ required: true, message: "请选择平台", trigger: "change" }], sellerId: [{ required: true, message: "不能为空", trigger: "change" }], - code: [{ required: true, message: "不能为空", trigger: "change" }], + + appKey: [{ required: true, message: "不能为空", trigger: "change" }], + appSecret: [{ required: true, message: "不能为空", trigger: "change" }], + status: [{ required: true, message: "不能为空", trigger: "change" }], } }; },