From 6930519f8a8c2f1972c0ebcc760db8608c9459ab Mon Sep 17 00:00:00 2001 From: wujingtao Date: Fri, 19 Nov 2021 14:05:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=8D=E8=B4=B9=E5=BC=80?= =?UTF-8?q?=E9=80=9A=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hchbox/api/RequestCore.java | 28 +++++-------------- .../impl/AccountRechargeServiceImpl.java | 15 +++------- .../impl/SynchronizedAmountServiceImpl.java | 11 ++------ .../controller/SellerAccountController.java | 7 ----- .../hchbox/service/SellerAccountService.java | 9 ------ .../impl/SellerAccountServiceImpl.java | 27 ++++-------------- .../src/main/resources/application.yml | 2 +- .../model/entity/BaseSellerAccount.java | 3 ++ .../java/com/hchbox/vo/UpdateAccountsVo.java | 6 ++++ 9 files changed, 28 insertions(+), 80 deletions(-) diff --git a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/api/RequestCore.java b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/api/RequestCore.java index a238ed2..cb94881 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/api/RequestCore.java +++ b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/api/RequestCore.java @@ -137,12 +137,18 @@ public class RequestCore { * @param payTwoOrder * @return */ - public JSONObject updateSellerAccount(PayTwoOrder payTwoOrder) { + public JSONObject updateSellerAccount(PayTwoOrder payTwoOrder, Boolean type) { String reqUrl = url + API_PREFIX + "/account/updateSellerAccount"; Map map = new HashMap<>(); map.put("accountBalance", payTwoOrder.getAmount()); map.put("id", payTwoOrder.getMasterUserId()); map.put("synchronizationDay", DateUtil.betweenDay(payTwoOrder.getOrderStartTime(), payTwoOrder.getOrderEndTime(), true)); + map.put("type", type); + if (type) { + map.put("freeSyncEndTime", payTwoOrder.getOrderEndTime()); + } else { + map.put("massNum", NumberUtil.add(payTwoOrder.getHistoryNum(), payTwoOrder.getAnticipateNum())); + } String post = HttpUtil.post(reqUrl, JSONUtil.parseObj(map).toString()); JSONObject jsonObject; try { @@ -213,26 +219,6 @@ public class RequestCore { return getTaoBaoSaleSizeApi(reqUrl); } - /** - * 同步历史订单信息，修改账号信息 - * - * @param payTwoOrder - * @return - */ - public Integer updateAccount(PayTwoOrder payTwoOrder) { - String reqUrl = url + API_PREFIX + "/account/updateAccount"; - if (ObjectUtil.isEmpty(payTwoOrder)) { - return DefaultNumberConstants.ZERO_NUMBER; - } - Map map = new HashMap<>(); - map.put("id", payTwoOrder.getMasterUserId()); - map.put("accountBalance", payTwoOrder.getAmount() + payTwoOrder.getIdenticalAmount()); - map.put("massNum", NumberUtil.add(payTwoOrder.getHistoryNum(), payTwoOrder.getAnticipateNum())); - String post = HttpUtil.post(reqUrl, JSONUtil.parseObj(map).toString()); - return Integer.parseInt(post); - } - - private Integer getTaoBaoSaleSizeApi(String url) { String getResult = HttpUtil .createGet(url) diff --git a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/AccountRechargeServiceImpl.java b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/AccountRechargeServiceImpl.java index bdc18c1..b32ecb0 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/AccountRechargeServiceImpl.java +++ b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/AccountRechargeServiceImpl.java @@ -262,20 +262,13 @@ public class AccountRechargeServiceImpl implements AccountRechargeService { if (DefaultNumberConstants.TWO_HUNDRED == (Integer) jsonObject.get("code")) { i++; // 修改账户信息 开通服务 - JSONObject jsonObject2 = requestCore.updateSellerAccount(order); - if (DefaultNumberConstants.TWO_HUNDRED == (Integer) jsonObject2.get("code")) { - // 同步主账号 - if (requestCore.updateAccount(order) == DefaultNumberConstants.ZERO_NUMBER) { - order.setOrderStatus(DefaultNumberConstants.TWO_NUMBER); - requestCore.updateTwoPayOrder(order); - log.error("++++++++++++++++同步主账号错误，账号id：{}", order.getMasterUserId()); - } - }else { - log.error("++++++++++++++++修改账户信息，开通淘宝服务失败：{}",order.getNickName()); + JSONObject jsonObject2 = requestCore.updateSellerAccount(order, false); + if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject2.get("code")) { + log.error("++++++++++++++++修改账户信息，开通淘宝服务失败：{}", order.getNickName()); order.setOrderStatus(i); requestCore.updateTwoPayOrder(order); } - }else { + } else { log.error("++++++++++++++++同步到聚石塔内数据失败：{}", order.getNickName()); order.setOrderStatus(DefaultNumberConstants.ONE_NUMBER); requestCore.updateTwoPayOrder(order); 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 c2f5b07..33fc209 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 @@ -78,27 +78,20 @@ public class SynchronizedAmountServiceImpl implements SynchronizedAmountService @Override public CommonResult freeSync(PayTwoOrder payTwoOrder) { - JSONObject jsonObject2 = requestCore.updateSellerAccount(payTwoOrder); + JSONObject jsonObject2 = requestCore.updateSellerAccount(payTwoOrder, true); if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject2.get("code")) { log.error("+++++++++++++免费开通同步淘宝历史订单失败,id:{}++++++++++++", payTwoOrder.getMasterUserId()); return new CommonResult<>().error("免费开通失败"); } payTwoOrder.setPayType(DefaultNumberConstants.ZERO_NUMBER); payTwoOrder.setIdenticalAmount(0.00); -// payTwoOrder.setHistoryNum((long) DefaultNumberConstants.ZERO_NUMBER); 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")) { - // 同步主账号 - if (requestCore.updateAccount(payTwoOrder) == DefaultNumberConstants.ZERO_NUMBER) { - log.error("==========免费开通订单同步，同步到聚石塔主账号错误，{}", payTwoOrder.getMasterUserId()); - return new CommonResult<>().error("同步主账号错误"); - } - } else { + if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject.get("code")) { log.error("==========免费开通淘宝同步，订单同步错误，{}", jsonObject); return new CommonResult<>().error("免费开通淘宝同步，订单同步错误"); } diff --git a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SellerAccountController.java b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SellerAccountController.java index 88aa861..76a5bf8 100644 --- a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SellerAccountController.java +++ b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SellerAccountController.java @@ -63,13 +63,6 @@ public class SellerAccountController { return sellerAccountService.updateAccountExpirationTime(updateAccountsVo); } - @PostMapping("/updateAccount") - @ApiOperation("修改账号余额和条数信息") - public Integer updateAccount(@RequestBody UpdateAccountsVo updateAccountsVo) { - log.info("++++++++++++++++++++修改账号:{}", updateAccountsVo.toString()); - return sellerAccountService.updateAccount(updateAccountsVo); - } - @PostMapping("/subscribeService") @ApiOperation("开通账号服务") public CommonResult updateSellerAccount(@SellerUser SellerAccountDTO sellerAccountDTO) { diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/SellerAccountService.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/SellerAccountService.java index b70535f..a345929 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/SellerAccountService.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/SellerAccountService.java @@ -171,15 +171,6 @@ public interface SellerAccountService { */ CommonResult marketOrderTime(SellerAccountDTO sellerAccountDTO); - /** - * 修改账号余额和消息条数 - * - * @param updateAccountsVo - * @return - */ - Integer updateAccount(UpdateAccountsVo updateAccountsVo); - - /** * 修改账号状态 * diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/SellerAccountServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/SellerAccountServiceImpl.java index 9039059..7bfea05 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/SellerAccountServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/SellerAccountServiceImpl.java @@ -168,6 +168,11 @@ public class SellerAccountServiceImpl implements SellerAccountService { cacheManagerUtil.evictCache("sellerAccountCache", account.getNickname()); account.setStatus(DefaultNumberConstants.ONE_NUMBER); account.setAccountBalance(updateAccountsVo.getAccountBalance()); + if (updateAccountsVo.getType() != null && updateAccountsVo.getType()) { + account.setFreeSyncEndTime(updateAccountsVo.getFreeSyncEndTime()); + } else { + account.setMassNum(updateAccountsVo.getMassNum()); + } // Boolean aBoolean = taoBaoRdsPushService.turnOnPushService(account.getSessionKey(), (long) DefaultNumberConstants.NINETY); Boolean aBoolean = taoBaoRdsPushService.turnOnPushService(account.getSessionKey(), updateAccountsVo.getSynchronizationDay()); taoBaoMessageService.openMessagePermit(account.getSessionKey()); @@ -500,28 +505,6 @@ public class SellerAccountServiceImpl implements SellerAccountService { return new CommonResult().forbidden(ResponseCode.ACCOUNT_VERIFICATION_FAILED.getDesc()); } - @Override - public Integer updateAccount(UpdateAccountsVo updateAccountsVo) { - int a = 0; - if (updateAccountsVo != null) { - SellerAccount account = sellerAccountRepository. - findSellerAccountById(updateAccountsVo.getId()); - if (account != null) { - log.info("=============== the account nickname as {} ===============", account.getNickname()); - account.setMassNum(updateAccountsVo.getMassNum()); - account.setAccountBalance(updateAccountsVo.getAccountBalance()); - try { - a = sellerAccountRepository.save(account).getId().intValue(); - } catch (Exception e) { - log.error("+++++++++++++++保存主账号同步的余额和消息条数失败，id:{}", updateAccountsVo.getId()); - return a; - } - } - } - return a; - } - - private SellerAccount createSellerAccount(AuthTokenResponseDTO tokenDTO) { SellerAccount seller = new SellerAccount(); seller.setLastLoginTime(DateUtil.date()); 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 471af19..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 @@ -2,7 +2,7 @@ spring: application: name: @artifactId@ profiles: - active: dev + active: prod server: port: 8852 diff --git a/trade-common/src/main/java/com/hchbox/model/entity/BaseSellerAccount.java b/trade-common/src/main/java/com/hchbox/model/entity/BaseSellerAccount.java index c79411b..c109ef7 100644 --- a/trade-common/src/main/java/com/hchbox/model/entity/BaseSellerAccount.java +++ b/trade-common/src/main/java/com/hchbox/model/entity/BaseSellerAccount.java @@ -126,4 +126,7 @@ public class BaseSellerAccount implements Serializable { @Column(name = "mass_num") @ApiModelProperty(value = "消息总条数") private Integer massNum; + @Column(name = "free_sync_end_time") + @ApiModelProperty(value = "免费同步到期时间") + private Date freeSyncEndTime; } diff --git a/trade-common/src/main/java/com/hchbox/vo/UpdateAccountsVo.java b/trade-common/src/main/java/com/hchbox/vo/UpdateAccountsVo.java index 4cdfd01..83c1e9f 100644 --- a/trade-common/src/main/java/com/hchbox/vo/UpdateAccountsVo.java +++ b/trade-common/src/main/java/com/hchbox/vo/UpdateAccountsVo.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.math.BigDecimal; +import java.util.Date; /** * @author wujingtao @@ -19,4 +20,9 @@ public class UpdateAccountsVo { private Integer massNum; private Long synchronizationDay; + private Date freeSyncEndTime; + /** + * 作为一个标识，false代表正常支付开通，true 代表免费开通 + */ + private Boolean type; }