修改免费开通淘宝同步逻辑

master
wujingtao 3 years ago
parent 836bd9b14c
commit 64dde59413

@ -144,11 +144,7 @@ public class RequestCore {
map.put("id", payTwoOrder.getMasterUserId()); map.put("id", payTwoOrder.getMasterUserId());
map.put("synchronizationDay", DateUtil.betweenDay(payTwoOrder.getOrderStartTime(), payTwoOrder.getOrderEndTime(), true)); map.put("synchronizationDay", DateUtil.betweenDay(payTwoOrder.getOrderStartTime(), payTwoOrder.getOrderEndTime(), true));
map.put("type", type); map.put("type", type);
if (type) {
map.put("freeSyncEndTime", payTwoOrder.getOrderEndTime());
} else {
map.put("massNum", NumberUtil.add(payTwoOrder.getHistoryNum(), payTwoOrder.getAnticipateNum())); map.put("massNum", NumberUtil.add(payTwoOrder.getHistoryNum(), payTwoOrder.getAnticipateNum()));
}
String post = HttpUtil.post(reqUrl, JSONUtil.parseObj(map).toString()); String post = HttpUtil.post(reqUrl, JSONUtil.parseObj(map).toString());
JSONObject jsonObject; JSONObject jsonObject;
try { try {

@ -169,7 +169,7 @@ public class SellerAccountServiceImpl implements SellerAccountService {
account.setStatus(DefaultNumberConstants.ONE_NUMBER); account.setStatus(DefaultNumberConstants.ONE_NUMBER);
account.setAccountBalance(updateAccountsVo.getAccountBalance()); account.setAccountBalance(updateAccountsVo.getAccountBalance());
if (updateAccountsVo.getType() != null && updateAccountsVo.getType()) { if (updateAccountsVo.getType() != null && updateAccountsVo.getType()) {
account.setFreeSyncEndTime(updateAccountsVo.getFreeSyncEndTime()); account.setMassNum(DefaultNumberConstants.MINUS_ONE_NUMBER);
} else { } else {
account.setMassNum(updateAccountsVo.getMassNum()); account.setMassNum(updateAccountsVo.getMassNum());
} }

@ -126,7 +126,5 @@ public class BaseSellerAccount implements Serializable {
@ApiModelProperty(value = "消息总条数") @ApiModelProperty(value = "消息总条数")
private Integer massNum; private Integer massNum;
@Column(name = "free_sync_end_time")
@ApiModelProperty(value = "免费同步到期时间")
private Date freeSyncEndTime;
} }

@ -20,7 +20,6 @@ public class UpdateAccountsVo {
private Integer massNum; private Integer massNum;
private Long synchronizationDay; private Long synchronizationDay;
private Date freeSyncEndTime;
/** /**
* falsetrue * falsetrue
*/ */

Loading…
Cancel
Save