Commit 15ebf20c by YG8999

Merge remote-tracking branch 'origin/dev' into dev

parents ae973707 4238e7b8
...@@ -86,15 +86,13 @@ public class CouponRetryTask { ...@@ -86,15 +86,13 @@ public class CouponRetryTask {
if (item.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) { if (item.getPlatformType().equals(PlatformTypeEnum.MEITUAN.getCode())) {
String openShopUuid = finalList.stream().filter(store -> store.getId().equals(item.getStoreId())).findFirst().get().getOpenShopUuid(); String openShopUuid = finalList.stream().filter(store -> store.getId().equals(item.getStoreId())).findFirst().get().getOpenShopUuid();
TuangouReceiptGetConsumedReponseEntity getconsumed = qpService.getconsumed(item.getCouponCode(), openShopUuid); TuangouReceiptGetConsumedReponseEntity getconsumed = qpService.getconsumed(item.getCouponCode(), openShopUuid);
System.out.println(getconsumed);
if (!ObjectUtils.isEmpty(getconsumed)) { if (!ObjectUtils.isEmpty(getconsumed)) {
item.setCouponPayPrice(BigDecimal.valueOf(getconsumed.getDeal_price())); item.setCouponPayPrice(BigDecimal.valueOf(getconsumed.getDeal_price()));
sConsumerCouponList.add(item);
logger.info("美团优惠卷购买金额为:" + item.getCouponPayPrice()); logger.info("美团优惠卷购买金额为:" + item.getCouponPayPrice());
} else { } else {
item.setUseStatus(UserStatusEnum.EXPIRED.getCode()); item.setUseStatus(UserStatusEnum.EXPIRED.getCode());
} }
sConsumerCouponList.add(item);
} }
if (item.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) { if (item.getPlatformType().equals(PlatformTypeEnum.TIKTOK.getCode())) {
JSONObject data = tiktokService.certificateGet(item.getEncryptedCode()); JSONObject data = tiktokService.certificateGet(item.getEncryptedCode());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment