diff --git a/api/open-api/libs/open-sdk-1.0.2.jar b/api/open-api/libs/open-sdk-1.0.2.jar deleted file mode 100644 index e4e24be4..00000000 Binary files a/api/open-api/libs/open-sdk-1.0.2.jar and /dev/null differ diff --git a/api/open-api/libs/open-sdk-1.4.20.jar b/api/open-api/libs/open-sdk-1.4.20.jar new file mode 100644 index 00000000..83a202a4 Binary files /dev/null and b/api/open-api/libs/open-sdk-1.4.20.jar differ diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml index 4241853f..2bd3e52f 100644 --- a/api/open-api/pom.xml +++ b/api/open-api/pom.xml @@ -75,42 +75,6 @@ mybatis-plus-spring-boot3-starter 3.5.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - net.logstash.logback logstash-logback-encoder @@ -120,33 +84,12 @@ org.springframework.boot spring-boot-starter-webflux - - - - - - - - - - - - - - - - - - - - - cn.qihangerp.open open-sdk 1.0.2 system - ${project.basedir}/libs/open-sdk-1.0.2.jar + ${project.basedir}/libs/open-sdk-1.4.20.jar org.projectlombok diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsApiController.java b/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsApiController.java index de8a4853..bec91e6b 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsApiController.java +++ b/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsApiController.java @@ -6,6 +6,7 @@ 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.common.utils.DateUtils; import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.domain.OShopPullLogs; @@ -15,7 +16,6 @@ import cn.qihangerp.module.open.tao.service.TaoGoodsService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.open.common.ApiResultVo; -import cn.qihangerp.open.common.DateUtil; import cn.qihangerp.open.tao.TaoApiCommon; import cn.qihangerp.open.tao.TaoGoodsApiHelper; import cn.qihangerp.open.tao.TaoRequest; @@ -113,11 +113,11 @@ public class TaoGoodsApiController { taoGoods.setHasInvoice(g.isHas_invoice() + ""); taoGoods.setHasWarranty(g.isHas_warranty() + ""); taoGoods.setHasShowcase(g.isHas_showcase() + ""); - taoGoods.setModified(DateUtil.stringtoDate(g.getModified())); - taoGoods.setDelistTime(StringUtils.isEmpty(g.getDelist_time()) ? null : DateUtil.stringtoDate(g.getDelist_time())); + taoGoods.setModified(DateUtils.stringtoDate(g.getModified())); + taoGoods.setDelistTime(StringUtils.isEmpty(g.getDelist_time()) ? null : DateUtils.stringtoDate(g.getDelist_time())); taoGoods.setPostageId(g.getPostage_id()); taoGoods.setOuterId(g.getOuter_id()); - taoGoods.setListTime(StringUtils.isEmpty(g.getList_time()) ? null : DateUtil.stringtoDate(g.getList_time())); + taoGoods.setListTime(StringUtils.isEmpty(g.getList_time()) ? null : DateUtils.stringtoDate(g.getList_time())); taoGoods.setPrice(g.getPrice()); taoGoods.setSoldQuantity(g.getSold_quantity()); taoGoods.setShopId(req.getShopId()); diff --git a/api/open-api/src/main/java/cn/qihangerp/open/wei/WeiApiCommon.java b/api/open-api/src/main/java/cn/qihangerp/open/wei/WeiApiCommon.java index 3601c69f..3b1769d7 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/wei/WeiApiCommon.java +++ b/api/open-api/src/main/java/cn/qihangerp/open/wei/WeiApiCommon.java @@ -8,7 +8,7 @@ import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.domain.OShop; import cn.qihangerp.module.service.OShopService; import cn.qihangerp.open.common.ApiResultVo; -import cn.qihangerp.open.wei.response.WeiTokenResponse; +import cn.qihangerp.open.wei.WeiTokenResponse; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiOrderApiController.java b/api/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiOrderApiController.java index b21c4da4..50cdc29c 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiOrderApiController.java +++ b/api/open-api/src/main/java/cn/qihangerp/open/wei/controller/WeiOrderApiController.java @@ -54,7 +54,7 @@ public class WeiOrderApiController extends BaseController { // String appSecret = checkResult.getData().getAppSecret(); LocalDateTime endTime = LocalDateTime.now(); LocalDateTime startTime = endTime.minusHours(1); - ApiResultVo orderApiResultVo = WeiOrderApiHelper.pullOrderList(startTime, endTime, accessToken, null, null); + ApiResultVo orderApiResultVo = WeiOrderApiHelper.pullOrderList(startTime, endTime, accessToken); // ApiResultVo apiResultVo = OrderApiHelper.pullOrderList(startTime, endTime, accessToken); int insertSuccess = 0;//新增成功的订单 diff --git a/core/common/src/main/java/cn/qihangerp/common/utils/DateUtils.java b/core/common/src/main/java/cn/qihangerp/common/utils/DateUtils.java index 34952250..289d0a2a 100644 --- a/core/common/src/main/java/cn/qihangerp/common/utils/DateUtils.java +++ b/core/common/src/main/java/cn/qihangerp/common/utils/DateUtils.java @@ -93,7 +93,34 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils throw new RuntimeException(e); } } + /** + * 把符合日期格式的字符串转换为日期类型 + */ + public static Date stringtoDate(String dateStr, String format) { + Date d = null; + SimpleDateFormat formater = new SimpleDateFormat(format); + try { + formater.setLenient(false); + d = formater.parse(dateStr); + } catch (Exception e) { + // log.error(e); + d = null; + } + return d; + } + public static Date stringtoDate(String dateStr) { + Date d = null; + SimpleDateFormat formater = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + formater.setLenient(false); + d = formater.parse(dateStr); + } catch (Exception e) { + // log.error(e); + d = null; + } + return d; + } /** * 时间字符串转时间戳 * @param format