From e08fa016eab0ffe653a9785e4391cdbcea7db9e2 Mon Sep 17 00:00:00 2001 From: wujingtao Date: Thu, 18 Nov 2021 10:26:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=8D=E8=B4=B9?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SynchronizedAmountController.java | 10 ++++++ .../service/SynchronizedAmountService.java | 9 +++++ .../impl/SynchronizedAmountServiceImpl.java | 34 ++++++++++++++++++- .../src/main/resources/application.yml | 2 +- .../java/com/hchbox/module/dao/TradeJpa.java | 2 +- .../src/main/resources/application.yml | 2 +- .../hchbox/model/entity/BasePayTwoOrder.java | 4 +-- 7 files changed, 57 insertions(+), 6 deletions(-) diff --git a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/SynchronizedAmountController.java b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/SynchronizedAmountController.java index c36cfaa..fca092f 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/SynchronizedAmountController.java +++ b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/SynchronizedAmountController.java @@ -45,4 +45,14 @@ public class SynchronizedAmountController { log.info("支付的参数{}" + payTwoOrder.toString()); return accountRechargeService.aliPayPcTwo(payTwoOrder); } + + @PostMapping("/free/sync") + @ApiOperation("免费同步一个月的历史订单") + public CommonResult freeSync(@RequestBody PayTwoOrder payTwoOrder) { + log.info("免费开通的商家信息：{}", payTwoOrder.toString()); + if (ObjectUtil.isEmpty(payTwoOrder) || payTwoOrder.getMasterUserId() == null || payTwoOrder.getOrderStartTime() == null || payTwoOrder.getOrderEndTime() == null) { + return new CommonResult<>().error("参数异常"); + } + return synchronizedAmountService.freeSync(payTwoOrder); + } } diff --git a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/SynchronizedAmountService.java b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/SynchronizedAmountService.java index c5c7f87..01e4a25 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/SynchronizedAmountService.java +++ b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/SynchronizedAmountService.java @@ -1,6 +1,7 @@ package com.hchbox.module.service; import com.hchbox.model.param.CommonResult; +import com.hchbox.module.entity.PayTwoOrder; import com.hchbox.vo.SubAccountsVo; /** @@ -16,4 +17,12 @@ public interface SynchronizedAmountService { * @return */ CommonResult synchronizedAmount(SubAccountsVo subAccountsVo); + + /** + * 免费同步淘宝历史订单 + * + * @param payTwoOrder + * @return + */ + CommonResult freeSync(PayTwoOrder payTwoOrder); } diff --git a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java index 36fadd3..8c9369c 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java +++ b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java @@ -1,10 +1,14 @@ package com.hchbox.module.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.json.JSONObject; import com.hchbox.api.RequestCore; import com.hchbox.constant.DefaultNumberConstants; import com.hchbox.model.param.CommonResult; +import com.hchbox.module.dao.PayTwoOrderRepository; import com.hchbox.module.entity.PayTwoOrder; import com.hchbox.module.service.SynchronizedAmountService; import com.hchbox.vo.SubAccountsVo; @@ -30,6 +34,8 @@ public class SynchronizedAmountServiceImpl implements SynchronizedAmountService private Double budgetAmount; @Resource private RequestCore requestCore; + @Resource + private PayTwoOrderRepository payTwoOrderRepository; @Override public CommonResult synchronizedAmount(SubAccountsVo subAccountsVo) { @@ -68,4 +74,30 @@ public class SynchronizedAmountServiceImpl implements SynchronizedAmountService } return new CommonResult<>().success(payTwoOrder); } -} + + @Override + public CommonResult freeSync(PayTwoOrder payTwoOrder) { + + JSONObject jsonObject2 = requestCore.updateSellerAccount(payTwoOrder); + if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject2.get("code")) { + log.error("+++++++++++++免费开通同步淘宝历史订单失败,id:{}++++++++++++", payTwoOrder.getMasterUserId()); + return new CommonResult<>().error("免费开通失败"); + } + payTwoOrder.setPayType(DefaultNumberConstants.ZERO_NUMBER); + payTwoOrder.setIdenticalAmount(null); + payTwoOrder.setAnticipateNum(NumberUtil.div(payTwoOrder.getAmount(), BigDecimal.valueOf(amount)).longValue()); + payTwoOrder.setStatus(DefaultNumberConstants.ZERO_NUMBER); + payTwoOrder.setPayTime(DateUtil.date()); + PayTwoOrder save = payTwoOrderRepository.save(payTwoOrder); + if (ObjectUtil.isNotEmpty(save)) { + JSONObject jsonObject = requestCore.savePayTwoOrder(save); + if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject.get("code")) { + log.error("==========免费开通订单同步，同步到聚石塔错误，{}", jsonObject); + return new CommonResult<>().error("同步错误"); + } + return CommonResult.successfulOperation(); + } + log.error("+++++++++++++免费开通同步淘宝历史订单，保存订单失败，{}", save); + return new CommonResult<>().error("保存订单失败"); + } +} \ No newline at end of file diff --git a/service/trade-service-source/trade-service-source-core/src/main/resources/application.yml b/service/trade-service-source/trade-service-source-core/src/main/resources/application.yml index 768eba6..05b888b 100644 --- a/service/trade-service-source/trade-service-source-core/src/main/resources/application.yml +++ b/service/trade-service-source/trade-service-source-core/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: spring: profiles: - active: dev + active: prod servlet: multipart: max-file-size: 200MB #单个文件上传大小 diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/TradeJpa.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/TradeJpa.java index a764967..08e2118 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/TradeJpa.java +++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/TradeJpa.java @@ -87,7 +87,7 @@ public class TradeJpa { } } if (null != day) { - sql.append("and t.created < :offDay "); + sql.append("and t.consign_time < :offDay "); } String sellerNick = appSetting.getSellerNick(); if (StrUtil.isNotEmpty(sellerNick)) { diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/resources/application.yml b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/resources/application.yml index d2ff22d..49cffd9 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/resources/application.yml +++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/resources/application.yml @@ -60,5 +60,5 @@ hchbox: filesave: aes: secret: bytb - route: /usr/local/webapp/task + route: /usr/local/taomidata identification: bytb diff --git a/trade-common/src/main/java/com/hchbox/model/entity/BasePayTwoOrder.java b/trade-common/src/main/java/com/hchbox/model/entity/BasePayTwoOrder.java index c30aed3..1c567bd 100644 --- a/trade-common/src/main/java/com/hchbox/model/entity/BasePayTwoOrder.java +++ b/trade-common/src/main/java/com/hchbox/model/entity/BasePayTwoOrder.java @@ -52,12 +52,12 @@ public class BasePayTwoOrder implements Serializable { @Column(name = "order_start_time") @ApiModelProperty(value = "同步开始时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN, timezone = "GMT+8") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATE_PATTERN, timezone = "GMT+8") private Date orderStartTime; @Column(name = "order_end_time") @ApiModelProperty(value = "同步结束时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN, timezone = "GMT+8") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATE_PATTERN, timezone = "GMT+8") private Date orderEndTime; @Column(name = "nick_name") From 361b0ed1a26e86d5def2b5f9f1eaa10104f5a5bb Mon Sep 17 00:00:00 2001 From: "yqyg16603827325@126.com" Date: Thu, 18 Nov 2021 17:10:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hchbox/module/service/impl/ObtainInfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/ObtainInfoServiceImpl.java b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/ObtainInfoServiceImpl.java index 3b46201..bd011f2 100644 --- a/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/ObtainInfoServiceImpl.java +++ b/service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/ObtainInfoServiceImpl.java @@ -22,9 +22,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; @@ -63,6 +61,7 @@ public class ObtainInfoServiceImpl implements ObtainInfoService { client = new DefaultTaobaoClient(miProperties.getServerUrl(), miProperties.getAppKey(), miProperties.getAppSecret()); AtomicInteger count = new AtomicInteger(); List allByGmtSync = topTradeRepository.findAllByGmtSync(); + log.info("===============ObtainInfoJob同步前一天数据应插入条数：{}===============",allByGmtSync.size()); if (allByGmtSync.size() > 0) { allByGmtSync.stream().forEach(ac ->{ UserOaidInfo userOaidInfo = new UserOaidInfo(); @@ -89,6 +88,7 @@ public class ObtainInfoServiceImpl implements ObtainInfoService { } } }); + log.info("===============ObtainInfoJob同步前一天实际插入数据条数：{}===============",count.get()); //插入存入记录 saveObtainInfoRecord(0,allByGmtSync.size(),count.get()); } @@ -149,7 +149,7 @@ public class ObtainInfoServiceImpl implements ObtainInfoService { List receiverList = rsp.getReceiverList(); return receiverList.get(0); }catch (Exception e){ - log.info("===========解密oaid失败========"); + log.info("=========== 解密oaid失败，oaid:{}, sessionKey:{}========",oaid,sessionKey); return null; } }