diff --git a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/AccountInfoController.java b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/AccountInfoController.java index cea870f..939ab02 100644 --- a/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/AccountInfoController.java +++ b/service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/AccountInfoController.java @@ -1,17 +1,18 @@ package com.hchbox.module.controller; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - import com.hchbox.api.RequestCore; import com.hchbox.constant.DefaultNumberConstants; import com.hchbox.model.param.CommonResult; -import com.hchbox.module.service.AccountInfoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Pageable; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; /** 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 87eb60c..ce4a575 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 @@ -113,7 +113,7 @@ public class AccountRechargeServiceImpl implements AccountRechargeService { response = Factory.Payment.Page() .pay(PayConstants.PAY_TITLE + orderNo, orderNo, aliPayPcVo.getAmount().toString(), aliPay.getNotifyUrl()); if (ResponseChecker.success(response)) { - boolean result = savePayOrder(aliPayPcVo, orderNo); + savePayOrder(aliPayPcVo, orderNo); return new CommonResult().success(response.getBody()); } } catch (Exception e) { @@ -338,4 +338,10 @@ public class AccountRechargeServiceImpl implements AccountRechargeService { } return res; } + + + + + + } 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 f6bb57f..9afc141 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,11 +168,13 @@ public class SellerAccountServiceImpl implements SellerAccountService { log.info("=============== the account nickname as {} ===============", account.getNickname()); cacheManagerUtil.evictCache("sellerAccountCache", account.getNickname()); account.setStatus(DefaultNumberConstants.ONE_NUMBER); - account.setAccountBalance(updateAccountsVo.getAccountBalance()); + account.setAccountBalance(NumberUtil.add(account.getAccountBalance() + != null ? account.getAccountBalance() : DefaultNumberConstants.ZERO_NUMBER, updateAccountsVo.getAccountBalance())); if (updateAccountsVo.getType() != null && updateAccountsVo.getType()) { account.setMassNum(DefaultNumberConstants.MINUS_ONE_NUMBER); } else { - account.setMassNum(updateAccountsVo.getMassNum()); + account.setMassNum((account.getMassNum() != null ? + account.getMassNum() : DefaultNumberConstants.ZERO_NUMBER) + updateAccountsVo.getMassNum()); } // Boolean aBoolean = taoBaoRdsPushService.turnOnPushService(account.getSessionKey(), (long) DefaultNumberConstants.NINETY); Boolean aBoolean = taoBaoRdsPushService.turnOnPushService(account.getSessionKey(), updateAccountsVo.getSynchronizationDay()); @@ -316,8 +318,8 @@ public class SellerAccountServiceImpl implements SellerAccountService { @Override public List queryAccountByParentIdAndStatus(Long parentId) { List byParentIdAndStatus = sellerAccountRepository.findByParentIdAndStatus - (DefaultNumberConstants.ONE_NUMBER, parentId,DateUtil.date()); - if (!CollectionUtils.isEmpty(byParentIdAndStatus)){ + (DefaultNumberConstants.ONE_NUMBER, parentId, DateUtil.date()); + if (!CollectionUtils.isEmpty(byParentIdAndStatus)) { return Convert.toList(SellerAccount.class, byParentIdAndStatus); } return Lists.newArrayList(); diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TaskMessageServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TaskMessageServiceImpl.java index 24771fe..64994db 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TaskMessageServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TaskMessageServiceImpl.java @@ -8,6 +8,8 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.extra.emoji.EmojiUtil; import cn.hutool.json.JSONUtil; import com.baomidou.dynamic.datasource.annotation.DS; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import com.hchbox.config.DataSourceConfiguration; import com.hchbox.constant.*; import com.hchbox.dto.BathSendMessageDTO; @@ -87,8 +89,11 @@ public class TaskMessageServiceImpl implements TaskMessageService { sellerAccount.getParentId() : sellerAccount.getId(); List buyerNickByUserId = blacklistService.queryBuyerNickByUserId(accountId); submitSendMessageVo.setMessageInfo(EmojiUtil.toUnicode(submitSendMessageVo.getMessageInfo())); + // 重复数据 + submitSendMessageVo.setBuyerInfoList(Lists.newArrayList(Sets.newHashSet(submitSendMessageVo.getBuyerInfoList()))); // 剔除黑名单 submitSendMessageVo.getBuyerInfoList().removeAll(buyerNickByUserId); + String templateStr = RemindTemplates.initShopTitle(submitSendMessageVo.getMessageInfo(), sellerAccount.getShopTitle()); if (StringUtils.isBlank(templateStr)) { log.info("========== trade rate handler template is null nick as {} ===========", sellerAccount.getNickname()); 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 7b00781..d5174ae 100644 --- a/trade-common/src/main/java/com/hchbox/vo/UpdateAccountsVo.java +++ b/trade-common/src/main/java/com/hchbox/vo/UpdateAccountsVo.java @@ -4,7 +4,6 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import java.util.Date; /** * @author wujingtao @@ -19,6 +18,7 @@ public class UpdateAccountsVo { private Long id; private Integer massNum; + private Long synchronizationDay; /** * 作为一个标识，false代表正常支付开通，true 代表免费开通 diff --git a/trade-pojo/src/main/java/com/hchbox/enums/MemberStatusEnum.java b/trade-pojo/src/main/java/com/hchbox/enums/MemberStatusEnum.java index 6b58f45..e2207f0 100644 --- a/trade-pojo/src/main/java/com/hchbox/enums/MemberStatusEnum.java +++ b/trade-pojo/src/main/java/com/hchbox/enums/MemberStatusEnum.java @@ -1,6 +1,5 @@ package com.hchbox.enums; -import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor;